Revert "Fix issue #328 and some improvements. (#459)"

This reverts commit 49dac53.

Author: CMGS

engine/virt/virt.go

@@ -93,61 +93,63 @@ func (v *Virt) Execute(ctx context.Context, target string, config *enginetypes.E
 }
 
 // ExecExitCode gets return code of a specific execution.
-func (v *Virt) ExecExitCode(ctx context.Context, execID string) (int, error) {
-	log.Warnf(ctx, "ExecExitCode does not implement")
-	return 0, nil // Called between other apis, cannot return error
+func (v *Virt) ExecExitCode(ctx context.Context, execID string) (code int, err error) {
+	return 0, nil
 }
 
 // ExecResize resize exec tty
-func (v *Virt) ExecResize(ctx context.Context, execID string, height, width uint) error {
+func (v *Virt) ExecResize(ctx context.Context, execID string, height, width uint) (err error) {
 	return v.client.ResizeConsoleWindow(ctx, execID, height, width)
 }
 
 // NetworkConnect connects to a network.
-func (v *Virt) NetworkConnect(ctx context.Context, network, target, ipv4, ipv6 string) ([]string, error) {
+func (v *Virt) NetworkConnect(ctx context.Context, network, target, ipv4, ipv6 string) (cidrs []string, err error) {
 	req := virttypes.ConnectNetworkReq{
 		Network: network,
 		IPv4:    ipv4,
 	}
 	req.ID = target
 
-	cidr, err := v.client.ConnectNetwork(ctx, req)
-	if err != nil {
-		return nil, err
+	var cidr string
+	if cidr, err = v.client.ConnectNetwork(ctx, req); err != nil {
+		return
 	}
 
-	return []string{cidr}, err
+	cidrs = append(cidrs, cidr)
+
+	return
 }
 
 // NetworkDisconnect disconnects from one network.
-func (v *Virt) NetworkDisconnect(ctx context.Context, network, target string, force bool) error {
+func (v *Virt) NetworkDisconnect(ctx context.Context, network, target string, force bool) (err error) {
 	var req virttypes.DisconnectNetworkReq
 	req.Network = network
 	req.ID = target
 
-	_, err := v.client.DisconnectNetwork(ctx, req)
+	_, err = v.client.DisconnectNetwork(ctx, req)
 
-	return err
+	return
 }
 
 // NetworkList lists all of networks.
-func (v *Virt) NetworkList(ctx context.Context, drivers []string) ([]*enginetypes.Network, error) {
-	return nil, types.ErrFunctionNotImplemented("NetworkList")
+func (v *Virt) NetworkList(ctx context.Context, drivers []string) (nets []*enginetypes.Network, err error) {
+	log.Warnf(ctx, "NetworkList does not implement")
+	return
 }
 
 // BuildRefs builds references, it's not necessary for virt. presently.
-func (v *Virt) BuildRefs(ctx context.Context, name string, tags []string) []string {
+func (v *Virt) BuildRefs(ctx context.Context, name string, tags []string) (refs []string) {
 	log.Warnf(ctx, "BuildRefs does not implement")
-	return nil // Called between other apis, cannot return error
+	return
 }
 
 // BuildContent builds content, the use of it is similar to BuildRefs.
 func (v *Virt) BuildContent(ctx context.Context, scm coresource.Source, opts *enginetypes.BuildContentOptions) (string, io.Reader, error) {
-	return "", nil, types.ErrFunctionNotImplemented("BuildContent")
+	return "", nil, fmt.Errorf("BuildContent does not implement")
 }
 
 // VirtualizationCreate creates a guest.
-func (v *Virt) VirtualizationCreate(ctx context.Context, opts *enginetypes.VirtualizationCreateOptions) (*enginetypes.VirtualizationCreated, error) {
+func (v *Virt) VirtualizationCreate(ctx context.Context, opts *enginetypes.VirtualizationCreateOptions) (guest *enginetypes.VirtualizationCreated, err error) {
 	vols, err := v.parseVolumes(opts.Volumes)
 	if err != nil {
 		return nil, err
@@ -173,31 +175,33 @@ func (v *Virt) VirtualizationCreate(ctx context.Context, opts *enginetypes.Virtu
 }
 
 // VirtualizationResourceRemap .
-func (v *Virt) VirtualizationResourceRemap(ctx context.Context, opts *enginetypes.VirtualizationRemapOptions) (<-chan enginetypes.VirtualizationRemapMessage, error) {
-	return nil, types.ErrEngineNotImplemented
+func (v *Virt) VirtualizationResourceRemap(ctx context.Context, opts *enginetypes.VirtualizationRemapOptions) (ch <-chan enginetypes.VirtualizationRemapMessage, err error) {
+	err = types.ErrEngineNotImplemented
+	return
 }
 
 // VirtualizationCopyTo copies one.
-func (v *Virt) VirtualizationCopyTo(ctx context.Context, ID, target string, content io.Reader, AllowOverwriteDirWithFile, CopyUIDGID bool) error {
-	return types.ErrFunctionNotImplemented("VirtualizationCopyTo")
+func (v *Virt) VirtualizationCopyTo(ctx context.Context, ID, target string, content io.Reader, AllowOverwriteDirWithFile, CopyUIDGID bool) (err error) {
+	log.Warnf(ctx, "VirtualizationCopyTo does not implement")
+	return
 }
 
 // VirtualizationStart boots a guest.
-func (v *Virt) VirtualizationStart(ctx context.Context, ID string) error {
-	_, err := v.client.StartGuest(ctx, ID)
-	return err
+func (v *Virt) VirtualizationStart(ctx context.Context, ID string) (err error) {
+	_, err = v.client.StartGuest(ctx, ID)
+	return
 }
 
 // VirtualizationStop stops it.
-func (v *Virt) VirtualizationStop(ctx context.Context, ID string, gracefulTimeout time.Duration) error {
-	_, err := v.client.StopGuest(ctx, ID, gracefulTimeout == 0)
-	return err
+func (v *Virt) VirtualizationStop(ctx context.Context, ID string, gracefulTimeout time.Duration) (err error) {
+	_, err = v.client.StopGuest(ctx, ID, gracefulTimeout == 0)
+	return
 }
 
 // VirtualizationRemove removes a guest.
-func (v *Virt) VirtualizationRemove(ctx context.Context, ID string, volumes, force bool) error {
-	_, err := v.client.DestroyGuest(ctx, ID, force)
-	return err
+func (v *Virt) VirtualizationRemove(ctx context.Context, ID string, volumes, force bool) (err error) {
+	_, err = v.client.DestroyGuest(ctx, ID, force)
+	return
 }
 
 // VirtualizationInspect gets a guest.
@@ -207,7 +211,7 @@ func (v *Virt) VirtualizationInspect(ctx context.Context, ID string) (*enginetyp
 		return nil, err
 	}
 
-	marshal, err := json.Marshal(coretypes.LabelMeta{Publish: []string{"PORT"}})
+	bytes, err := json.Marshal(coretypes.LabelMeta{Publish: []string{"PORT"}})
 	if err != nil {
 		return nil, err
 	}
@@ -217,28 +221,28 @@ func (v *Virt) VirtualizationInspect(ctx context.Context, ID string) (*enginetyp
 		Image:    guest.ImageName,
 		Running:  guest.Status == "running",
 		Networks: guest.Networks,
-		Labels:   map[string]string{cluster.LabelMeta: string(marshal), cluster.ERUMark: "1"},
+		Labels:   map[string]string{cluster.LabelMeta: string(bytes), cluster.ERUMark: "1"},
 	}, nil
 }
 
 // VirtualizationLogs streams a specific guest's log.
 func (v *Virt) VirtualizationLogs(ctx context.Context, opts *enginetypes.VirtualizationLogStreamOptions) (stdout io.ReadCloser, stderr io.ReadCloser, err error) {
-	return nil, nil, types.ErrFunctionNotImplemented("VirtualizationLogs")
+	return nil, nil, fmt.Errorf("VirtualizationLogs does not implement")
 }
 
 // VirtualizationAttach attaches something to a guest.
-func (v *Virt) VirtualizationAttach(ctx context.Context, ID string, stream, stdin bool) (stdout io.ReadCloser, stderr io.ReadCloser, inStream io.WriteCloser, err error) {
-	return nil, nil, nil, types.ErrFunctionNotImplemented("VirtualizationAttach")
+func (v *Virt) VirtualizationAttach(ctx context.Context, ID string, stream, stdin bool) (io.ReadCloser, io.ReadCloser, io.WriteCloser, error) {
+	return nil, nil, nil, fmt.Errorf("VirtualizationAttach does not implement")
 }
 
 // VirtualizationResize resized window size
 func (v *Virt) VirtualizationResize(ctx context.Context, ID string, height, width uint) error {
-	return types.ErrFunctionNotImplemented("VirtualizationResize")
+	return fmt.Errorf("VirtualizationResize not implemented")
 }
 
 // VirtualizationWait is waiting for a shut-off
 func (v *Virt) VirtualizationWait(ctx context.Context, ID, state string) (*enginetypes.VirtualizationWaitResult, error) {
-	return nil, types.ErrFunctionNotImplemented("VirtualizationWait")
+	return nil, fmt.Errorf("VirtualizationWait does not implement")
 }
 
 // VirtualizationUpdateResource updates resource.
@@ -270,11 +274,11 @@ func (v *Virt) VirtualizationCopyFrom(ctx context.Context, ID, path string) (io.
 
 // VirtualizationExecute executes commands in running virtual unit
 func (v *Virt) VirtualizationExecute(ctx context.Context, ID string, commands, env []string, workdir string) (io.WriteCloser, io.ReadCloser, error) {
-	return nil, nil, types.ErrFunctionNotImplemented("VirtualizationExecute")
+	return nil, nil, fmt.Errorf("VirtualizationExecute not implemented")
 }
 
 // ResourceValidate validate resource usage
 func (v *Virt) ResourceValidate(ctx context.Context, cpu float64, cpumap map[string]int64, memory, storage int64) error {
-	// TODO list all workloads, calculate resource
-	return types.ErrFunctionNotImplemented("ResourceValidate")
+	// TODO list all workloads, calcuate resource
+	return nil
 }

types/errors.go

@@ -115,8 +115,3 @@ var (
 	ErrNoFilesToSend = errors.New("no files to send")
 	ErrNoFilesToCopy = errors.New("no files to copy")
 )
-
-// ErrFunctionNotImplemented return a not implemented error for function
-func ErrFunctionNotImplemented(functionName string) error {
-	return errors.New(functionName + " not implemented")
-}