Update dependencies to add service fabric mesh via new azure-sdk-go

vendor/github.com/vmware/vic/doc/bundle/NOTICE

@@ -2,13 +2,13 @@ NOTICE
 
 vSphere Integrated Containers Engine
 
-Copyright (c) 2016-2017 VMware, Inc. All Rights Reserved.
+Copyright (c) 2016-2018 VMware, Inc. All Rights Reserved.
 
 This product is licensed to you under the Apache License, Version 2.0 (the
 "License").  You may not use this product except in compliance with the
 License.
 
-This product may include a number of components with separate copyright
-notices and license terms. Your use of the source code for these components is
-subject to the terms and conditions of the component's license, as noted in
-the LICENSE file.
+This product may include a number of components with separate copyright notices
+and license terms. Your use of the source code for these components is subject
+to the terms and conditions of the component's license, as noted in the LICENSE
+file.

vendor/github.com/vmware/vic/lib/apiservers/engine/errors/errors.go

@@ -34,6 +34,14 @@ func (e InvalidVolumeError) Error() string {
 	return fmt.Sprintf("mounting directories as a data volume is not supported.")
 }
 
+type VolumeExistError struct {
+	Volume string
+}
+
+func (e VolumeExistError) Error() string {
+	return fmt.Sprintf("A volume named %s already exists. Choose a different volume name.", e.Volume)
+}
+
 // InvalidBindError is returned when create/run -v has more params than allowed.
 type InvalidBindError struct {
 	Volume string
@@ -187,6 +195,12 @@ func IsServerNotReady(err error) bool {
 	return ok
 }
 
+func IsVolumeExistError(err error) bool {
+	_, ok := err.(VolumeExistError)
+
+	return ok
+}
+
 type DetachError struct{}
 
 func (DetachError) Error() string {

vendor/github.com/vmware/vic/lib/apiservers/engine/proxy/archive_proxy.go

@@ -33,7 +33,7 @@ import (
 	"github.com/docker/docker/api/types"
 )
 
-type VicArchiveProxy interface {
+type ArchiveProxy interface {
 	ArchiveExportReader(op trace.Operation, store, ancestorStore, deviceID, ancestor string, data bool, filterSpec archive.FilterSpec) (io.ReadCloser, error)
 	ArchiveImportWriter(op trace.Operation, store, deviceID string, filterSpec archive.FilterSpec, wg *sync.WaitGroup, errchan chan error) (io.WriteCloser, error)
 	StatPath(op trace.Operation, store, deviceID string, filterSpec archive.FilterSpec) (*types.ContainerPathStat, error)
@@ -43,23 +43,23 @@ type VicArchiveProxy interface {
 // ArchiveProxy
 //------------------------------------
 
-type ArchiveProxy struct {
+type VicArchiveProxy struct {
 	client *client.PortLayer
 }
 
-var archiveProxy *ArchiveProxy
+var archiveProxy *VicArchiveProxy
 
-func NewArchiveProxy(client *client.PortLayer) VicArchiveProxy {
-	return &ArchiveProxy{client: client}
+func NewArchiveProxy(client *client.PortLayer) *VicArchiveProxy {
+	return &VicArchiveProxy{client: client}
 }
 
-func GetArchiveProxy() VicArchiveProxy {
+func GetArchiveProxy() ArchiveProxy {
 	return archiveProxy
 }
 
 // ArchiveExportReader streams a tar archive from the portlayer.  Once the stream is complete,
 // an io.Reader is returned and the caller can use that reader to parse the data.
-func (a *ArchiveProxy) ArchiveExportReader(op trace.Operation, store, ancestorStore, deviceID, ancestor string, data bool, filterSpec archive.FilterSpec) (io.ReadCloser, error) {
+func (a *VicArchiveProxy) ArchiveExportReader(op trace.Operation, store, ancestorStore, deviceID, ancestor string, data bool, filterSpec archive.FilterSpec) (io.ReadCloser, error) {
 	defer trace.End(trace.Begin(deviceID))
 
 	if a.client == nil {
@@ -141,7 +141,7 @@ func (a *ArchiveProxy) ArchiveExportReader(op trace.Operation, store, ancestorSt
 
 // ArchiveImportWriter initializes a write stream for a path.  This is usually called
 // for getting a writer during docker cp TO container.
-func (a *ArchiveProxy) ArchiveImportWriter(op trace.Operation, store, deviceID string, filterSpec archive.FilterSpec, wg *sync.WaitGroup, errchan chan error) (io.WriteCloser, error) {
+func (a *VicArchiveProxy) ArchiveImportWriter(op trace.Operation, store, deviceID string, filterSpec archive.FilterSpec, wg *sync.WaitGroup, errchan chan error) (io.WriteCloser, error) {
 	defer trace.End(trace.Begin(deviceID))
 
 	if a.client == nil {
@@ -232,7 +232,7 @@ func (a *ArchiveProxy) ArchiveImportWriter(op trace.Operation, store, deviceID s
 
 // StatPath requests the portlayer to stat the filesystem resource at the
 // specified path in the container vc.
-func (a *ArchiveProxy) StatPath(op trace.Operation, store, deviceID string, filterSpec archive.FilterSpec) (*types.ContainerPathStat, error) {
+func (a *VicArchiveProxy) StatPath(op trace.Operation, store, deviceID string, filterSpec archive.FilterSpec) (*types.ContainerPathStat, error) {
 	defer trace.End(trace.Begin(deviceID))
 
 	if a.client == nil {

vendor/github.com/vmware/vic/lib/apiservers/engine/proxy/container_proxy.go

@@ -74,7 +74,7 @@ import (
 )
 
 // VicContainerProxy interface
-type VicContainerProxy interface {
+type ContainerProxy interface {
 	CreateContainerHandle(ctx context.Context, vc *viccontainer.VicContainer, config types.ContainerCreateConfig) (string, string, error)
 	AddImageToContainer(ctx context.Context, handle string, deltaID string, layerID string, imageID string, config types.ContainerCreateConfig) (string, error)
 	CreateContainerTask(ctx context.Context, handle string, id string, layerID string, config types.ContainerCreateConfig) (string, error)
@@ -91,7 +91,7 @@ type VicContainerProxy interface {
 	// TODO: we should not be returning a swagger model here, however we do not have a solid architected return for this yet.
 	InspectTask(op trace.Operation, handle string, eid string, cid string) (*models.TaskInspectResponse, error)
 	BindTask(op trace.Operation, handle string, eid string) (string, error)
-	WaitTask(op trace.Operation, cid string, cname string, eid string) error
+	WaitTask(op trace.Operation, handle string, cid string, eid string) error
 
 	Handle(ctx context.Context, id, name string) (string, error)
 
@@ -108,7 +108,7 @@ type VicContainerProxy interface {
 }
 
 // ContainerProxy struct
-type ContainerProxy struct {
+type VicContainerProxy struct {
 	client        *client.PortLayer
 	portlayerAddr string
 	portlayerName string
@@ -126,20 +126,24 @@ const (
 )
 
 // NewContainerProxy will create a new proxy
-func NewContainerProxy(plClient *client.PortLayer, portlayerAddr string, portlayerName string) *ContainerProxy {
-	return &ContainerProxy{client: plClient, portlayerAddr: portlayerAddr, portlayerName: portlayerName}
+func NewContainerProxy(plClient *client.PortLayer, portlayerAddr string, portlayerName string) *VicContainerProxy {
+	return &VicContainerProxy{client: plClient, portlayerAddr: portlayerAddr, portlayerName: portlayerName}
 }
 
 // Handle retrieves a handle to a VIC container.  Handles should be treated as opaque strings.
 //
 // returns:
 //	(handle string, error)
-func (c *ContainerProxy) Handle(ctx context.Context, id, name string) (string, error) {
+func (c *VicContainerProxy) Handle(ctx context.Context, id, name string) (string, error) {
+	op := trace.FromContext(ctx, "Handle: %s", id)
+	defer trace.End(trace.Begin(name, op))
+	opID := op.ID()
+
 	if c.client == nil {
 		return "", errors.NillPortlayerClientError("ContainerProxy")
 	}
 
-	resp, err := c.client.Containers.Get(containers.NewGetParamsWithContext(ctx).WithID(id))
+	resp, err := c.client.Containers.Get(containers.NewGetParamsWithContext(ctx).WithOpID(&opID).WithID(id))
 	if err != nil {
 		switch err := err.(type) {
 		case *containers.GetNotFound:
@@ -158,8 +162,10 @@ func (c *ContainerProxy) Handle(ctx context.Context, id, name string) (string, e
 //
 // returns:
 //	(containerID, containerHandle, error)
-func (c *ContainerProxy) CreateContainerHandle(ctx context.Context, vc *viccontainer.VicContainer, config types.ContainerCreateConfig) (string, string, error) {
-	defer trace.End(trace.Begin(vc.ImageID))
+func (c *VicContainerProxy) CreateContainerHandle(ctx context.Context, vc *viccontainer.VicContainer, config types.ContainerCreateConfig) (string, string, error) {
+	op := trace.FromContext(ctx, "CreateContainerHandle: %s", vc.Name)
+	defer trace.End(trace.Begin(vc.Name, op))
+	opID := op.ID()
 
 	if c.client == nil {
 		return "", "", errors.NillPortlayerClientError("ContainerProxy")
@@ -179,12 +185,12 @@ func (c *ContainerProxy) CreateContainerHandle(ctx context.Context, vc *vicconta
 		return "", "", errors.InternalServerError("ContainerProxy.CreateContainerHandle got unexpected error getting VCH UUID")
 	}
 
-	plCreateParams := dockerContainerCreateParamsToPortlayer(ctx, config, vc, host)
+	plCreateParams := dockerContainerCreateParamsToPortlayer(ctx, config, vc, host).WithOpID(&opID)
 	createResults, err := c.client.Containers.Create(plCreateParams)
 	if err != nil {
 		if _, ok := err.(*containers.CreateNotFound); ok {
 			cerr := fmt.Errorf("No such image: %s", vc.ImageID)
-			log.Errorf("%s (%s)", cerr, err)
+			op.Errorf("%s (%s)", cerr, err)
 			return "", "", errors.NotFoundError(cerr.Error())
 		}
 
@@ -203,7 +209,7 @@ func (c *ContainerProxy) CreateContainerHandle(ctx context.Context, vc *vicconta
 //
 // returns:
 //	modified handle
-func (c *ContainerProxy) AddImageToContainer(ctx context.Context, handle, deltaID, layerID, imageID string, config types.ContainerCreateConfig) (string, error) {
+func (c *VicContainerProxy) AddImageToContainer(ctx context.Context, handle, deltaID, layerID, imageID string, config types.ContainerCreateConfig) (string, error) {
 	defer trace.End(trace.Begin(handle))
 
 	if c.client == nil {
@@ -237,20 +243,23 @@ func (c *ContainerProxy) AddImageToContainer(ctx context.Context, handle, deltaI
 //
 // returns:
 //	(containerHandle, error)
-func (c *ContainerProxy) CreateContainerTask(ctx context.Context, handle, id, layerID string, config types.ContainerCreateConfig) (string, error) {
-	defer trace.End(trace.Begin(""))
+func (c *VicContainerProxy) CreateContainerTask(ctx context.Context, handle, id, layerID string, config types.ContainerCreateConfig) (string, error) {
+	op := trace.FromContext(ctx, "CreateContainerTask: %s", id)
+	defer trace.End(trace.Begin(id, op))
+	opID := op.ID()
 
 	if c.client == nil {
 		return "", errors.NillPortlayerClientError("ContainerProxy")
 	}
 
-	plTaskParams := dockerContainerCreateParamsToTask(ctx, id, layerID, config)
+	plTaskParams := dockerContainerCreateParamsToTask(op, id, layerID, config)
 	plTaskParams.Config.Handle = handle
+	plTaskParams.WithOpID(&opID)
 
-	log.Infof("*** CreateContainerTask - params = %#v", *plTaskParams.Config)
+	op.Infof("*** CreateContainerTask - params = %#v", *plTaskParams.Config)
 	responseJoin, err := c.client.Tasks.Join(plTaskParams)
 	if err != nil {
-		log.Errorf("Unable to join primary task to container: %+v", err)
+		op.Errorf("Unable to join primary task to container: %+v", err)
 		return "", errors.InternalServerError(err.Error())
 	}
 
@@ -259,10 +268,13 @@ func (c *ContainerProxy) CreateContainerTask(ctx context.Context, handle, id, la
 		return "", errors.InternalServerError(fmt.Sprintf("Type assertion failed on handle from task join: %#+v", handle))
 	}
 
-	plBindParams := tasks.NewBindParamsWithContext(ctx).WithConfig(&models.TaskBindConfig{Handle: handle, ID: id})
+	plBindParams := tasks.NewBindParamsWithContext(ctx).
+		WithOpID(&opID).
+		WithConfig(&models.TaskBindConfig{Handle: handle, ID: id})
+
 	responseBind, err := c.client.Tasks.Bind(plBindParams)
 	if err != nil {
-		log.Errorf("Unable to bind primary task to container: %+v", err)
+		op.Errorf("Unable to bind primary task to container: %+v", err)
 		return "", errors.InternalServerError(err.Error())
 	}
 
@@ -274,8 +286,10 @@ func (c *ContainerProxy) CreateContainerTask(ctx context.Context, handle, id, la
 	return handle, nil
 }
 
-func (c *ContainerProxy) CreateExecTask(ctx context.Context, handle string, config *types.ExecConfig) (string, string, error) {
-	defer trace.End(trace.Begin(""))
+func (c *VicContainerProxy) CreateExecTask(ctx context.Context, handle string, config *types.ExecConfig) (string, string, error) {
+	op := trace.FromContext(ctx, "CreateExecTask: %s", handle)
+	defer trace.End(trace.Begin(handle, op))
+	opID := op.ID()
 
 	if c.client == nil {
 		return "", "", errors.NillPortlayerClientError("ContainerProxy")
@@ -293,7 +307,7 @@ func (c *ContainerProxy) CreateExecTask(ctx context.Context, handle string, conf
 	}
 
 	// call Join with JoinParams
-	joinparams := tasks.NewJoinParamsWithContext(ctx).WithConfig(joinconfig)
+	joinparams := tasks.NewJoinParamsWithContext(ctx).WithOpID(&opID).WithConfig(joinconfig)
 	resp, err := c.client.Tasks.Join(joinparams)
 	if err != nil {
 		return "", "", errors.InternalServerError(err.Error())
@@ -313,18 +327,21 @@ func (c *ContainerProxy) CreateExecTask(ctx context.Context, handle string, conf
 //
 // returns:
 //	modified handle
-func (c *ContainerProxy) AddContainerToScope(ctx context.Context, handle string, config types.ContainerCreateConfig) (string, error) {
-	defer trace.End(trace.Begin(handle))
+func (c *VicContainerProxy) AddContainerToScope(ctx context.Context, handle string, config types.ContainerCreateConfig) (string, error) {
+	op := trace.FromContext(ctx, "AddContainerToScope: %s", handle)
+	defer trace.End(trace.Begin(handle, op))
+	opID := op.ID()
 
 	if c.client == nil {
 		return "", errors.NillPortlayerClientError("ContainerProxy")
 	}
 
-	log.Debugf("Network Configuration Section - Container Create")
+	op.Debugf("Network Configuration Section - Container Create")
 	// configure network
 	netConf := toModelsNetworkConfig(config)
 	if netConf != nil {
 		addContRes, err := c.client.Scopes.AddContainer(scopes.NewAddContainerParamsWithContext(ctx).
+			WithOpID(&opID).
 			WithScope(netConf.NetworkName).
 			WithConfig(&models.ScopesAddContainerConfig{
 				Handle:        handle,
@@ -332,7 +349,7 @@ func (c *ContainerProxy) AddContainerToScope(ctx context.Context, handle string,
 			}))
 
 		if err != nil {
-			log.Errorf("ContainerProxy.AddContainerToScope: Scopes error: %s", err.Error())
+			op.Errorf("ContainerProxy.AddContainerToScope: Scopes error: %s", err.Error())
 			return handle, errors.InternalServerError(err.Error())
 		}
 
@@ -341,8 +358,11 @@ func (c *ContainerProxy) AddContainerToScope(ctx context.Context, handle string,
 				return
 			}
 			// roll back the AddContainer call
-			if _, err2 := c.client.Scopes.RemoveContainer(scopes.NewRemoveContainerParamsWithContext(ctx).WithHandle(handle).WithScope(netConf.NetworkName)); err2 != nil {
-				log.Warnf("could not roll back container add: %s", err2)
+			if _, err2 := c.client.Scopes.RemoveContainer(scopes.NewRemoveContainerParamsWithContext(ctx).
+				WithHandle(handle).
+				WithScope(netConf.NetworkName).
+				WithOpID(&opID)); err2 != nil {
+				op.Warnf("could not roll back container add: %s", err2)
 			}
 		}()
 
@@ -357,14 +377,17 @@ func (c *ContainerProxy) AddContainerToScope(ctx context.Context, handle string,
 //
 // returns:
 //	modified handle
-func (c *ContainerProxy) AddLoggingToContainer(ctx context.Context, handle string, config types.ContainerCreateConfig) (string, error) {
-	defer trace.End(trace.Begin(handle))
+func (c *VicContainerProxy) AddLoggingToContainer(ctx context.Context, handle string, config types.ContainerCreateConfig) (string, error) {
+	op := trace.FromContext(ctx, "AddLoggingToContainer: %s", handle)
+	defer trace.End(trace.Begin(handle, op))
+	opID := op.ID()
 
 	if c.client == nil {
 		return "", errors.NillPortlayerClientError("ContainerProxy")
 	}
 
 	response, err := c.client.Logging.LoggingJoin(logging.NewLoggingJoinParamsWithContext(ctx).
+		WithOpID(&opID).
 		WithConfig(&models.LoggingJoinConfig{
 			Handle: handle,
 		}))
@@ -384,14 +407,17 @@ func (c *ContainerProxy) AddLoggingToContainer(ctx context.Context, handle strin
 //
 // returns:
 //	modified handle
-func (c *ContainerProxy) AddInteractionToContainer(ctx context.Context, handle string, config types.ContainerCreateConfig) (string, error) {
-	defer trace.End(trace.Begin(handle))
+func (c *VicContainerProxy) AddInteractionToContainer(ctx context.Context, handle string, config types.ContainerCreateConfig) (string, error) {
+	op := trace.FromContext(ctx, "AddLoggingToContainer: %s", handle)
+	defer trace.End(trace.Begin(handle, op))
+	opID := op.ID()
 
 	if c.client == nil {
 		return "", errors.NillPortlayerClientError("ContainerProxy")
 	}
 
 	response, err := c.client.Interaction.InteractionJoin(interaction.NewInteractionJoinParamsWithContext(ctx).
+		WithOpID(&opID).
 		WithConfig(&models.InteractionJoinConfig{
 			Handle: handle,
 		}))
@@ -407,8 +433,10 @@ func (c *ContainerProxy) AddInteractionToContainer(ctx context.Context, handle s
 }
 
 // BindInteraction enables interaction capabilities
-func (c *ContainerProxy) BindInteraction(ctx context.Context, handle string, name string, id string) (string, error) {
-	defer trace.End(trace.Begin(handle))
+func (c *VicContainerProxy) BindInteraction(ctx context.Context, handle string, name string, id string) (string, error) {
+	op := trace.FromContext(ctx, "BindInteraction: %s", handle)
+	defer trace.End(trace.Begin(handle, op))
+	opID := op.ID()
 
 	if c.client == nil {
 		return "", errors.NillPortlayerClientError("ContainerProxy")
@@ -416,6 +444,7 @@ func (c *ContainerProxy) BindInteraction(ctx context.Context, handle string, nam
 
 	bind, err := c.client.Interaction.InteractionBind(
 		interaction.NewInteractionBindParamsWithContext(ctx).
+			WithOpID(&opID).
 			WithConfig(&models.InteractionBindConfig{
 				Handle: handle,
 				ID:     id,
@@ -436,8 +465,10 @@ func (c *ContainerProxy) BindInteraction(ctx context.Context, handle string, nam
 }
 
 // UnbindInteraction disables interaction capabilities
-func (c *ContainerProxy) UnbindInteraction(ctx context.Context, handle string, name string, id string) (string, error) {
-	defer trace.End(trace.Begin(handle))
+func (c *VicContainerProxy) UnbindInteraction(ctx context.Context, handle string, name string, id string) (string, error) {
+	op := trace.FromContext(ctx, "UnbindInteraction: %s", handle)
+	defer trace.End(trace.Begin(handle, op))
+	opID := op.ID()
 
 	if c.client == nil {
 		return "", errors.NillPortlayerClientError("ContainerProxy")
@@ -445,6 +476,7 @@ func (c *ContainerProxy) UnbindInteraction(ctx context.Context, handle string, n
 
 	unbind, err := c.client.Interaction.InteractionUnbind(
 		interaction.NewInteractionUnbindParamsWithContext(ctx).
+			WithOpID(&opID).
 			WithConfig(&models.InteractionUnbindConfig{
 				Handle: handle,
 				ID:     id,
@@ -464,18 +496,21 @@ func (c *ContainerProxy) UnbindInteraction(ctx context.Context, handle string, n
 //
 // Args:
 //	waitTime <= 0 means no wait time
-func (c *ContainerProxy) CommitContainerHandle(ctx context.Context, handle, containerID string, waitTime int32) error {
-	defer trace.End(trace.Begin(handle))
+func (c *VicContainerProxy) CommitContainerHandle(ctx context.Context, handle, containerID string, waitTime int32) error {
+	op := trace.FromContext(ctx, "CommitContainerHandle: %s", handle)
+	defer trace.End(trace.Begin(handle, op))
+	opID := op.ID()
 
 	if c.client == nil {
 		return errors.NillPortlayerClientError("ContainerProxy")
 	}
 
-	var commitParams *containers.CommitParams
+	commitParams := containers.NewCommitParamsWithContext(ctx).
+		WithOpID(&opID).
+		WithHandle(handle)
+
 	if waitTime > 0 {
-		commitParams = containers.NewCommitParamsWithContext(ctx).WithHandle(handle).WithWaitTime(&waitTime)
-	} else {
-		commitParams = containers.NewCommitParamsWithContext(ctx).WithHandle(handle)
+		commitParams.WithWaitTime(&waitTime)
 	}
 
 	_, err := c.client.Containers.Commit(commitParams)
@@ -495,8 +530,9 @@ func (c *ContainerProxy) CommitContainerHandle(ctx context.Context, handle, cont
 	return nil
 }
 
-func (c *ContainerProxy) InspectTask(op trace.Operation, handle string, eid string, cid string) (*models.TaskInspectResponse, error) {
-	defer trace.End(trace.Begin(fmt.Sprintf("handle(%s), eid(%s), cid(%s)", handle, eid, cid)))
+func (c *VicContainerProxy) InspectTask(op trace.Operation, handle string, eid string, cid string) (*models.TaskInspectResponse, error) {
+	defer trace.End(trace.Begin(fmt.Sprintf("handle(%s), eid(%s), cid(%s)", handle, eid, cid), op))
+	opID := op.ID()
 
 	if c.client == nil {
 		return nil, errors.NillPortlayerClientError("ContainerProxy")
@@ -510,7 +546,7 @@ func (c *ContainerProxy) InspectTask(op trace.Operation, handle string, eid stri
 
 	// FIXME: right now we are only using this path for exec targets. But later the error messages may need to be changed
 	// to be more accurate.
-	params := tasks.NewInspectParamsWithContext(op).WithConfig(config)
+	params := tasks.NewInspectParamsWithContext(op).WithOpID(&opID).WithConfig(config)
 	resp, err := c.client.Tasks.Inspect(params)
 	if err != nil {
 		switch err := err.(type) {
@@ -529,8 +565,9 @@ func (c *ContainerProxy) InspectTask(op trace.Operation, handle string, eid stri
 	return resp.Payload, nil
 }
 
-func (c *ContainerProxy) BindTask(op trace.Operation, handle string, eid string) (string, error) {
-	defer trace.End(trace.Begin(fmt.Sprintf("handle(%s), eid(%s)", handle, eid)))
+func (c *VicContainerProxy) BindTask(op trace.Operation, handle string, eid string) (string, error) {
+	defer trace.End(trace.Begin(fmt.Sprintf("handle(%s), eid(%s)", handle, eid), op))
+	opID := op.ID()
 
 	if c.client == nil {
 		return "", errors.NillPortlayerClientError("ContainerProxy")
@@ -540,7 +577,7 @@ func (c *ContainerProxy) BindTask(op trace.Operation, handle string, eid string)
 		Handle: handle,
 		ID:     eid,
 	}
-	bindparams := tasks.NewBindParamsWithContext(op).WithConfig(bindconfig)
+	bindparams := tasks.NewBindParamsWithContext(op).WithOpID(&opID).WithConfig(bindconfig)
 
 	// call Bind with bindparams
 	resp, err := c.client.Tasks.Bind(bindparams)
@@ -569,28 +606,26 @@ func (c *ContainerProxy) BindTask(op trace.Operation, handle string, eid string)
 	return respHandle, nil
 }
 
-func (c *ContainerProxy) WaitTask(op trace.Operation, cid string, cname string, eid string) error {
+func (c *VicContainerProxy) WaitTask(op trace.Operation, handle string, cid string, eid string) error {
+	defer trace.End(trace.Begin(fmt.Sprintf("handle(%s), cid(%s)", handle, cid), op))
+	opID := op.ID()
+
 	if c.client == nil {
 		return errors.NillPortlayerClientError("ContainerProxy")
 	}
 
-	handle, err := c.Handle(op, cid, cname)
-	if err != nil {
-		return err
-	}
-
-	// wait the Task to start
+	// wait for the Task to change in state
 	config := &models.TaskWaitConfig{
 		Handle: handle,
 		ID:     eid,
 	}
 
-	params := tasks.NewWaitParamsWithContext(op).WithConfig(config)
-	_, err = c.client.Tasks.Wait(params)
+	params := tasks.NewWaitParamsWithContext(op).WithOpID(&opID).WithConfig(config)
+	_, err := c.client.Tasks.Wait(params)
 	if err != nil {
 		switch err := err.(type) {
 		case *tasks.WaitNotFound:
-			return errors.InternalServerError(fmt.Sprintf("the Container(%s) has been shutdown during execution of the exec operation", cid))
+			return errors.InternalServerError(fmt.Sprintf("the container(%s) has been shutdown during execution of the exec operation", cid))
 		case *tasks.WaitPreconditionRequired:
 			return errors.InternalServerError(fmt.Sprintf("container(%s) must be powered on in order to perform the desired exec operation", cid))
 		case *tasks.WaitInternalServerError:
@@ -608,8 +643,10 @@ func (c *ContainerProxy) WaitTask(op trace.Operation, cid string, cname string,
 //
 // returns
 //	error
-func (c *ContainerProxy) Stop(ctx context.Context, vc *viccontainer.VicContainer, name string, seconds *int, unbound bool) error {
-	defer trace.End(trace.Begin(vc.ContainerID))
+func (c *VicContainerProxy) Stop(ctx context.Context, vc *viccontainer.VicContainer, name string, seconds *int, unbound bool) error {
+	op := trace.FromContext(ctx, "Stop: %s", name)
+	defer trace.End(trace.Begin(fmt.Sprintf("Name: %s, container id: %s", name, vc.ContainerID), op))
+	opID := op.ID()
 
 	if c.client == nil {
 		return errors.NillPortlayerClientError("ContainerProxy")
@@ -648,7 +685,11 @@ func (c *ContainerProxy) Stop(ctx context.Context, vc *viccontainer.VicContainer
 	}
 
 	// change the state of the container
-	changeParams := containers.NewStateChangeParamsWithContext(ctx).WithHandle(handle).WithState("STOPPED")
+	changeParams := containers.NewStateChangeParamsWithContext(ctx).
+		WithOpID(&opID).
+		WithHandle(handle).
+		WithState("STOPPED")
+
 	stateChangeResponse, err := c.client.Containers.StateChange(changeParams)
 	if err != nil {
 		switch err := err.(type) {
@@ -682,20 +723,22 @@ func (c *ContainerProxy) Stop(ctx context.Context, vc *viccontainer.VicContainer
 }
 
 // UnbindContainerFromNetwork unbinds a container from the networks that it connects to
-func (c *ContainerProxy) UnbindContainerFromNetwork(ctx context.Context, vc *viccontainer.VicContainer, handle string) (string, error) {
-	defer trace.End(trace.Begin(vc.ContainerID))
+func (c *VicContainerProxy) UnbindContainerFromNetwork(ctx context.Context, vc *viccontainer.VicContainer, handle string) (string, error) {
+	op := trace.FromContext(ctx, "UnbindContainerFromNetwork: %s", vc.ContainerID)
+	defer trace.End(trace.Begin(vc.ContainerID, op))
+	opID := op.ID()
 
 	if c.client == nil {
 		return "", errors.NillPortlayerClientError("ContainerProxy")
 	}
 
-	unbindParams := scopes.NewUnbindContainerParamsWithContext(ctx).WithHandle(handle)
+	unbindParams := scopes.NewUnbindContainerParamsWithContext(ctx).WithOpID(&opID).WithHandle(handle)
 	ub, err := c.client.Scopes.UnbindContainer(unbindParams)
 	if err != nil {
 		switch err := err.(type) {
 		case *scopes.UnbindContainerNotFound:
 			// ignore error
-			log.Warnf("Container %s not found by network unbind", vc.ContainerID)
+			op.Warnf("Container %s not found by network unbind", vc.ContainerID)
 		case *scopes.UnbindContainerInternalServerError:
 			return "", errors.InternalServerError(err.Payload.Message)
 		default:
@@ -707,14 +750,18 @@ func (c *ContainerProxy) UnbindContainerFromNetwork(ctx context.Context, vc *vic
 }
 
 // State returns container state
-func (c *ContainerProxy) State(ctx context.Context, vc *viccontainer.VicContainer) (*types.ContainerState, error) {
-	defer trace.End(trace.Begin(""))
+func (c *VicContainerProxy) State(ctx context.Context, vc *viccontainer.VicContainer) (*types.ContainerState, error) {
+	op := trace.FromContext(ctx, "State: %s", vc.ContainerID)
+	defer trace.End(trace.Begin(vc.ContainerID, op))
+	opID := op.ID()
 
 	if c.client == nil {
 		return nil, errors.NillPortlayerClientError("ContainerProxy")
 	}
 
-	results, err := c.client.Containers.GetContainerInfo(containers.NewGetContainerInfoParamsWithContext(ctx).WithID(vc.ContainerID))
+	results, err := c.client.Containers.GetContainerInfo(containers.NewGetContainerInfoParamsWithContext(ctx).
+		WithOpID(&opID).
+		WithID(vc.ContainerID))
 	if err != nil {
 		switch err := err.(type) {
 		case *containers.GetContainerInfoNotFound:
@@ -734,14 +781,15 @@ func (c *ContainerProxy) State(ctx context.Context, vc *viccontainer.VicContaine
 }
 
 // GetStateFromHandle takes a handle and returns the state of the container based on that handle. Also returns handle that comes back with the response.
-func (c *ContainerProxy) GetStateFromHandle(op trace.Operation, handle string) (string, string, error) {
+func (c *VicContainerProxy) GetStateFromHandle(op trace.Operation, handle string) (string, string, error) {
 	defer trace.End(trace.Begin(fmt.Sprintf("handle(%s)", handle), op))
+	opID := op.ID()
 
 	if c.client == nil {
 		return "", "", errors.NillPortlayerClientError("ContainerProxy")
 	}
 
-	params := containers.NewGetStateParams().WithHandle(handle)
+	params := containers.NewGetStateParams().WithOpID(&opID).WithHandle(handle)
 	resp, err := c.client.Containers.GetState(params)
 	if err != nil {
 		switch err := err.(type) {
@@ -756,14 +804,19 @@ func (c *ContainerProxy) GetStateFromHandle(op trace.Operation, handle string) (
 }
 
 // ExitCode returns container exitCode
-func (c *ContainerProxy) ExitCode(ctx context.Context, vc *viccontainer.VicContainer) (string, error) {
-	defer trace.End(trace.Begin(""))
+func (c *VicContainerProxy) ExitCode(ctx context.Context, vc *viccontainer.VicContainer) (string, error) {
+	op := trace.FromContext(ctx, "ExitCode: %s", vc.ContainerID)
+	defer trace.End(trace.Begin(vc.ContainerID, op))
+	opID := op.ID()
 
 	if c.client == nil {
 		return "", errors.NillPortlayerClientError("ContainerProxy")
 	}
 
-	results, err := c.client.Containers.GetContainerInfo(containers.NewGetContainerInfoParamsWithContext(ctx).WithID(vc.ContainerID))
+	results, err := c.client.Containers.GetContainerInfo(containers.NewGetContainerInfoParamsWithContext(ctx).
+		WithOpID(&opID).
+		WithID(vc.ContainerID))
+
 	if err != nil {
 		switch err := err.(type) {
 		case *containers.GetContainerInfoNotFound:
@@ -783,8 +836,11 @@ func (c *ContainerProxy) ExitCode(ctx context.Context, vc *viccontainer.VicConta
 	return strconv.Itoa(dockerState.ExitCode), nil
 }
 
-func (c *ContainerProxy) Wait(ctx context.Context, vc *viccontainer.VicContainer, timeout time.Duration) (
+func (c *VicContainerProxy) Wait(ctx context.Context, vc *viccontainer.VicContainer, timeout time.Duration) (
 	*types.ContainerState, error) {
+	op := trace.FromContext(ctx, "Wait: %s", vc.ContainerID)
+	defer trace.End(trace.Begin(vc.ContainerID, op))
+	opID := op.ID()
 
 	defer trace.End(trace.Begin(vc.ContainerID))
 
@@ -798,8 +854,10 @@ func (c *ContainerProxy) Wait(ctx context.Context, vc *viccontainer.VicContainer
 	}
 
 	params := containers.NewContainerWaitParamsWithContext(ctx).
+		WithOpID(&opID).
 		WithTimeout(int64(timeout.Seconds())).
 		WithID(vc.ContainerID)
+
 	results, err := c.client.Containers.ContainerWait(params)
 	if err != nil {
 		switch err := err.(type) {
@@ -826,8 +884,10 @@ func (c *ContainerProxy) Wait(ctx context.Context, vc *viccontainer.VicContainer
 	return dockerState, nil
 }
 
-func (c *ContainerProxy) Signal(ctx context.Context, vc *viccontainer.VicContainer, sig uint64) error {
-	defer trace.End(trace.Begin(vc.ContainerID))
+func (c *VicContainerProxy) Signal(ctx context.Context, vc *viccontainer.VicContainer, sig uint64) error {
+	op := trace.FromContext(ctx, "Signal: %s", vc.ContainerID)
+	defer trace.End(trace.Begin(vc.ContainerID, op))
+	opID := op.ID()
 
 	if vc == nil {
 		return errors.InternalServerError("Signal bad arguments")
@@ -845,7 +905,11 @@ func (c *ContainerProxy) Signal(ctx context.Context, vc *viccontainer.VicContain
 	if sig == 0 {
 		sig = uint64(syscall.SIGKILL)
 	}
-	params := containers.NewContainerSignalParamsWithContext(ctx).WithID(vc.ContainerID).WithSignal(int64(sig))
+	params := containers.NewContainerSignalParamsWithContext(ctx).
+		WithOpID(&opID).
+		WithID(vc.ContainerID).
+		WithSignal(int64(sig))
+
 	if _, err := c.client.Containers.ContainerSignal(params); err != nil {
 		switch err := err.(type) {
 		case *containers.ContainerSignalNotFound:
@@ -867,7 +931,11 @@ func (c *ContainerProxy) Signal(ctx context.Context, vc *viccontainer.VicContain
 	return nil
 }
 
-func (c *ContainerProxy) Resize(ctx context.Context, id string, height, width int32) error {
+func (c *VicContainerProxy) Resize(ctx context.Context, id string, height, width int32) error {
+	op := trace.FromContext(ctx, "Resize: %s", id)
+	defer trace.End(trace.Begin(id, op))
+	opID := op.ID()
+
 	defer trace.End(trace.Begin(id))
 
 	if c.client == nil {
@@ -875,6 +943,7 @@ func (c *ContainerProxy) Resize(ctx context.Context, id string, height, width in
 	}
 
 	plResizeParam := interaction.NewContainerResizeParamsWithContext(ctx).
+		WithOpID(&opID).
 		WithID(id).
 		WithHeight(height).
 		WithWidth(width)
@@ -894,8 +963,10 @@ func (c *ContainerProxy) Resize(ctx context.Context, id string, height, width in
 
 // Rename calls the portlayer's RenameContainerHandler to update the container name in the handle,
 // and then commit the new name to vSphere
-func (c *ContainerProxy) Rename(ctx context.Context, vc *viccontainer.VicContainer, newName string) error {
-	defer trace.End(trace.Begin(vc.ContainerID))
+func (c *VicContainerProxy) Rename(ctx context.Context, vc *viccontainer.VicContainer, newName string) error {
+	op := trace.FromContext(ctx, "Rename: %s", vc.ContainerID)
+	defer trace.End(trace.Begin(vc.ContainerID, op))
+	opID := op.ID()
 
 	//retrieve client to portlayer
 	handle, err := c.Handle(context.TODO(), vc.ContainerID, vc.Name)
@@ -908,7 +979,11 @@ func (c *ContainerProxy) Rename(ctx context.Context, vc *viccontainer.VicContain
 	}
 
 	// Call the rename functionality in the portlayer.
-	renameParams := containers.NewContainerRenameParamsWithContext(ctx).WithName(newName).WithHandle(handle)
+	renameParams := containers.NewContainerRenameParamsWithContext(ctx).
+		WithOpID(&opID).
+		WithName(newName).
+		WithHandle(handle)
+
 	result, err := c.client.Containers.ContainerRename(renameParams)
 	if err != nil {
 		switch err := err.(type) {
@@ -942,15 +1017,19 @@ func (c *ContainerProxy) Rename(ctx context.Context, vc *viccontainer.VicContain
 
 // Remove calls the portlayer's ContainerRemove handler to remove the container and its
 // anonymous volumes if the remove flag is set.
-func (c *ContainerProxy) Remove(ctx context.Context, vc *viccontainer.VicContainer, config *types.ContainerRmConfig) error {
-	defer trace.End(trace.Begin(vc.ContainerID))
+func (c *VicContainerProxy) Remove(ctx context.Context, vc *viccontainer.VicContainer, config *types.ContainerRmConfig) error {
+	op := trace.FromContext(ctx, "Remove: %s", vc.ContainerID)
+	defer trace.End(trace.Begin(vc.ContainerID, op))
+	opID := op.ID()
 
 	if c.client == nil {
 		return errors.NillPortlayerClientError("ContainerProxy")
 	}
 
 	id := vc.ContainerID
-	_, err := c.client.Containers.ContainerRemove(containers.NewContainerRemoveParamsWithContext(ctx).WithID(id))
+	_, err := c.client.Containers.ContainerRemove(containers.NewContainerRemoveParamsWithContext(ctx).
+		WithOpID(&opID).
+		WithID(id))
 	if err != nil {
 		switch err := err.(type) {
 		case *containers.ContainerRemoveNotFound:

vendor/github.com/vmware/vic/lib/apiservers/engine/proxy/storage_proxy.go

@@ -39,20 +39,22 @@ import (
 	"github.com/vmware/vic/pkg/trace"
 )
 
-type VicStorageProxy interface {
+type StorageProxy interface {
 	Create(ctx context.Context, name, driverName string, volumeData, labels map[string]string) (*types.Volume, error)
+	VolumeExist(ctx context.Context, name string) (bool, error)
 	VolumeList(ctx context.Context, filter string) ([]*models.VolumeResponse, error)
 	VolumeInfo(ctx context.Context, name string) (*models.VolumeResponse, error)
 	Remove(ctx context.Context, name string) error
 
+	VolumeJoin(ctx context.Context, handle, volName, mountPath string, flags map[string]string) (string, error)
 	AddVolumesToContainer(ctx context.Context, handle string, config types.ContainerCreateConfig) (string, error)
 }
 
-type StorageProxy struct {
+type VicStorageProxy struct {
 	client *client.PortLayer
 }
 
-type volumeFields struct {
+type VolumeFields struct {
 	ID    string
 	Dest  string
 	Flags string
@@ -96,26 +98,27 @@ var SupportedVolDrivers = map[string]struct{}{
 //Validation pattern for Volume Names
 var volumeNameRegex = regexp.MustCompile("^[a-zA-Z0-9][a-zA-Z0-9_.-]*$")
 
-func NewStorageProxy(client *client.PortLayer) VicStorageProxy {
+func NewStorageProxy(client *client.PortLayer) *VicStorageProxy {
 	if client == nil {
 		return nil
 	}
 
-	return &StorageProxy{client: client}
+	return &VicStorageProxy{client: client}
 }
 
-func (s *StorageProxy) Create(ctx context.Context, name, driverName string, volumeData, labels map[string]string) (*types.Volume, error) {
-	defer trace.End(trace.Begin(""))
+func (s *VicStorageProxy) Create(ctx context.Context, name, driverName string, volumeData, labels map[string]string) (*types.Volume, error) {
+	op := trace.FromContext(ctx, "VolumeCreate: %s", name)
+	defer trace.End(trace.Begin(name, op))
 
 	if s.client == nil {
 		return nil, errors.NillPortlayerClientError("StorageProxy")
 	}
 
-	result, err := s.volumeCreate(ctx, name, driverName, volumeData, labels)
+	result, err := s.volumeCreate(op, name, driverName, volumeData, labels)
 	if err != nil {
 		switch err := err.(type) {
 		case *storage.CreateVolumeConflict:
-			return result, errors.VolumeInternalServerError(fmt.Errorf("A volume named %s already exists. Choose a different volume name.", name))
+			return result, errors.VolumeExistError{Volume: name}
 		case *storage.CreateVolumeNotFound:
 			return result, errors.VolumeInternalServerError(fmt.Errorf("No volume store named (%s) exists", volumeStore(volumeData)))
 		case *storage.CreateVolumeInternalServerError:
@@ -132,8 +135,9 @@ func (s *StorageProxy) Create(ctx context.Context, name, driverName string, volu
 }
 
 // volumeCreate issues a CreateVolume request to the portlayer
-func (s *StorageProxy) volumeCreate(ctx context.Context, name, driverName string, volumeData, labels map[string]string) (*types.Volume, error) {
-	defer trace.End(trace.Begin(""))
+func (s *VicStorageProxy) volumeCreate(op trace.Operation, name, driverName string, volumeData, labels map[string]string) (*types.Volume, error) {
+	defer trace.End(trace.Begin(name, op))
+	opID := op.ID()
 	result := &types.Volume{}
 
 	if s.client == nil {
@@ -150,9 +154,9 @@ func (s *StorageProxy) volumeCreate(ctx context.Context, name, driverName string
 	if varErr != nil {
 		return result, varErr
 	}
-	log.Infof("Finalized model for volume create request to portlayer: %#v", req)
+	op.Infof("Finalized model for volume create request to portlayer: %#v", req)
 
-	res, err := s.client.Storage.CreateVolume(storage.NewCreateVolumeParamsWithContext(ctx).WithVolumeRequest(req))
+	res, err := s.client.Storage.CreateVolume(storage.NewCreateVolumeParamsWithContext(op).WithOpID(&opID).WithVolumeRequest(req))
 	if err != nil {
 		return result, err
 	}
@@ -160,14 +164,31 @@ func (s *StorageProxy) volumeCreate(ctx context.Context, name, driverName string
 	return NewVolumeModel(res.Payload, labels), nil
 }
 
-func (s *StorageProxy) VolumeList(ctx context.Context, filter string) ([]*models.VolumeResponse, error) {
-	defer trace.End(trace.Begin(""))
+func (s *VicStorageProxy) VolumeExist(ctx context.Context, name string) (bool, error) {
+	defer trace.End(trace.Begin(name))
+
+	vols, err := s.VolumeList(ctx, "")
+	if err == nil {
+		for _, v := range vols {
+			if name == v.Name {
+				return true, nil
+			}
+		}
+	}
+
+	return false, err
+}
+
+func (s *VicStorageProxy) VolumeList(ctx context.Context, filter string) ([]*models.VolumeResponse, error) {
+	op := trace.FromContext(ctx, "VolumeList")
+	defer trace.End(trace.Begin("", op))
+	opID := op.ID()
 
 	if s.client == nil {
 		return nil, errors.NillPortlayerClientError("StorageProxy")
 	}
 
-	res, err := s.client.Storage.ListVolumes(storage.NewListVolumesParamsWithContext(ctx).WithFilterString(&filter))
+	res, err := s.client.Storage.ListVolumes(storage.NewListVolumesParamsWithContext(op).WithOpID(&opID).WithFilterString(&filter))
 	if err != nil {
 		switch err := err.(type) {
 		case *storage.ListVolumesInternalServerError:
@@ -182,8 +203,10 @@ func (s *StorageProxy) VolumeList(ctx context.Context, filter string) ([]*models
 	return res.Payload, nil
 }
 
-func (s *StorageProxy) VolumeInfo(ctx context.Context, name string) (*models.VolumeResponse, error) {
-	defer trace.End(trace.Begin(name))
+func (s *VicStorageProxy) VolumeInfo(ctx context.Context, name string) (*models.VolumeResponse, error) {
+	op := trace.FromContext(ctx, "VolumeInfo: %s", name)
+	defer trace.End(trace.Begin(name, op))
+	opID := op.ID()
 
 	if name == "" {
 		return nil, nil
@@ -193,7 +216,7 @@ func (s *StorageProxy) VolumeInfo(ctx context.Context, name string) (*models.Vol
 		return nil, errors.NillPortlayerClientError("StorageProxy")
 	}
 
-	param := storage.NewGetVolumeParamsWithContext(ctx).WithName(name)
+	param := storage.NewGetVolumeParamsWithContext(op).WithOpID(&opID).WithName(name)
 	res, err := s.client.Storage.GetVolume(param)
 	if err != nil {
 		switch err := err.(type) {
@@ -207,14 +230,16 @@ func (s *StorageProxy) VolumeInfo(ctx context.Context, name string) (*models.Vol
 	return res.Payload, nil
 }
 
-func (s *StorageProxy) Remove(ctx context.Context, name string) error {
-	defer trace.End(trace.Begin(name))
+func (s *VicStorageProxy) Remove(ctx context.Context, name string) error {
+	op := trace.FromContext(ctx, "VolumeRemove: %s", name)
+	defer trace.End(trace.Begin(name, op))
+	opID := op.ID()
 
 	if s.client == nil {
 		return errors.NillPortlayerClientError("StorageProxy")
 	}
 
-	_, err := s.client.Storage.RemoveVolume(storage.NewRemoveVolumeParamsWithContext(ctx).WithName(name))
+	_, err := s.client.Storage.RemoveVolume(storage.NewRemoveVolumeParamsWithContext(op).WithOpID(&opID).WithName(name))
 	if err != nil {
 		switch err := err.(type) {
 		case *storage.RemoveVolumeNotFound:
@@ -236,16 +261,17 @@ func (s *StorageProxy) Remove(ctx context.Context, name string) error {
 //
 // returns:
 //	modified handle
-func (s *StorageProxy) AddVolumesToContainer(ctx context.Context, handle string, config types.ContainerCreateConfig) (string, error) {
-	defer trace.End(trace.Begin(handle))
+func (s *VicStorageProxy) AddVolumesToContainer(ctx context.Context, handle string, config types.ContainerCreateConfig) (string, error) {
+	op := trace.FromContext(ctx, "AddVolumesToContainer: %s", handle)
+	defer trace.End(trace.Begin(handle, op))
 
 	if s.client == nil {
 		return "", errors.NillPortlayerClientError("StorageProxy")
 	}
 
 	// Volume Attachment Section
-	log.Debugf("ContainerProxy.AddVolumesToContainer - VolumeSection")
-	log.Debugf("Raw volume arguments: binds:  %#v, volumes: %#v", config.HostConfig.Binds, config.Config.Volumes)
+	op.Debugf("ContainerProxy.AddVolumesToContainer - VolumeSection")
+	op.Debugf("Raw volume arguments: binds:  %#v, volumes: %#v", config.HostConfig.Binds, config.Config.Volumes)
 
 	// Collect all volume mappings. In a docker create/run, they
 	// can be anonymous (-v /dir) or specific (-v vol-name:/dir).
@@ -260,7 +286,7 @@ func (s *StorageProxy) AddVolumesToContainer(ctx context.Context, handle string,
 	if err != nil {
 		return handle, errors.BadRequestError(err.Error())
 	}
-	log.Infof("Finalized volume list: %#v", volList)
+	op.Infof("Finalized volume list: %#v", volList)
 
 	if len(config.Config.Volumes) > 0 {
 		// override anonymous volume list with generated volume id
@@ -269,7 +295,7 @@ func (s *StorageProxy) AddVolumesToContainer(ctx context.Context, handle string,
 				delete(config.Config.Volumes, vol.Dest)
 				mount := getMountString(vol.ID, vol.Dest, vol.Flags)
 				config.Config.Volumes[mount] = struct{}{}
-				log.Debugf("Replace anonymous volume config %s with %s", vol.Dest, mount)
+				op.Debugf("Replace anonymous volume config %s with %s", vol.Dest, mount)
 			}
 		}
 	}
@@ -285,59 +311,75 @@ func (s *StorageProxy) AddVolumesToContainer(ctx context.Context, handle string,
 		// NOTE: calling volumeCreate regardless of whether the volume is already
 		// present can be avoided by adding an extra optional param to VolumeJoin,
 		// which would then call volumeCreate if the volume does not exist.
-		_, err := s.volumeCreate(ctx, fields.ID, "vsphere", volumeData, nil)
-		if err != nil {
-			switch err := err.(type) {
-			case *storage.CreateVolumeConflict:
-				// Implicitly ignore the error where a volume with the same name
-				// already exists. We can just join the said volume to the container.
-				log.Infof("a volume with the name %s already exists", fields.ID)
-			case *storage.CreateVolumeNotFound:
-				return handle, errors.VolumeCreateNotFoundError(volumeStore(volumeData))
-			default:
-				return handle, errors.InternalServerError(err.Error())
-			}
-		} else {
-			log.Infof("volumeCreate succeeded. Volume mount section ID: %s", fields.ID)
+		_, err := s.Create(op, fields.ID, "vsphere", volumeData, nil)
+		if err != nil && !errors.IsVolumeExistError(err) {
+			return handle, err
 		}
 
 		flags := make(map[string]string)
 		//NOTE: for now we are passing the flags directly through. This is NOT SAFE and only a stop gap.
 		flags[constants.Mode] = fields.Flags
-		joinParams := storage.NewVolumeJoinParamsWithContext(ctx).WithJoinArgs(&models.VolumeJoinConfig{
-			Flags:     flags,
-			Handle:    handle,
-			MountPath: fields.Dest,
-		}).WithName(fields.ID)
-
-		res, err := s.client.Storage.VolumeJoin(joinParams)
+		h, err := s.VolumeJoin(op, handle, fields.ID, fields.Dest, flags)
 		if err != nil {
-			switch err := err.(type) {
-			case *storage.VolumeJoinInternalServerError:
-				return handle, errors.InternalServerError(err.Payload.Message)
-			case *storage.VolumeJoinDefault:
-				return handle, errors.InternalServerError(err.Payload.Message)
-			case *storage.VolumeJoinNotFound:
-				return handle, errors.VolumeJoinNotFoundError(err.Payload.Message)
-			default:
-				return handle, errors.InternalServerError(err.Error())
-			}
+			return handle, err
 		}
 
-		handle = res.Payload
+		handle = h
 	}
 
 	return handle, nil
 }
 
+// VolumeJoin declares a volume mount for a container.  This should be called on container create.
+func (s *VicStorageProxy) VolumeJoin(ctx context.Context, handle, volName, mountPath string, flags map[string]string) (string, error) {
+	op := trace.FromContext(ctx, "VolumeJoin: %s", handle)
+	defer trace.End(trace.Begin(handle, op))
+	opID := op.ID()
+
+	if s.client == nil {
+		return "", errors.NillPortlayerClientError("StorageProxy")
+	}
+
+	joinParams := storage.NewVolumeJoinParamsWithContext(op).
+		WithOpID(&opID).
+		WithJoinArgs(&models.VolumeJoinConfig{
+			Flags:     flags,
+			Handle:    handle,
+			MountPath: mountPath,
+		}).WithName(volName)
+
+	res, err := s.client.Storage.VolumeJoin(joinParams)
+	if err != nil {
+		switch err := err.(type) {
+		case *storage.VolumeJoinInternalServerError:
+			return handle, errors.InternalServerError(err.Payload.Message)
+		case *storage.VolumeJoinDefault:
+			return handle, errors.InternalServerError(err.Payload.Message)
+		case *storage.VolumeJoinNotFound:
+			return handle, errors.VolumeJoinNotFoundError(err.Payload.Message)
+		default:
+			return handle, errors.InternalServerError(err.Error())
+		}
+	}
+
+	handle = res.Payload
+
+	return handle, nil
+}
+
 // allContainers obtains all containers from the portlayer, akin to `docker ps -a`.
-func (s *StorageProxy) allContainers(ctx context.Context) ([]*models.ContainerInfo, error) {
+func (s *VicStorageProxy) allContainers(op trace.Operation) ([]*models.ContainerInfo, error) {
+	defer trace.End(trace.Begin("", op))
+	opID := op.ID()
+
 	if s.client == nil {
 		return nil, errors.NillPortlayerClientError("StorageProxy")
 	}
 
 	all := true
-	cons, err := s.client.Containers.GetContainerList(containers.NewGetContainerListParamsWithContext(ctx).WithAll(&all))
+	cons, err := s.client.Containers.GetContainerList(containers.NewGetContainerListParamsWithContext(op).
+		WithOpID(&opID).
+		WithAll(&all))
 	if err != nil {
 		return nil, err
 	}
@@ -347,8 +389,9 @@ func (s *StorageProxy) allContainers(ctx context.Context) ([]*models.ContainerIn
 
 // fetchJoinedVolumes obtains all containers from the portlayer and returns a map with all
 // volumes that are joined to at least one container.
-func (s *StorageProxy) fetchJoinedVolumes(ctx context.Context) (map[string]struct{}, error) {
-	conts, err := s.allContainers(ctx)
+func (s *VicStorageProxy) fetchJoinedVolumes(op trace.Operation) (map[string]struct{}, error) {
+	defer trace.End(trace.Begin("", op))
+	conts, err := s.allContainers(op)
 	if err != nil {
 		return nil, errors.VolumeInternalServerError(err)
 	}
@@ -410,6 +453,10 @@ func createVolumeMetadata(req *models.VolumeRequest, driverargs, labels map[stri
 // to at least one other container, and calls the portlayer to remove this container's
 // anonymous volumes if they are dangling. Errors, if any, are only logged.
 func RemoveAnonContainerVols(ctx context.Context, pl *client.PortLayer, cID string, vc *viccontainer.VicContainer) {
+	op := trace.FromContext(ctx, "RemoveAnonContainerVols: %s", cID)
+	defer trace.End(trace.Begin(cID, op))
+	opID := op.ID()
+
 	// NOTE: these strings come in the form of <volume id>:<destination>:<volume options>
 	volumes := vc.Config.Volumes
 	// NOTE: these strings come in the form of <volume id>:<destination path>
@@ -420,17 +467,17 @@ func RemoveAnonContainerVols(ctx context.Context, pl *client.PortLayer, cID stri
 	for _, entry := range namedVolumes {
 		fields := strings.SplitN(entry, ":", 2)
 		if len(fields) != 2 {
-			log.Errorf("Invalid entry in the HostConfig.Binds metadata section for container %s: %s", cID, entry)
+			op.Errorf("Invalid entry in the HostConfig.Binds metadata section for container %s: %s", cID, entry)
 			continue
 		}
 		destPath := fields[1]
 		namedMaskList[destPath] = struct{}{}
 	}
 
-	proxy := StorageProxy{client: pl}
-	joinedVols, err := proxy.fetchJoinedVolumes(ctx)
+	proxy := VicStorageProxy{client: pl}
+	joinedVols, err := proxy.fetchJoinedVolumes(op)
 	if err != nil {
-		log.Errorf("Unable to obtain joined volumes from portlayer, skipping removal of anonymous volumes for %s: %s", cID, err.Error())
+		op.Errorf("Unable to obtain joined volumes from portlayer, skipping removal of anonymous volumes for %s: %s", cID, err.Error())
 		return
 	}
 
@@ -440,7 +487,7 @@ func RemoveAnonContainerVols(ctx context.Context, pl *client.PortLayer, cID stri
 
 		// NOTE(mavery): this check will start to fail when we fix our metadata correctness issues
 		if len(volFields) != 3 {
-			log.Debugf("Invalid entry in the volumes metadata section for container %s: %s", cID, vol)
+			op.Debugf("Invalid entry in the volumes metadata section for container %s: %s", cID, vol)
 			continue
 		}
 		volName := volFields[0]
@@ -449,27 +496,27 @@ func RemoveAnonContainerVols(ctx context.Context, pl *client.PortLayer, cID stri
 		_, isNamed := namedMaskList[volPath]
 		_, joined := joinedVols[volName]
 		if !joined && !isNamed {
-			_, err := pl.Storage.RemoveVolume(storage.NewRemoveVolumeParamsWithContext(ctx).WithName(volName))
+			_, err := pl.Storage.RemoveVolume(storage.NewRemoveVolumeParamsWithContext(op).WithOpID(&opID).WithName(volName))
 			if err != nil {
-				log.Debugf("Unable to remove anonymous volume %s in container %s: %s", volName, cID, err.Error())
+				op.Debugf("Unable to remove anonymous volume %s in container %s: %s", volName, cID, err.Error())
 				continue
 			}
-			log.Debugf("Successfully removed anonymous volume %s during remove operation against container(%s)", volName, cID)
+			op.Debugf("Successfully removed anonymous volume %s during remove operation against container(%s)", volName, cID)
 		}
 	}
 }
 
-// processVolumeParam is used to turn any call from docker create -v <stuff> into a volumeFields object.
+// processVolumeParam is used to turn any call from docker create -v <stuff> into a VolumeFields object.
 // The -v has 3 forms. -v <anonymous mount path>, -v <Volume Name>:<Destination Mount Path> and
 // -v <Volume Name>:<Destination Mount Path>:<mount flags>
-func processVolumeParam(volString string) (volumeFields, error) {
+func processVolumeParam(volString string) (VolumeFields, error) {
 	volumeStrings := strings.Split(volString, ":")
-	fields := volumeFields{}
+	fields := VolumeFields{}
 
 	// Error out if the intended volume is a directory on the client filesystem.
 	numVolParams := len(volumeStrings)
 	if numVolParams > 1 && strings.HasPrefix(volumeStrings[0], "/") {
-		return volumeFields{}, errors.InvalidVolumeError{}
+		return VolumeFields{}, errors.InvalidVolumeError{}
 	}
 
 	// This switch determines which type of -v was invoked.
@@ -492,7 +539,7 @@ func processVolumeParam(volString string) (volumeFields, error) {
 		fields.Flags = volumeStrings[2]
 	default:
 		// NOTE: the docker cli should cover this case. This is here for posterity.
-		return volumeFields{}, errors.InvalidBindError{Volume: volString}
+		return VolumeFields{}, errors.InvalidBindError{Volume: volString}
 	}
 	return fields, nil
 }
@@ -500,8 +547,8 @@ func processVolumeParam(volString string) (volumeFields, error) {
 // processVolumeFields parses fields for volume mappings specified in a create/run -v.
 // It returns a map of unique mountable volumes. This means that it removes dupes favoring
 // specified volumes over anonymous volumes.
-func processVolumeFields(volumes []string) (map[string]volumeFields, error) {
-	volumeFields := make(map[string]volumeFields)
+func processVolumeFields(volumes []string) (map[string]VolumeFields, error) {
+	vf := make(map[string]VolumeFields)
 
 	for _, v := range volumes {
 		fields, err := processVolumeParam(v)
@@ -509,12 +556,12 @@ func processVolumeFields(volumes []string) (map[string]volumeFields, error) {
 		if err != nil {
 			return nil, err
 		}
-		volumeFields[fields.Dest] = fields
+		vf[fields.Dest] = fields
 	}
-	return volumeFields, nil
+	return vf, nil
 }
 
-func finalizeVolumeList(specifiedVolumes, anonymousVolumes []string) ([]volumeFields, error) {
+func finalizeVolumeList(specifiedVolumes, anonymousVolumes []string) ([]VolumeFields, error) {
 	log.Infof("Specified Volumes : %#v", specifiedVolumes)
 	processedVolumes, err := processVolumeFields(specifiedVolumes)
 	if err != nil {
@@ -532,7 +579,7 @@ func finalizeVolumeList(specifiedVolumes, anonymousVolumes []string) ([]volumeFi
 		processedAnonVolumes[k] = v
 	}
 
-	finalizedVolumes := make([]volumeFields, 0, len(processedAnonVolumes))
+	finalizedVolumes := make([]VolumeFields, 0, len(processedAnonVolumes))
 	for _, v := range processedAnonVolumes {
 		finalizedVolumes = append(finalizedVolumes, v)
 	}

vendor/github.com/vmware/vic/lib/apiservers/engine/proxy/stream_proxy.go

@@ -22,7 +22,6 @@ import (
 	"sync"
 	"time"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/go-openapi/strfmt"
 
 	"github.com/docker/docker/api/types/backend"
@@ -33,16 +32,18 @@ import (
 	"github.com/vmware/vic/lib/apiservers/portlayer/client"
 	"github.com/vmware/vic/lib/apiservers/portlayer/client/containers"
 	"github.com/vmware/vic/lib/apiservers/portlayer/client/interaction"
+	"github.com/vmware/vic/lib/apiservers/portlayer/client/events"
 	"github.com/vmware/vic/pkg/trace"
 )
 
-type VicStreamProxy interface {
-	AttachStreams(ctx context.Context, ac *AttachConfig, stdin io.ReadCloser, stdout, stderr io.Writer) error
+type StreamProxy interface {
+	AttachStreams(ctx context.Context, ac *AttachConfig, stdin io.ReadCloser, stdout, stderr io.Writer, autoclose bool) error
 	StreamContainerLogs(ctx context.Context, name string, out io.Writer, started chan struct{}, showTimestamps bool, followLogs bool, since int64, tailLines int64) error
 	StreamContainerStats(ctx context.Context, config *convert.ContainerStatsConfig) error
+	StreamEvents(ctx context.Context, out io.Writer) error
 }
 
-type StreamProxy struct {
+type VicStreamProxy struct {
 	client *client.PortLayer
 }
 
@@ -70,14 +71,18 @@ type AttachConfig struct {
 	CloseStdin bool
 }
 
-func NewStreamProxy(client *client.PortLayer) VicStreamProxy {
-	return &StreamProxy{client: client}
+func NewStreamProxy(client *client.PortLayer) *VicStreamProxy {
+	return &VicStreamProxy{client: client}
 }
 
 // AttachStreams takes the the hijacked connections from the calling client and attaches
 // them to the 3 streams from the portlayer's rest server.
 // stdin, stdout, stderr are the hijacked connection
-func (s *StreamProxy) AttachStreams(ctx context.Context, ac *AttachConfig, stdin io.ReadCloser, stdout, stderr io.Writer) error {
+// autoclose controls whether the underlying client transport will be closed when stdout/stderr
+func (s *VicStreamProxy) AttachStreams(ctx context.Context, ac *AttachConfig, stdin io.ReadCloser, stdout, stderr io.Writer, autoclose bool) error {
+	op := trace.FromContext(ctx, "")
+	defer trace.End(trace.Begin("", op))
+
 	// Cancel will close the child connections.
 	var wg, outWg sync.WaitGroup
 
@@ -96,10 +101,11 @@ func (s *StreamProxy) AttachStreams(ctx context.Context, ac *AttachConfig, stdin
 		}
 	}
 
-	ctx, cancel := context.WithCancel(ctx)
+	ctx, cancel := context.WithCancel(op)
 	defer cancel()
 
-	if ac.UseStdin {
+	if ac.UseStdin && autoclose {
+		// if we're not autoclosing then we don't want to block waiting for copyStdin to exit
 		wg.Add(1)
 	}
 
@@ -125,22 +131,26 @@ func (s *StreamProxy) AttachStreams(ctx context.Context, ac *AttachConfig, stdin
 
 	if ac.UseStdin {
 		go func() {
-			defer wg.Done()
-			err := copyStdIn(ctx, s.client, ac, stdin, keys)
+			if autoclose {
+				defer wg.Done()
+			}
+			err := copyStdIn(ctx, s.client, ac, stdin, keys, autoclose)
 			if err != nil {
-				log.Errorf("container attach: stdin (%s): %s", ac.ID, err)
+				op.Errorf("container attach: stdin (%s): %s", ac.ID, err)
 			} else {
-				log.Infof("container attach: stdin (%s) done", ac.ID)
+				op.Infof("container attach: stdin (%s) done", ac.ID)
+			}
+
+			// Check for EOF or canceled context. We can only detect EOF by checking the error string returned by swagger :/
+			// We check this before calling cancel so that we will be sure to return detach errors before stdout/err exits,
+			// even in the !autoclose case.
+			if EOForCanceled(err) {
+				errChan <- err
 			}
 
 			if !ac.CloseStdin || ac.UseTty {
 				cancel()
 			}
-
-			// Check for EOF or canceled context. We can only detect EOF by checking the error string returned by swagger :/
-			if EOForCanceled(err) {
-				errChan <- err
-			}
 		}()
 	}
 
@@ -151,9 +161,9 @@ func (s *StreamProxy) AttachStreams(ctx context.Context, ac *AttachConfig, stdin
 
 			err := copyStdOut(ctx, s.client, ac, stdout, attachAttemptTimeout)
 			if err != nil {
-				log.Errorf("container attach: stdout (%s): %s", ac.ID, err)
+				op.Errorf("container attach: stdout (%s): %s", ac.ID, err)
 			} else {
-				log.Infof("container attach: stdout (%s) done", ac.ID)
+				op.Infof("container attach: stdout (%s) done", ac.ID)
 			}
 
 			// Check for EOF or canceled context. We can only detect EOF by checking the error string returned by swagger :/
@@ -170,9 +180,9 @@ func (s *StreamProxy) AttachStreams(ctx context.Context, ac *AttachConfig, stdin
 
 			err := copyStdErr(ctx, s.client, ac, stderr)
 			if err != nil {
-				log.Errorf("container attach: stderr (%s): %s", ac.ID, err)
+				op.Errorf("container attach: stderr (%s): %s", ac.ID, err)
 			} else {
-				log.Infof("container attach: stderr (%s) done", ac.ID)
+				op.Infof("container attach: stderr (%s) done", ac.ID)
 			}
 
 			// Check for EOF or canceled context. We can only detect EOF by checking the error string returned by swagger :/
@@ -188,12 +198,12 @@ func (s *StreamProxy) AttachStreams(ctx context.Context, ac *AttachConfig, stdin
 	// close the channel so that we don't leak (if there is an error)/or get blocked (if there are no errors)
 	close(errChan)
 
-	log.Infof("cleaned up connections to %s. Checking errors", ac.ID)
+	op.Infof("cleaned up connections to %s", ac.ID)
 	for err := range errChan {
 		if err != nil {
 			// check if we got DetachError
 			if _, ok := err.(errors.DetachError); ok {
-				log.Infof("Detached from container detected")
+				op.Infof("Detached from container detected")
 				return err
 			}
 
@@ -202,20 +212,21 @@ func (s *StreamProxy) AttachStreams(ctx context.Context, ac *AttachConfig, stdin
 			// Go-swagger returns untyped errors to us if the error is not one that we define
 			// in the swagger spec.  Even EOF.  Therefore, we must scan the error string (if there
 			// is an error string in the untyped error) for the term EOF.
-			log.Errorf("container attach error: %s", err)
+			op.Errorf("container attach error: %s", err)
 
 			return err
 		}
 	}
 
-	log.Infof("No error found. Returning nil...")
 	return nil
 }
 
 // StreamContainerLogs reads the log stream from the portlayer rest server and writes
 // it directly to the io.Writer that is passed in.
-func (s *StreamProxy) StreamContainerLogs(ctx context.Context, name string, out io.Writer, started chan struct{}, showTimestamps bool, followLogs bool, since int64, tailLines int64) error {
-	defer trace.End(trace.Begin(""))
+func (s *VicStreamProxy) StreamContainerLogs(ctx context.Context, name string, out io.Writer, started chan struct{}, showTimestamps bool, followLogs bool, since int64, tailLines int64) error {
+	op := trace.FromContext(ctx, "")
+	defer trace.End(trace.Begin("", op))
+	opID := op.ID()
 
 	if s.client == nil {
 		return errors.NillPortlayerClientError("StreamProxy")
@@ -223,12 +234,13 @@ func (s *StreamProxy) StreamContainerLogs(ctx context.Context, name string, out
 
 	close(started)
 
-	params := containers.NewGetContainerLogsParamsWithContext(ctx).
+	params := containers.NewGetContainerLogsParamsWithContext(op).
 		WithID(name).
 		WithFollow(&followLogs).
 		WithTimestamp(&showTimestamps).
 		WithSince(&since).
-		WithTaillines(&tailLines)
+		WithTaillines(&tailLines).
+		WithOpID(&opID)
 	_, err := s.client.Containers.GetContainerLogs(params, out)
 	if err != nil {
 		switch err := err.(type) {
@@ -253,8 +265,10 @@ func (s *StreamProxy) StreamContainerLogs(ctx context.Context, name string, out
 // StreamContainerStats will provide a stream of container stats written to the provided
 // io.Writer.  Prior to writing to the provided io.Writer there will be a transformation
 // from the portLayer representation of stats to the docker format
-func (s *StreamProxy) StreamContainerStats(ctx context.Context, config *convert.ContainerStatsConfig) error {
-	defer trace.End(trace.Begin(config.ContainerID))
+func (s *VicStreamProxy) StreamContainerStats(ctx context.Context, config *convert.ContainerStatsConfig) error {
+	op := trace.FromContext(ctx, "")
+	defer trace.End(trace.Begin(config.ContainerID, op))
+	opID := op.ID()
 
 	if s.client == nil {
 		return errors.NillPortlayerClientError("StreamProxy")
@@ -264,7 +278,7 @@ func (s *StreamProxy) StreamContainerStats(ctx context.Context, config *convert.
 	ctx, cancel := context.WithCancel(ctx)
 	defer cancel()
 
-	params := containers.NewGetContainerStatsParamsWithContext(ctx)
+	params := containers.NewGetContainerStatsParamsWithContext(op).WithOpID(&opID)
 	params.ID = config.ContainerID
 	params.Stream = config.Stream
 
@@ -303,11 +317,48 @@ func (s *StreamProxy) StreamContainerStats(ctx context.Context, config *convert.
 	return nil
 }
 
+// StreamEvents() handles all swagger interaction to the Portlayer's event manager
+//
+// Input:
+//	context and a io.Writer
+func (s *VicStreamProxy) StreamEvents(ctx context.Context, out io.Writer) error {
+	op := trace.FromContext(ctx, "")
+	defer trace.End(trace.Begin("", op))
+	opID := op.ID()
+
+	if s.client == nil {
+		return errors.NillPortlayerClientError("StreamProxy")
+	}
+
+	params := events.NewGetEventsParamsWithContext(ctx).WithOpID(&opID)
+	if _, err := s.client.Events.GetEvents(params, out); err != nil {
+		switch err := err.(type) {
+		case *events.GetEventsInternalServerError:
+			return errors.InternalServerError("Server error from the events port layer")
+		default:
+			//Check for EOF.  Since the connection, transport, and data handling are
+			//encapsulated inside of Swagger, we can only detect EOF by checking the
+			//error string
+			if strings.Contains(err.Error(), SwaggerSubstringEOF) {
+				return nil
+			}
+			return errors.InternalServerError(fmt.Sprintf("Unknown error from the interaction port layer: %s", err))
+		}
+	}
+
+	return nil
+}
+
+
 //------------------------------------
 // ContainerAttach() Utility Functions
 //------------------------------------
 
-func copyStdIn(ctx context.Context, pl *client.PortLayer, ac *AttachConfig, stdin io.ReadCloser, keys []byte) error {
+func copyStdIn(ctx context.Context, pl *client.PortLayer, ac *AttachConfig, stdin io.ReadCloser, keys []byte, autoclose bool) error {
+	op := trace.FromContext(ctx, "")
+	defer trace.End(trace.Begin("", op))
+	opID := op.ID()
+
 	// Pipe for stdin so we can interject and watch the input streams for detach keys.
 	stdinReader, stdinWriter := io.Pipe()
 	defer stdinReader.Close()
@@ -315,26 +366,28 @@ func copyStdIn(ctx context.Context, pl *client.PortLayer, ac *AttachConfig, stdi
 	var detach bool
 
 	done := make(chan struct{})
-	go func() {
-		// make sure we get out of io.Copy if context is canceled
-		select {
-		case <-ctx.Done():
-			// This will cause the transport to the API client to be shut down, so all output
-			// streams will get closed as well.
-			// See the closer in container_routes.go:postContainersAttach
+	if autoclose {
+		go func() {
+			// make sure we get out of io.Copy if context is canceled
+			select {
+			case <-ctx.Done():
+				// This will cause the transport to the API client to be shut down, so all output
+				// streams will get closed as well.
+				// See the closer in container_routes.go:postContainersAttach
 
-			// We're closing this here to disrupt the io.Copy below
-			// TODO: seems like we should be providing an io.Copy impl with ctx argument that honors
-			// cancelation with the amount of code dedicated to working around it
+				// We're closing this here to disrupt the io.Copy below
+				// TODO: seems like we should be providing an io.Copy impl with ctx argument that honors
+				// cancelation with the amount of code dedicated to working around it
 
-			// TODO: I think this still leaves a race between closing of the API client transport and
-			// copying of the output streams, it's just likely the error will be dropped as the transport is
-			// closed when it occurs.
-			// We should move away from needing to close transports to interrupt reads.
-			stdin.Close()
-		case <-done:
-		}
-	}()
+				// TODO: I think this still leaves a race between closing of the API client transport and
+				// copying of the output streams, it's just likely the error will be dropped as the transport is
+				// closed when it occurs.
+				// We should move away from needing to close transports to interrupt reads.
+				stdin.Close()
+			case <-done:
+			}
+		}()
+	}
 
 	go func() {
 		defer close(done)
@@ -347,7 +400,7 @@ func copyStdIn(ctx context.Context, pl *client.PortLayer, ac *AttachConfig, stdi
 		// Write some init bytes into the pipe to force Swagger to make the initial
 		// call to the portlayer, prior to any user input in whatever attach client
 		// he/she is using.
-		log.Debugf("copyStdIn writing primer bytes")
+		op.Debugf("copyStdIn writing primer bytes")
 		stdinWriter.Write([]byte(attachStdinInitString))
 		if ac.UseTty {
 			_, err = copyEscapable(stdinWriter, stdin, keys)
@@ -357,10 +410,10 @@ func copyStdIn(ctx context.Context, pl *client.PortLayer, ac *AttachConfig, stdi
 
 		if err != nil {
 			if _, ok := err.(errors.DetachError); ok {
-				log.Infof("stdin detach detected")
+				op.Infof("stdin detach detected")
 				detach = true
 			} else {
-				log.Errorf("stdin err: %s", err)
+				op.Errorf("stdin err: %s", err)
 			}
 		}
 	}()
@@ -369,19 +422,21 @@ func copyStdIn(ctx context.Context, pl *client.PortLayer, ac *AttachConfig, stdi
 
 	// Swagger wants an io.reader so give it the reader pipe.  Also, the swagger call
 	// to set the stdin is synchronous so we need to run in a goroutine
-	setStdinParams := interaction.NewContainerSetStdinParamsWithContext(ctx).WithID(id)
-	setStdinParams = setStdinParams.WithRawStream(stdinReader)
+	setStdinParams := interaction.NewContainerSetStdinParamsWithContext(op).
+		WithID(id).
+		WithRawStream(stdinReader).
+		WithOpID(&opID)
 
 	_, err := pl.Interaction.ContainerSetStdin(setStdinParams)
 	<-done
 
 	if ac.CloseStdin && !ac.UseTty {
 		// Close the stdin connection.  Mimicing Docker's behavior.
-		log.Errorf("Attach stream has stdinOnce set.  Closing the stdin.")
+		op.Errorf("Attach stream has stdinOnce set.  Closing the stdin.")
 		params := interaction.NewContainerCloseStdinParamsWithContext(ctx).WithID(id)
 		_, err := pl.Interaction.ContainerCloseStdin(params)
 		if err != nil {
-			log.Errorf("CloseStdin failed with %s", err)
+			op.Errorf("CloseStdin failed with %s", err)
 		}
 	}
 
@@ -394,19 +449,21 @@ func copyStdIn(ctx context.Context, pl *client.PortLayer, ac *AttachConfig, stdi
 }
 
 func copyStdOut(ctx context.Context, pl *client.PortLayer, ac *AttachConfig, stdout io.Writer, attemptTimeout time.Duration) error {
+	op := trace.FromContext(ctx, "")
+	defer trace.End(trace.Begin("", op))
 	id := ac.ID
 
 	//Calculate how much time to let portlayer attempt
 	plAttemptTimeout := attemptTimeout - attachPLAttemptDiff //assumes personality deadline longer than portlayer's deadline
 	plAttemptDeadline := time.Now().Add(plAttemptTimeout)
 	swaggerDeadline := strfmt.DateTime(plAttemptDeadline)
-	log.Debugf("* stdout portlayer deadline: %s", plAttemptDeadline.Format(time.UnixDate))
-	log.Debugf("* stdout personality deadline: %s", time.Now().Add(attemptTimeout).Format(time.UnixDate))
+	op.Debugf("* stdout portlayer deadline: %s", plAttemptDeadline.Format(time.UnixDate))
+	op.Debugf("* stdout personality deadline: %s", time.Now().Add(attemptTimeout).Format(time.UnixDate))
 
-	log.Debugf("* stdout attach start %s", time.Now().Format(time.UnixDate))
+	op.Debugf("* stdout attach start %s", time.Now().Format(time.UnixDate))
 	getStdoutParams := interaction.NewContainerGetStdoutParamsWithContext(ctx).WithID(id).WithDeadline(&swaggerDeadline)
 	_, err := pl.Interaction.ContainerGetStdout(getStdoutParams, stdout)
-	log.Debugf("* stdout attach end %s", time.Now().Format(time.UnixDate))
+	op.Debugf("* stdout attach end %s", time.Now().Format(time.UnixDate))
 	if err != nil {
 		if _, ok := err.(*interaction.ContainerGetStdoutNotFound); ok {
 			return errors.ContainerResourceNotFoundError(id, "interaction connection")

vendor/github.com/vmware/vic/lib/apiservers/engine/proxy/system_proxy.go

@@ -37,7 +37,6 @@ import (
 
 	"golang.org/x/net/context"
 
-	log "github.com/Sirupsen/logrus"
 	derr "github.com/docker/docker/api/errors"
 
 	"github.com/vmware/vic/lib/apiservers/engine/errors"
@@ -48,36 +47,37 @@ import (
 	"github.com/vmware/vic/pkg/trace"
 )
 
-type VicSystemProxy interface {
+type SystemProxy interface {
 	PingPortlayer(ctx context.Context) bool
 	ContainerCount(ctx context.Context) (int, int, int, error)
 	VCHInfo(ctx context.Context) (*models.VCHInfo, error)
 }
 
-type SystemProxy struct {
+type VicSystemProxy struct {
 	client *client.PortLayer
 }
 
-func NewSystemProxy(client *client.PortLayer) VicSystemProxy {
+func NewSystemProxy(client *client.PortLayer) *VicSystemProxy {
 	if client == nil {
 		return nil
 	}
 
-	return &SystemProxy{client: client}
+	return &VicSystemProxy{client: client}
 }
 
-func (s *SystemProxy) PingPortlayer(ctx context.Context) bool {
-	defer trace.End(trace.Begin(""))
+func (s *VicSystemProxy) PingPortlayer(ctx context.Context) bool {
+	op := trace.FromContext(ctx, "")
+	defer trace.End(trace.Begin("", op))
 
 	if s.client == nil {
-		log.Errorf("Portlayer client is invalid")
+		op.Errorf("Portlayer client is invalid")
 		return false
 	}
 
 	pingParams := misc.NewPingParamsWithContext(ctx)
 	_, err := s.client.Misc.Ping(pingParams)
 	if err != nil {
-		log.Info("Ping to portlayer failed")
+		op.Info("Ping to portlayer failed")
 		return false
 	}
 	return true
@@ -85,8 +85,10 @@ func (s *SystemProxy) PingPortlayer(ctx context.Context) bool {
 
 // Use the Portlayer's support for docker ps to get the container count
 //   return order: running, paused, stopped counts
-func (s *SystemProxy) ContainerCount(ctx context.Context) (int, int, int, error) {
-	defer trace.End(trace.Begin(""))
+func (s *VicSystemProxy) ContainerCount(ctx context.Context) (int, int, int, error) {
+	op := trace.FromContext(ctx, "")
+	defer trace.End(trace.Begin("", op))
+	opID := op.ID()
 
 	var running, paused, stopped int
 
@@ -95,7 +97,8 @@ func (s *SystemProxy) ContainerCount(ctx context.Context) (int, int, int, error)
 	}
 
 	all := true
-	containList, err := s.client.Containers.GetContainerList(containers.NewGetContainerListParamsWithContext(ctx).WithAll(&all))
+	params := containers.NewGetContainerListParamsWithContext(ctx).WithAll(&all).WithOpID(&opID)
+	containList, err := s.client.Containers.GetContainerList(params)
 	if err != nil {
 		return 0, 0, 0, derr.NewErrorWithStatusCode(fmt.Errorf("Failed to get container list: %s", err), http.StatusInternalServerError)
 	}
@@ -112,14 +115,16 @@ func (s *SystemProxy) ContainerCount(ctx context.Context) (int, int, int, error)
 	return running, paused, stopped, nil
 }
 
-func (s *SystemProxy) VCHInfo(ctx context.Context) (*models.VCHInfo, error) {
-	defer trace.End(trace.Begin(""))
+func (s *VicSystemProxy) VCHInfo(ctx context.Context) (*models.VCHInfo, error) {
+	op := trace.FromContext(ctx, "")
+	defer trace.End(trace.Begin("", op))
+	opID := op.ID()
 
 	if s.client == nil {
 		return nil, errors.NillPortlayerClientError("SystemProxy")
 	}
 
-	params := misc.NewGetVCHInfoParamsWithContext(ctx)
+	params := misc.NewGetVCHInfoParamsWithContext(ctx).WithOpID(&opID)
 	resp, err := s.client.Misc.GetVCHInfo(params)
 	if err != nil {
 		//There are no custom error for this operation.  If we get back an error, it's

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/containers/commit_parameters.go

@@ -61,6 +61,8 @@ for the commit operation typically these are written to a http.Request
 */
 type CommitParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*Handle*/
 	Handle string
 	/*WaitTime*/
@@ -104,6 +106,17 @@ func (o *CommitParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the commit params
+func (o *CommitParams) WithOpID(opID *string) *CommitParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the commit params
+func (o *CommitParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithHandle adds the handle to the commit params
 func (o *CommitParams) WithHandle(handle string) *CommitParams {
 	o.SetHandle(handle)
@@ -132,6 +145,15 @@ func (o *CommitParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Regist
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	// path param handle
 	if err := r.SetPathParam("handle", o.Handle); err != nil {
 		return err

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/containers/container_remove_parameters.go

@@ -81,6 +81,8 @@ for the container remove operation typically these are written to a http.Request
 */
 type ContainerRemoveParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*Force*/
 	Force *bool
 	/*ID*/
@@ -126,6 +128,17 @@ func (o *ContainerRemoveParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the container remove params
+func (o *ContainerRemoveParams) WithOpID(opID *string) *ContainerRemoveParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the container remove params
+func (o *ContainerRemoveParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithForce adds the force to the container remove params
 func (o *ContainerRemoveParams) WithForce(force *bool) *ContainerRemoveParams {
 	o.SetForce(force)
@@ -165,6 +178,15 @@ func (o *ContainerRemoveParams) WriteToRequest(r runtime.ClientRequest, reg strf
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	if o.Force != nil {
 
 		// query param force

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/containers/container_rename_parameters.go

@@ -60,6 +60,8 @@ for the container rename operation typically these are written to a http.Request
 */
 type ContainerRenameParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*Handle*/
 	Handle string
 	/*Name
@@ -106,6 +108,17 @@ func (o *ContainerRenameParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the container rename params
+func (o *ContainerRenameParams) WithOpID(opID *string) *ContainerRenameParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the container rename params
+func (o *ContainerRenameParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithHandle adds the handle to the container rename params
 func (o *ContainerRenameParams) WithHandle(handle string) *ContainerRenameParams {
 	o.SetHandle(handle)
@@ -134,6 +147,15 @@ func (o *ContainerRenameParams) WriteToRequest(r runtime.ClientRequest, reg strf
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	// path param handle
 	if err := r.SetPathParam("handle", o.Handle); err != nil {
 		return err

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/containers/container_signal_parameters.go

@@ -61,6 +61,8 @@ for the container signal operation typically these are written to a http.Request
 */
 type ContainerSignalParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*ID*/
 	ID string
 	/*Signal*/
@@ -104,6 +106,17 @@ func (o *ContainerSignalParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the container signal params
+func (o *ContainerSignalParams) WithOpID(opID *string) *ContainerSignalParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the container signal params
+func (o *ContainerSignalParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithID adds the id to the container signal params
 func (o *ContainerSignalParams) WithID(id string) *ContainerSignalParams {
 	o.SetID(id)
@@ -132,6 +145,15 @@ func (o *ContainerSignalParams) WriteToRequest(r runtime.ClientRequest, reg strf
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	// path param id
 	if err := r.SetPathParam("id", o.ID); err != nil {
 		return err

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/containers/container_wait_parameters.go

@@ -61,6 +61,8 @@ for the container wait operation typically these are written to a http.Request
 */
 type ContainerWaitParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*ID*/
 	ID string
 	/*Timeout*/
@@ -104,6 +106,17 @@ func (o *ContainerWaitParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the container wait params
+func (o *ContainerWaitParams) WithOpID(opID *string) *ContainerWaitParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the container wait params
+func (o *ContainerWaitParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithID adds the id to the container wait params
 func (o *ContainerWaitParams) WithID(id string) *ContainerWaitParams {
 	o.SetID(id)
@@ -132,6 +145,15 @@ func (o *ContainerWaitParams) WriteToRequest(r runtime.ClientRequest, reg strfmt
 	r.SetTimeout(o.requestTimeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	// path param id
 	if err := r.SetPathParam("id", o.ID); err != nil {
 		return err

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/containers/create_parameters.go

@@ -62,6 +62,8 @@ for the create operation typically these are written to a http.Request
 */
 type CreateParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*CreateConfig*/
 	CreateConfig *models.ContainerCreateConfig
 	/*Name*/
@@ -105,6 +107,17 @@ func (o *CreateParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the create params
+func (o *CreateParams) WithOpID(opID *string) *CreateParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the create params
+func (o *CreateParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithCreateConfig adds the createConfig to the create params
 func (o *CreateParams) WithCreateConfig(createConfig *models.ContainerCreateConfig) *CreateParams {
 	o.SetCreateConfig(createConfig)
@@ -133,6 +146,15 @@ func (o *CreateParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Regist
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	if o.CreateConfig == nil {
 		o.CreateConfig = new(models.ContainerCreateConfig)
 	}

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/containers/get_container_info_parameters.go

@@ -60,6 +60,8 @@ for the get container info operation typically these are written to a http.Reque
 */
 type GetContainerInfoParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*ID*/
 	ID string
 
@@ -101,6 +103,17 @@ func (o *GetContainerInfoParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the get container info params
+func (o *GetContainerInfoParams) WithOpID(opID *string) *GetContainerInfoParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the get container info params
+func (o *GetContainerInfoParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithID adds the id to the get container info params
 func (o *GetContainerInfoParams) WithID(id string) *GetContainerInfoParams {
 	o.SetID(id)
@@ -118,6 +131,15 @@ func (o *GetContainerInfoParams) WriteToRequest(r runtime.ClientRequest, reg str
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	// path param id
 	if err := r.SetPathParam("id", o.ID); err != nil {
 		return err

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/containers/get_container_list_parameters.go

@@ -61,6 +61,8 @@ for the get container list operation typically these are written to a http.Reque
 */
 type GetContainerListParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*All*/
 	All *bool
 
@@ -102,6 +104,17 @@ func (o *GetContainerListParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the get container list params
+func (o *GetContainerListParams) WithOpID(opID *string) *GetContainerListParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the get container list params
+func (o *GetContainerListParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithAll adds the all to the get container list params
 func (o *GetContainerListParams) WithAll(all *bool) *GetContainerListParams {
 	o.SetAll(all)
@@ -119,6 +132,15 @@ func (o *GetContainerListParams) WriteToRequest(r runtime.ClientRequest, reg str
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	if o.All != nil {
 
 		// query param all

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/containers/get_container_logs_parameters.go

@@ -81,6 +81,8 @@ for the get container logs operation typically these are written to a http.Reque
 */
 type GetContainerLogsParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*Deadline*/
 	Deadline *int64
 	/*Follow*/
@@ -132,6 +134,17 @@ func (o *GetContainerLogsParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the get container logs params
+func (o *GetContainerLogsParams) WithOpID(opID *string) *GetContainerLogsParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the get container logs params
+func (o *GetContainerLogsParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithDeadline adds the deadline to the get container logs params
 func (o *GetContainerLogsParams) WithDeadline(deadline *int64) *GetContainerLogsParams {
 	o.SetDeadline(deadline)
@@ -204,6 +217,15 @@ func (o *GetContainerLogsParams) WriteToRequest(r runtime.ClientRequest, reg str
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	if o.Deadline != nil {
 
 		// query param deadline

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/containers/get_container_stats_parameters.go

@@ -61,6 +61,8 @@ for the get container stats operation typically these are written to a http.Requ
 */
 type GetContainerStatsParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*ID*/
 	ID string
 	/*Stream*/
@@ -104,6 +106,17 @@ func (o *GetContainerStatsParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the get container stats params
+func (o *GetContainerStatsParams) WithOpID(opID *string) *GetContainerStatsParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the get container stats params
+func (o *GetContainerStatsParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithID adds the id to the get container stats params
 func (o *GetContainerStatsParams) WithID(id string) *GetContainerStatsParams {
 	o.SetID(id)
@@ -132,6 +145,15 @@ func (o *GetContainerStatsParams) WriteToRequest(r runtime.ClientRequest, reg st
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	// path param id
 	if err := r.SetPathParam("id", o.ID); err != nil {
 		return err

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/containers/get_parameters.go

@@ -60,6 +60,8 @@ for the get operation typically these are written to a http.Request
 */
 type GetParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*ID*/
 	ID string
 
@@ -101,6 +103,17 @@ func (o *GetParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the get params
+func (o *GetParams) WithOpID(opID *string) *GetParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the get params
+func (o *GetParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithID adds the id to the get params
 func (o *GetParams) WithID(id string) *GetParams {
 	o.SetID(id)
@@ -118,6 +131,15 @@ func (o *GetParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry)
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	// path param id
 	if err := r.SetPathParam("id", o.ID); err != nil {
 		return err

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/containers/get_state_parameters.go

@@ -60,6 +60,8 @@ for the get state operation typically these are written to a http.Request
 */
 type GetStateParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*Handle*/
 	Handle string
 
@@ -101,6 +103,17 @@ func (o *GetStateParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the get state params
+func (o *GetStateParams) WithOpID(opID *string) *GetStateParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the get state params
+func (o *GetStateParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithHandle adds the handle to the get state params
 func (o *GetStateParams) WithHandle(handle string) *GetStateParams {
 	o.SetHandle(handle)
@@ -118,6 +131,15 @@ func (o *GetStateParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Regi
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	// path param handle
 	if err := r.SetPathParam("handle", o.Handle); err != nil {
 		return err

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/containers/state_change_parameters.go

@@ -60,6 +60,8 @@ for the state change operation typically these are written to a http.Request
 */
 type StateChangeParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*Handle*/
 	Handle string
 	/*State*/
@@ -103,6 +105,17 @@ func (o *StateChangeParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the state change params
+func (o *StateChangeParams) WithOpID(opID *string) *StateChangeParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the state change params
+func (o *StateChangeParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithHandle adds the handle to the state change params
 func (o *StateChangeParams) WithHandle(handle string) *StateChangeParams {
 	o.SetHandle(handle)
@@ -131,6 +144,15 @@ func (o *StateChangeParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.R
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	// path param handle
 	if err := r.SetPathParam("handle", o.Handle); err != nil {
 		return err

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/events/get_events_parameters.go

@@ -19,7 +19,7 @@ import (
 // NewGetEventsParams creates a new GetEventsParams object
 // with the default values initialized.
 func NewGetEventsParams() *GetEventsParams {
-
+	var ()
 	return &GetEventsParams{
 
 		timeout: cr.DefaultTimeout,
@@ -29,7 +29,7 @@ func NewGetEventsParams() *GetEventsParams {
 // NewGetEventsParamsWithTimeout creates a new GetEventsParams object
 // with the default values initialized, and the ability to set a timeout on a request
 func NewGetEventsParamsWithTimeout(timeout time.Duration) *GetEventsParams {
-
+	var ()
 	return &GetEventsParams{
 
 		timeout: timeout,
@@ -39,7 +39,7 @@ func NewGetEventsParamsWithTimeout(timeout time.Duration) *GetEventsParams {
 // NewGetEventsParamsWithContext creates a new GetEventsParams object
 // with the default values initialized, and the ability to set a context for a request
 func NewGetEventsParamsWithContext(ctx context.Context) *GetEventsParams {
-
+	var ()
 	return &GetEventsParams{
 
 		Context: ctx,
@@ -49,7 +49,7 @@ func NewGetEventsParamsWithContext(ctx context.Context) *GetEventsParams {
 // NewGetEventsParamsWithHTTPClient creates a new GetEventsParams object
 // with the default values initialized, and the ability to set a custom HTTPClient for a request
 func NewGetEventsParamsWithHTTPClient(client *http.Client) *GetEventsParams {
-
+	var ()
 	return &GetEventsParams{
 		HTTPClient: client,
 	}
@@ -59,6 +59,10 @@ func NewGetEventsParamsWithHTTPClient(client *http.Client) *GetEventsParams {
 for the get events operation typically these are written to a http.Request
 */
 type GetEventsParams struct {
+
+	/*OpID*/
+	OpID *string
+
 	timeout    time.Duration
 	Context    context.Context
 	HTTPClient *http.Client
@@ -97,12 +101,32 @@ func (o *GetEventsParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the get events params
+func (o *GetEventsParams) WithOpID(opID *string) *GetEventsParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the get events params
+func (o *GetEventsParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WriteToRequest writes these params to a swagger request
 func (o *GetEventsParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error {
 
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	if len(res) > 0 {
 		return errors.CompositeValidationError(res...)
 	}

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/interaction/container_close_stdin_parameters.go

@@ -60,6 +60,8 @@ for the container close stdin operation typically these are written to a http.Re
 */
 type ContainerCloseStdinParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*ID*/
 	ID string
 
@@ -101,6 +103,17 @@ func (o *ContainerCloseStdinParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the container close stdin params
+func (o *ContainerCloseStdinParams) WithOpID(opID *string) *ContainerCloseStdinParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the container close stdin params
+func (o *ContainerCloseStdinParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithID adds the id to the container close stdin params
 func (o *ContainerCloseStdinParams) WithID(id string) *ContainerCloseStdinParams {
 	o.SetID(id)
@@ -118,6 +131,15 @@ func (o *ContainerCloseStdinParams) WriteToRequest(r runtime.ClientRequest, reg
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	// path param id
 	if err := r.SetPathParam("id", o.ID); err != nil {
 		return err

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/interaction/container_get_stderr_parameters.go

@@ -60,6 +60,8 @@ for the container get stderr operation typically these are written to a http.Req
 */
 type ContainerGetStderrParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*Deadline*/
 	Deadline *strfmt.DateTime
 	/*ID*/
@@ -103,6 +105,17 @@ func (o *ContainerGetStderrParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the container get stderr params
+func (o *ContainerGetStderrParams) WithOpID(opID *string) *ContainerGetStderrParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the container get stderr params
+func (o *ContainerGetStderrParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithDeadline adds the deadline to the container get stderr params
 func (o *ContainerGetStderrParams) WithDeadline(deadline *strfmt.DateTime) *ContainerGetStderrParams {
 	o.SetDeadline(deadline)
@@ -131,6 +144,15 @@ func (o *ContainerGetStderrParams) WriteToRequest(r runtime.ClientRequest, reg s
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	if o.Deadline != nil {
 
 		// query param deadline

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/interaction/container_get_stdout_parameters.go

@@ -60,6 +60,8 @@ for the container get stdout operation typically these are written to a http.Req
 */
 type ContainerGetStdoutParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*Deadline*/
 	Deadline *strfmt.DateTime
 	/*ID*/
@@ -103,6 +105,17 @@ func (o *ContainerGetStdoutParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the container get stdout params
+func (o *ContainerGetStdoutParams) WithOpID(opID *string) *ContainerGetStdoutParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the container get stdout params
+func (o *ContainerGetStdoutParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithDeadline adds the deadline to the container get stdout params
 func (o *ContainerGetStdoutParams) WithDeadline(deadline *strfmt.DateTime) *ContainerGetStdoutParams {
 	o.SetDeadline(deadline)
@@ -131,6 +144,15 @@ func (o *ContainerGetStdoutParams) WriteToRequest(r runtime.ClientRequest, reg s
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	if o.Deadline != nil {
 
 		// query param deadline

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/interaction/container_resize_parameters.go

@@ -61,6 +61,8 @@ for the container resize operation typically these are written to a http.Request
 */
 type ContainerResizeParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*Height*/
 	Height int32
 	/*ID*/
@@ -106,6 +108,17 @@ func (o *ContainerResizeParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the container resize params
+func (o *ContainerResizeParams) WithOpID(opID *string) *ContainerResizeParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the container resize params
+func (o *ContainerResizeParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithHeight adds the height to the container resize params
 func (o *ContainerResizeParams) WithHeight(height int32) *ContainerResizeParams {
 	o.SetHeight(height)
@@ -145,6 +158,15 @@ func (o *ContainerResizeParams) WriteToRequest(r runtime.ClientRequest, reg strf
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	// query param height
 	qrHeight := o.Height
 	qHeight := swag.FormatInt32(qrHeight)

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/interaction/container_set_stdin_parameters.go

@@ -61,6 +61,8 @@ for the container set stdin operation typically these are written to a http.Requ
 */
 type ContainerSetStdinParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*Deadline*/
 	Deadline *strfmt.DateTime
 	/*ID*/
@@ -106,6 +108,17 @@ func (o *ContainerSetStdinParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the container set stdin params
+func (o *ContainerSetStdinParams) WithOpID(opID *string) *ContainerSetStdinParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the container set stdin params
+func (o *ContainerSetStdinParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithDeadline adds the deadline to the container set stdin params
 func (o *ContainerSetStdinParams) WithDeadline(deadline *strfmt.DateTime) *ContainerSetStdinParams {
 	o.SetDeadline(deadline)
@@ -145,6 +158,15 @@ func (o *ContainerSetStdinParams) WriteToRequest(r runtime.ClientRequest, reg st
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	if o.Deadline != nil {
 
 		// query param deadline

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/interaction/interaction_bind_parameters.go

@@ -62,6 +62,8 @@ for the interaction bind operation typically these are written to a http.Request
 */
 type InteractionBindParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*Config*/
 	Config *models.InteractionBindConfig
 
@@ -103,6 +105,17 @@ func (o *InteractionBindParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the interaction bind params
+func (o *InteractionBindParams) WithOpID(opID *string) *InteractionBindParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the interaction bind params
+func (o *InteractionBindParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithConfig adds the config to the interaction bind params
 func (o *InteractionBindParams) WithConfig(config *models.InteractionBindConfig) *InteractionBindParams {
 	o.SetConfig(config)
@@ -120,6 +133,15 @@ func (o *InteractionBindParams) WriteToRequest(r runtime.ClientRequest, reg strf
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	if o.Config == nil {
 		o.Config = new(models.InteractionBindConfig)
 	}

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/interaction/interaction_join_parameters.go

@@ -62,6 +62,8 @@ for the interaction join operation typically these are written to a http.Request
 */
 type InteractionJoinParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*Config*/
 	Config *models.InteractionJoinConfig
 
@@ -103,6 +105,17 @@ func (o *InteractionJoinParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the interaction join params
+func (o *InteractionJoinParams) WithOpID(opID *string) *InteractionJoinParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the interaction join params
+func (o *InteractionJoinParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithConfig adds the config to the interaction join params
 func (o *InteractionJoinParams) WithConfig(config *models.InteractionJoinConfig) *InteractionJoinParams {
 	o.SetConfig(config)
@@ -120,6 +133,15 @@ func (o *InteractionJoinParams) WriteToRequest(r runtime.ClientRequest, reg strf
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	if o.Config == nil {
 		o.Config = new(models.InteractionJoinConfig)
 	}

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/interaction/interaction_unbind_parameters.go

@@ -62,6 +62,8 @@ for the interaction unbind operation typically these are written to a http.Reque
 */
 type InteractionUnbindParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*Config*/
 	Config *models.InteractionUnbindConfig
 
@@ -103,6 +105,17 @@ func (o *InteractionUnbindParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the interaction unbind params
+func (o *InteractionUnbindParams) WithOpID(opID *string) *InteractionUnbindParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the interaction unbind params
+func (o *InteractionUnbindParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithConfig adds the config to the interaction unbind params
 func (o *InteractionUnbindParams) WithConfig(config *models.InteractionUnbindConfig) *InteractionUnbindParams {
 	o.SetConfig(config)
@@ -120,6 +133,15 @@ func (o *InteractionUnbindParams) WriteToRequest(r runtime.ClientRequest, reg st
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	if o.Config == nil {
 		o.Config = new(models.InteractionUnbindConfig)
 	}

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/kv/delete_value_parameters.go

@@ -60,6 +60,8 @@ for the delete value operation typically these are written to a http.Request
 */
 type DeleteValueParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*Key*/
 	Key string
 
@@ -101,6 +103,17 @@ func (o *DeleteValueParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the delete value params
+func (o *DeleteValueParams) WithOpID(opID *string) *DeleteValueParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the delete value params
+func (o *DeleteValueParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithKey adds the key to the delete value params
 func (o *DeleteValueParams) WithKey(key string) *DeleteValueParams {
 	o.SetKey(key)
@@ -118,6 +131,15 @@ func (o *DeleteValueParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.R
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	// path param key
 	if err := r.SetPathParam("key", o.Key); err != nil {
 		return err

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/kv/get_value_parameters.go

@@ -60,6 +60,8 @@ for the get value operation typically these are written to a http.Request
 */
 type GetValueParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*Key*/
 	Key string
 
@@ -101,6 +103,17 @@ func (o *GetValueParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the get value params
+func (o *GetValueParams) WithOpID(opID *string) *GetValueParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the get value params
+func (o *GetValueParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithKey adds the key to the get value params
 func (o *GetValueParams) WithKey(key string) *GetValueParams {
 	o.SetKey(key)
@@ -118,6 +131,15 @@ func (o *GetValueParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Regi
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	// path param key
 	if err := r.SetPathParam("key", o.Key); err != nil {
 		return err

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/kv/put_value_parameters.go

@@ -62,6 +62,8 @@ for the put value operation typically these are written to a http.Request
 */
 type PutValueParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*Key*/
 	Key string
 	/*KeyValue*/
@@ -105,6 +107,17 @@ func (o *PutValueParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the put value params
+func (o *PutValueParams) WithOpID(opID *string) *PutValueParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the put value params
+func (o *PutValueParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithKey adds the key to the put value params
 func (o *PutValueParams) WithKey(key string) *PutValueParams {
 	o.SetKey(key)
@@ -133,6 +146,15 @@ func (o *PutValueParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Regi
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	// path param key
 	if err := r.SetPathParam("key", o.Key); err != nil {
 		return err

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/logging/logging_bind_parameters.go

@@ -62,6 +62,8 @@ for the logging bind operation typically these are written to a http.Request
 */
 type LoggingBindParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*Config*/
 	Config *models.LoggingBindConfig
 
@@ -103,6 +105,17 @@ func (o *LoggingBindParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the logging bind params
+func (o *LoggingBindParams) WithOpID(opID *string) *LoggingBindParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the logging bind params
+func (o *LoggingBindParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithConfig adds the config to the logging bind params
 func (o *LoggingBindParams) WithConfig(config *models.LoggingBindConfig) *LoggingBindParams {
 	o.SetConfig(config)
@@ -120,6 +133,15 @@ func (o *LoggingBindParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.R
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	if o.Config == nil {
 		o.Config = new(models.LoggingBindConfig)
 	}

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/logging/logging_join_parameters.go

@@ -62,6 +62,8 @@ for the logging join operation typically these are written to a http.Request
 */
 type LoggingJoinParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*Config*/
 	Config *models.LoggingJoinConfig
 
@@ -103,6 +105,17 @@ func (o *LoggingJoinParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the logging join params
+func (o *LoggingJoinParams) WithOpID(opID *string) *LoggingJoinParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the logging join params
+func (o *LoggingJoinParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithConfig adds the config to the logging join params
 func (o *LoggingJoinParams) WithConfig(config *models.LoggingJoinConfig) *LoggingJoinParams {
 	o.SetConfig(config)
@@ -120,6 +133,15 @@ func (o *LoggingJoinParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.R
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	if o.Config == nil {
 		o.Config = new(models.LoggingJoinConfig)
 	}

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/logging/logging_unbind_parameters.go

@@ -62,6 +62,8 @@ for the logging unbind operation typically these are written to a http.Request
 */
 type LoggingUnbindParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*Config*/
 	Config *models.LoggingUnbindConfig
 
@@ -103,6 +105,17 @@ func (o *LoggingUnbindParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the logging unbind params
+func (o *LoggingUnbindParams) WithOpID(opID *string) *LoggingUnbindParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the logging unbind params
+func (o *LoggingUnbindParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithConfig adds the config to the logging unbind params
 func (o *LoggingUnbindParams) WithConfig(config *models.LoggingUnbindConfig) *LoggingUnbindParams {
 	o.SetConfig(config)
@@ -120,6 +133,15 @@ func (o *LoggingUnbindParams) WriteToRequest(r runtime.ClientRequest, reg strfmt
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	if o.Config == nil {
 		o.Config = new(models.LoggingUnbindConfig)
 	}

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/misc/get_v_c_h_info_parameters.go

@@ -19,7 +19,7 @@ import (
 // NewGetVCHInfoParams creates a new GetVCHInfoParams object
 // with the default values initialized.
 func NewGetVCHInfoParams() *GetVCHInfoParams {
-
+	var ()
 	return &GetVCHInfoParams{
 
 		timeout: cr.DefaultTimeout,
@@ -29,7 +29,7 @@ func NewGetVCHInfoParams() *GetVCHInfoParams {
 // NewGetVCHInfoParamsWithTimeout creates a new GetVCHInfoParams object
 // with the default values initialized, and the ability to set a timeout on a request
 func NewGetVCHInfoParamsWithTimeout(timeout time.Duration) *GetVCHInfoParams {
-
+	var ()
 	return &GetVCHInfoParams{
 
 		timeout: timeout,
@@ -39,7 +39,7 @@ func NewGetVCHInfoParamsWithTimeout(timeout time.Duration) *GetVCHInfoParams {
 // NewGetVCHInfoParamsWithContext creates a new GetVCHInfoParams object
 // with the default values initialized, and the ability to set a context for a request
 func NewGetVCHInfoParamsWithContext(ctx context.Context) *GetVCHInfoParams {
-
+	var ()
 	return &GetVCHInfoParams{
 
 		Context: ctx,
@@ -49,7 +49,7 @@ func NewGetVCHInfoParamsWithContext(ctx context.Context) *GetVCHInfoParams {
 // NewGetVCHInfoParamsWithHTTPClient creates a new GetVCHInfoParams object
 // with the default values initialized, and the ability to set a custom HTTPClient for a request
 func NewGetVCHInfoParamsWithHTTPClient(client *http.Client) *GetVCHInfoParams {
-
+	var ()
 	return &GetVCHInfoParams{
 		HTTPClient: client,
 	}
@@ -59,6 +59,10 @@ func NewGetVCHInfoParamsWithHTTPClient(client *http.Client) *GetVCHInfoParams {
 for the get v c h info operation typically these are written to a http.Request
 */
 type GetVCHInfoParams struct {
+
+	/*OpID*/
+	OpID *string
+
 	timeout    time.Duration
 	Context    context.Context
 	HTTPClient *http.Client
@@ -97,12 +101,32 @@ func (o *GetVCHInfoParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the get v c h info params
+func (o *GetVCHInfoParams) WithOpID(opID *string) *GetVCHInfoParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the get v c h info params
+func (o *GetVCHInfoParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WriteToRequest writes these params to a swagger request
 func (o *GetVCHInfoParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error {
 
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	if len(res) > 0 {
 		return errors.CompositeValidationError(res...)
 	}

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/scopes/add_container_parameters.go

@@ -62,6 +62,8 @@ for the add container operation typically these are written to a http.Request
 */
 type AddContainerParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*Config*/
 	Config *models.ScopesAddContainerConfig
 	/*Scope*/
@@ -105,6 +107,17 @@ func (o *AddContainerParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the add container params
+func (o *AddContainerParams) WithOpID(opID *string) *AddContainerParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the add container params
+func (o *AddContainerParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithConfig adds the config to the add container params
 func (o *AddContainerParams) WithConfig(config *models.ScopesAddContainerConfig) *AddContainerParams {
 	o.SetConfig(config)
@@ -133,6 +146,15 @@ func (o *AddContainerParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	if o.Config == nil {
 		o.Config = new(models.ScopesAddContainerConfig)
 	}

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/scopes/bind_container_parameters.go

@@ -60,6 +60,8 @@ for the bind container operation typically these are written to a http.Request
 */
 type BindContainerParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*Handle*/
 	Handle string
 
@@ -101,6 +103,17 @@ func (o *BindContainerParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the bind container params
+func (o *BindContainerParams) WithOpID(opID *string) *BindContainerParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the bind container params
+func (o *BindContainerParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithHandle adds the handle to the bind container params
 func (o *BindContainerParams) WithHandle(handle string) *BindContainerParams {
 	o.SetHandle(handle)
@@ -118,6 +131,15 @@ func (o *BindContainerParams) WriteToRequest(r runtime.ClientRequest, reg strfmt
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	// path param handle
 	if err := r.SetPathParam("handle", o.Handle); err != nil {
 		return err

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/scopes/create_scope_parameters.go

@@ -62,6 +62,8 @@ for the create scope operation typically these are written to a http.Request
 */
 type CreateScopeParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*Config*/
 	Config *models.ScopeConfig
 
@@ -103,6 +105,17 @@ func (o *CreateScopeParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the create scope params
+func (o *CreateScopeParams) WithOpID(opID *string) *CreateScopeParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the create scope params
+func (o *CreateScopeParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithConfig adds the config to the create scope params
 func (o *CreateScopeParams) WithConfig(config *models.ScopeConfig) *CreateScopeParams {
 	o.SetConfig(config)
@@ -120,6 +133,15 @@ func (o *CreateScopeParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.R
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	if o.Config == nil {
 		o.Config = new(models.ScopeConfig)
 	}

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/scopes/delete_scope_parameters.go

@@ -60,6 +60,8 @@ for the delete scope operation typically these are written to a http.Request
 */
 type DeleteScopeParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*IDName*/
 	IDName string
 
@@ -101,6 +103,17 @@ func (o *DeleteScopeParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the delete scope params
+func (o *DeleteScopeParams) WithOpID(opID *string) *DeleteScopeParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the delete scope params
+func (o *DeleteScopeParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithIDName adds the iDName to the delete scope params
 func (o *DeleteScopeParams) WithIDName(iDName string) *DeleteScopeParams {
 	o.SetIDName(iDName)
@@ -118,6 +131,15 @@ func (o *DeleteScopeParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.R
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	// path param idName
 	if err := r.SetPathParam("idName", o.IDName); err != nil {
 		return err

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/scopes/get_container_endpoints_parameters.go

@@ -60,6 +60,8 @@ for the get container endpoints operation typically these are written to a http.
 */
 type GetContainerEndpointsParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*HandleOrID*/
 	HandleOrID string
 
@@ -101,6 +103,17 @@ func (o *GetContainerEndpointsParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the get container endpoints params
+func (o *GetContainerEndpointsParams) WithOpID(opID *string) *GetContainerEndpointsParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the get container endpoints params
+func (o *GetContainerEndpointsParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithHandleOrID adds the handleOrID to the get container endpoints params
 func (o *GetContainerEndpointsParams) WithHandleOrID(handleOrID string) *GetContainerEndpointsParams {
 	o.SetHandleOrID(handleOrID)
@@ -118,6 +131,15 @@ func (o *GetContainerEndpointsParams) WriteToRequest(r runtime.ClientRequest, re
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	// path param handleOrId
 	if err := r.SetPathParam("handleOrId", o.HandleOrID); err != nil {
 		return err

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/scopes/list_all_parameters.go

@@ -19,7 +19,7 @@ import (
 // NewListAllParams creates a new ListAllParams object
 // with the default values initialized.
 func NewListAllParams() *ListAllParams {
-
+	var ()
 	return &ListAllParams{
 
 		timeout: cr.DefaultTimeout,
@@ -29,7 +29,7 @@ func NewListAllParams() *ListAllParams {
 // NewListAllParamsWithTimeout creates a new ListAllParams object
 // with the default values initialized, and the ability to set a timeout on a request
 func NewListAllParamsWithTimeout(timeout time.Duration) *ListAllParams {
-
+	var ()
 	return &ListAllParams{
 
 		timeout: timeout,
@@ -39,7 +39,7 @@ func NewListAllParamsWithTimeout(timeout time.Duration) *ListAllParams {
 // NewListAllParamsWithContext creates a new ListAllParams object
 // with the default values initialized, and the ability to set a context for a request
 func NewListAllParamsWithContext(ctx context.Context) *ListAllParams {
-
+	var ()
 	return &ListAllParams{
 
 		Context: ctx,
@@ -49,7 +49,7 @@ func NewListAllParamsWithContext(ctx context.Context) *ListAllParams {
 // NewListAllParamsWithHTTPClient creates a new ListAllParams object
 // with the default values initialized, and the ability to set a custom HTTPClient for a request
 func NewListAllParamsWithHTTPClient(client *http.Client) *ListAllParams {
-
+	var ()
 	return &ListAllParams{
 		HTTPClient: client,
 	}
@@ -59,6 +59,10 @@ func NewListAllParamsWithHTTPClient(client *http.Client) *ListAllParams {
 for the list all operation typically these are written to a http.Request
 */
 type ListAllParams struct {
+
+	/*OpID*/
+	OpID *string
+
 	timeout    time.Duration
 	Context    context.Context
 	HTTPClient *http.Client
@@ -97,12 +101,32 @@ func (o *ListAllParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the list all params
+func (o *ListAllParams) WithOpID(opID *string) *ListAllParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the list all params
+func (o *ListAllParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WriteToRequest writes these params to a swagger request
 func (o *ListAllParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error {
 
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	if len(res) > 0 {
 		return errors.CompositeValidationError(res...)
 	}

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/scopes/list_parameters.go

@@ -60,6 +60,8 @@ for the list operation typically these are written to a http.Request
 */
 type ListParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*IDName*/
 	IDName string
 
@@ -101,6 +103,17 @@ func (o *ListParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the list params
+func (o *ListParams) WithOpID(opID *string) *ListParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the list params
+func (o *ListParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithIDName adds the iDName to the list params
 func (o *ListParams) WithIDName(iDName string) *ListParams {
 	o.SetIDName(iDName)
@@ -118,6 +131,15 @@ func (o *ListParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	// path param idName
 	if err := r.SetPathParam("idName", o.IDName); err != nil {
 		return err

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/scopes/remove_container_parameters.go

@@ -60,6 +60,8 @@ for the remove container operation typically these are written to a http.Request
 */
 type RemoveContainerParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*Handle*/
 	Handle string
 	/*Scope*/
@@ -103,6 +105,17 @@ func (o *RemoveContainerParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the remove container params
+func (o *RemoveContainerParams) WithOpID(opID *string) *RemoveContainerParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the remove container params
+func (o *RemoveContainerParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithHandle adds the handle to the remove container params
 func (o *RemoveContainerParams) WithHandle(handle string) *RemoveContainerParams {
 	o.SetHandle(handle)
@@ -131,6 +144,15 @@ func (o *RemoveContainerParams) WriteToRequest(r runtime.ClientRequest, reg strf
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	// path param handle
 	if err := r.SetPathParam("handle", o.Handle); err != nil {
 		return err

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/scopes/unbind_container_parameters.go

@@ -60,6 +60,8 @@ for the unbind container operation typically these are written to a http.Request
 */
 type UnbindContainerParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*Handle*/
 	Handle string
 
@@ -101,6 +103,17 @@ func (o *UnbindContainerParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the unbind container params
+func (o *UnbindContainerParams) WithOpID(opID *string) *UnbindContainerParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the unbind container params
+func (o *UnbindContainerParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithHandle adds the handle to the unbind container params
 func (o *UnbindContainerParams) WithHandle(handle string) *UnbindContainerParams {
 	o.SetHandle(handle)
@@ -118,6 +131,15 @@ func (o *UnbindContainerParams) WriteToRequest(r runtime.ClientRequest, reg strf
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	// path param handle
 	if err := r.SetPathParam("handle", o.Handle); err != nil {
 		return err

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/storage/create_image_store_parameters.go

@@ -62,6 +62,8 @@ for the create image store operation typically these are written to a http.Reque
 */
 type CreateImageStoreParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*Body*/
 	Body *models.ImageStore
 
@@ -103,6 +105,17 @@ func (o *CreateImageStoreParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the create image store params
+func (o *CreateImageStoreParams) WithOpID(opID *string) *CreateImageStoreParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the create image store params
+func (o *CreateImageStoreParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithBody adds the body to the create image store params
 func (o *CreateImageStoreParams) WithBody(body *models.ImageStore) *CreateImageStoreParams {
 	o.SetBody(body)
@@ -120,6 +133,15 @@ func (o *CreateImageStoreParams) WriteToRequest(r runtime.ClientRequest, reg str
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	if o.Body == nil {
 		o.Body = new(models.ImageStore)
 	}

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/storage/create_volume_parameters.go

@@ -62,6 +62,8 @@ for the create volume operation typically these are written to a http.Request
 */
 type CreateVolumeParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*VolumeRequest*/
 	VolumeRequest *models.VolumeRequest
 
@@ -103,6 +105,17 @@ func (o *CreateVolumeParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the create volume params
+func (o *CreateVolumeParams) WithOpID(opID *string) *CreateVolumeParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the create volume params
+func (o *CreateVolumeParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithVolumeRequest adds the volumeRequest to the create volume params
 func (o *CreateVolumeParams) WithVolumeRequest(volumeRequest *models.VolumeRequest) *CreateVolumeParams {
 	o.SetVolumeRequest(volumeRequest)
@@ -120,6 +133,15 @@ func (o *CreateVolumeParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	if o.VolumeRequest == nil {
 		o.VolumeRequest = new(models.VolumeRequest)
 	}

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/storage/delete_image_parameters.go

@@ -61,6 +61,8 @@ for the delete image operation typically these are written to a http.Request
 */
 type DeleteImageParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*ID*/
 	ID string
 	/*KeepNodes*/
@@ -106,6 +108,17 @@ func (o *DeleteImageParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the delete image params
+func (o *DeleteImageParams) WithOpID(opID *string) *DeleteImageParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the delete image params
+func (o *DeleteImageParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithID adds the id to the delete image params
 func (o *DeleteImageParams) WithID(id string) *DeleteImageParams {
 	o.SetID(id)
@@ -145,6 +158,15 @@ func (o *DeleteImageParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.R
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	// path param id
 	if err := r.SetPathParam("id", o.ID); err != nil {
 		return err

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/storage/export_archive_parameters.go

@@ -61,6 +61,8 @@ for the export archive operation typically these are written to a http.Request
 */
 type ExportArchiveParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*Ancestor*/
 	Ancestor *string
 	/*AncestorStore*/
@@ -112,6 +114,17 @@ func (o *ExportArchiveParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the export archive params
+func (o *ExportArchiveParams) WithOpID(opID *string) *ExportArchiveParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the export archive params
+func (o *ExportArchiveParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithAncestor adds the ancestor to the export archive params
 func (o *ExportArchiveParams) WithAncestor(ancestor *string) *ExportArchiveParams {
 	o.SetAncestor(ancestor)
@@ -184,6 +197,15 @@ func (o *ExportArchiveParams) WriteToRequest(r runtime.ClientRequest, reg strfmt
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	if o.Ancestor != nil {
 
 		// query param ancestor

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/storage/get_image_parameters.go

@@ -60,6 +60,8 @@ for the get image operation typically these are written to a http.Request
 */
 type GetImageParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*ID*/
 	ID string
 	/*StoreName*/
@@ -103,6 +105,17 @@ func (o *GetImageParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the get image params
+func (o *GetImageParams) WithOpID(opID *string) *GetImageParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the get image params
+func (o *GetImageParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithID adds the id to the get image params
 func (o *GetImageParams) WithID(id string) *GetImageParams {
 	o.SetID(id)
@@ -131,6 +144,15 @@ func (o *GetImageParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Regi
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	// path param id
 	if err := r.SetPathParam("id", o.ID); err != nil {
 		return err

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/storage/get_image_tar_parameters.go

@@ -60,6 +60,8 @@ for the get image tar operation typically these are written to a http.Request
 */
 type GetImageTarParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*ID*/
 	ID string
 	/*StoreName*/
@@ -103,6 +105,17 @@ func (o *GetImageTarParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the get image tar params
+func (o *GetImageTarParams) WithOpID(opID *string) *GetImageTarParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the get image tar params
+func (o *GetImageTarParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithID adds the id to the get image tar params
 func (o *GetImageTarParams) WithID(id string) *GetImageTarParams {
 	o.SetID(id)
@@ -131,6 +144,15 @@ func (o *GetImageTarParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.R
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	// path param id
 	if err := r.SetPathParam("id", o.ID); err != nil {
 		return err

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/storage/get_volume_parameters.go

@@ -60,6 +60,8 @@ for the get volume operation typically these are written to a http.Request
 */
 type GetVolumeParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*Name*/
 	Name string
 
@@ -101,6 +103,17 @@ func (o *GetVolumeParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the get volume params
+func (o *GetVolumeParams) WithOpID(opID *string) *GetVolumeParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the get volume params
+func (o *GetVolumeParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithName adds the name to the get volume params
 func (o *GetVolumeParams) WithName(name string) *GetVolumeParams {
 	o.SetName(name)
@@ -118,6 +131,15 @@ func (o *GetVolumeParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Reg
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	// path param name
 	if err := r.SetPathParam("name", o.Name); err != nil {
 		return err

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/storage/image_join_parameters.go

@@ -62,6 +62,8 @@ for the image join operation typically these are written to a http.Request
 */
 type ImageJoinParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*Config*/
 	Config *models.ImageJoinConfig
 	/*ID*/
@@ -107,6 +109,17 @@ func (o *ImageJoinParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the image join params
+func (o *ImageJoinParams) WithOpID(opID *string) *ImageJoinParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the image join params
+func (o *ImageJoinParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithConfig adds the config to the image join params
 func (o *ImageJoinParams) WithConfig(config *models.ImageJoinConfig) *ImageJoinParams {
 	o.SetConfig(config)
@@ -146,6 +159,15 @@ func (o *ImageJoinParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Reg
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	if o.Config == nil {
 		o.Config = new(models.ImageJoinConfig)
 	}

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/storage/import_archive_parameters.go

@@ -63,6 +63,8 @@ type ImportArchiveParams struct {
 
 	/*Archive*/
 	Archive io.ReadCloser
+	/*OpID*/
+	OpID *string
 	/*DeviceID*/
 	DeviceID string
 	/*FilterSpec*/
@@ -119,6 +121,17 @@ func (o *ImportArchiveParams) SetArchive(archive io.ReadCloser) {
 	o.Archive = archive
 }
 
+// WithOpID adds the opID to the import archive params
+func (o *ImportArchiveParams) WithOpID(opID *string) *ImportArchiveParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the import archive params
+func (o *ImportArchiveParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithDeviceID adds the deviceID to the import archive params
 func (o *ImportArchiveParams) WithDeviceID(deviceID string) *ImportArchiveParams {
 	o.SetDeviceID(deviceID)
@@ -162,6 +175,15 @@ func (o *ImportArchiveParams) WriteToRequest(r runtime.ClientRequest, reg strfmt
 		return err
 	}
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	// query param deviceID
 	qrDeviceID := o.DeviceID
 	qDeviceID := qrDeviceID

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/storage/list_images_parameters.go

@@ -61,6 +61,8 @@ for the list images operation typically these are written to a http.Request
 */
 type ListImagesParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*Ids*/
 	Ids []string
 	/*StoreName*/
@@ -104,6 +106,17 @@ func (o *ListImagesParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the list images params
+func (o *ListImagesParams) WithOpID(opID *string) *ListImagesParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the list images params
+func (o *ListImagesParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithIds adds the ids to the list images params
 func (o *ListImagesParams) WithIds(ids []string) *ListImagesParams {
 	o.SetIds(ids)
@@ -132,6 +145,15 @@ func (o *ListImagesParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Re
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	valuesIds := o.Ids
 
 	joinedIds := swag.JoinByFormat(valuesIds, "")

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/storage/list_volumes_parameters.go

@@ -60,6 +60,8 @@ for the list volumes operation typically these are written to a http.Request
 */
 type ListVolumesParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*FilterString*/
 	FilterString *string
 
@@ -101,6 +103,17 @@ func (o *ListVolumesParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the list volumes params
+func (o *ListVolumesParams) WithOpID(opID *string) *ListVolumesParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the list volumes params
+func (o *ListVolumesParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithFilterString adds the filterString to the list volumes params
 func (o *ListVolumesParams) WithFilterString(filterString *string) *ListVolumesParams {
 	o.SetFilterString(filterString)
@@ -118,6 +131,15 @@ func (o *ListVolumesParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.R
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	if o.FilterString != nil {
 
 		// query param filterString

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/storage/remove_volume_parameters.go

@@ -60,6 +60,8 @@ for the remove volume operation typically these are written to a http.Request
 */
 type RemoveVolumeParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*Name*/
 	Name string
 
@@ -101,6 +103,17 @@ func (o *RemoveVolumeParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the remove volume params
+func (o *RemoveVolumeParams) WithOpID(opID *string) *RemoveVolumeParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the remove volume params
+func (o *RemoveVolumeParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithName adds the name to the remove volume params
 func (o *RemoveVolumeParams) WithName(name string) *RemoveVolumeParams {
 	o.SetName(name)
@@ -118,6 +131,15 @@ func (o *RemoveVolumeParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	// path param name
 	if err := r.SetPathParam("name", o.Name); err != nil {
 		return err

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/storage/stat_path_parameters.go

@@ -60,6 +60,8 @@ for the stat path operation typically these are written to a http.Request
 */
 type StatPathParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*DeviceID*/
 	DeviceID string
 	/*FilterSpec*/
@@ -105,6 +107,17 @@ func (o *StatPathParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the stat path params
+func (o *StatPathParams) WithOpID(opID *string) *StatPathParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the stat path params
+func (o *StatPathParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithDeviceID adds the deviceID to the stat path params
 func (o *StatPathParams) WithDeviceID(deviceID string) *StatPathParams {
 	o.SetDeviceID(deviceID)
@@ -144,6 +157,15 @@ func (o *StatPathParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Regi
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	// query param deviceID
 	qrDeviceID := o.DeviceID
 	qDeviceID := qrDeviceID

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/storage/volume_join_parameters.go

@@ -64,6 +64,8 @@ type VolumeJoinParams struct {
 
 	/*JoinArgs*/
 	JoinArgs *models.VolumeJoinConfig
+	/*OpID*/
+	OpID *string
 	/*Name*/
 	Name string
 
@@ -116,6 +118,17 @@ func (o *VolumeJoinParams) SetJoinArgs(joinArgs *models.VolumeJoinConfig) {
 	o.JoinArgs = joinArgs
 }
 
+// WithOpID adds the opID to the volume join params
+func (o *VolumeJoinParams) WithOpID(opID *string) *VolumeJoinParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the volume join params
+func (o *VolumeJoinParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithName adds the name to the volume join params
 func (o *VolumeJoinParams) WithName(name string) *VolumeJoinParams {
 	o.SetName(name)
@@ -141,6 +154,15 @@ func (o *VolumeJoinParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Re
 		return err
 	}
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	// path param name
 	if err := r.SetPathParam("name", o.Name); err != nil {
 		return err

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/storage/volume_stores_list_parameters.go

@@ -19,7 +19,7 @@ import (
 // NewVolumeStoresListParams creates a new VolumeStoresListParams object
 // with the default values initialized.
 func NewVolumeStoresListParams() *VolumeStoresListParams {
-
+	var ()
 	return &VolumeStoresListParams{
 
 		timeout: cr.DefaultTimeout,
@@ -29,7 +29,7 @@ func NewVolumeStoresListParams() *VolumeStoresListParams {
 // NewVolumeStoresListParamsWithTimeout creates a new VolumeStoresListParams object
 // with the default values initialized, and the ability to set a timeout on a request
 func NewVolumeStoresListParamsWithTimeout(timeout time.Duration) *VolumeStoresListParams {
-
+	var ()
 	return &VolumeStoresListParams{
 
 		timeout: timeout,
@@ -39,7 +39,7 @@ func NewVolumeStoresListParamsWithTimeout(timeout time.Duration) *VolumeStoresLi
 // NewVolumeStoresListParamsWithContext creates a new VolumeStoresListParams object
 // with the default values initialized, and the ability to set a context for a request
 func NewVolumeStoresListParamsWithContext(ctx context.Context) *VolumeStoresListParams {
-
+	var ()
 	return &VolumeStoresListParams{
 
 		Context: ctx,
@@ -49,7 +49,7 @@ func NewVolumeStoresListParamsWithContext(ctx context.Context) *VolumeStoresList
 // NewVolumeStoresListParamsWithHTTPClient creates a new VolumeStoresListParams object
 // with the default values initialized, and the ability to set a custom HTTPClient for a request
 func NewVolumeStoresListParamsWithHTTPClient(client *http.Client) *VolumeStoresListParams {
-
+	var ()
 	return &VolumeStoresListParams{
 		HTTPClient: client,
 	}
@@ -59,6 +59,10 @@ func NewVolumeStoresListParamsWithHTTPClient(client *http.Client) *VolumeStoresL
 for the volume stores list operation typically these are written to a http.Request
 */
 type VolumeStoresListParams struct {
+
+	/*OpID*/
+	OpID *string
+
 	timeout    time.Duration
 	Context    context.Context
 	HTTPClient *http.Client
@@ -97,12 +101,32 @@ func (o *VolumeStoresListParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the volume stores list params
+func (o *VolumeStoresListParams) WithOpID(opID *string) *VolumeStoresListParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the volume stores list params
+func (o *VolumeStoresListParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WriteToRequest writes these params to a swagger request
 func (o *VolumeStoresListParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error {
 
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	if len(res) > 0 {
 		return errors.CompositeValidationError(res...)
 	}

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/storage/write_image_parameters.go

@@ -61,6 +61,8 @@ for the write image operation typically these are written to a http.Request
 */
 type WriteImageParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*ImageFile*/
 	ImageFile io.ReadCloser
 	/*ImageID*/
@@ -114,6 +116,17 @@ func (o *WriteImageParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the write image params
+func (o *WriteImageParams) WithOpID(opID *string) *WriteImageParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the write image params
+func (o *WriteImageParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithImageFile adds the imageFile to the write image params
 func (o *WriteImageParams) WithImageFile(imageFile io.ReadCloser) *WriteImageParams {
 	o.SetImageFile(imageFile)
@@ -197,6 +210,15 @@ func (o *WriteImageParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Re
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	if err := r.SetBodyParam(o.ImageFile); err != nil {
 		return err
 	}

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/tasks/bind_parameters.go

@@ -62,6 +62,8 @@ for the bind operation typically these are written to a http.Request
 */
 type BindParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*Config*/
 	Config *models.TaskBindConfig
 
@@ -103,6 +105,17 @@ func (o *BindParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the bind params
+func (o *BindParams) WithOpID(opID *string) *BindParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the bind params
+func (o *BindParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithConfig adds the config to the bind params
 func (o *BindParams) WithConfig(config *models.TaskBindConfig) *BindParams {
 	o.SetConfig(config)
@@ -120,6 +133,15 @@ func (o *BindParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	if o.Config == nil {
 		o.Config = new(models.TaskBindConfig)
 	}

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/tasks/inspect_parameters.go

@@ -62,6 +62,8 @@ for the inspect operation typically these are written to a http.Request
 */
 type InspectParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*Config*/
 	Config *models.TaskInspectConfig
 
@@ -103,6 +105,17 @@ func (o *InspectParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the inspect params
+func (o *InspectParams) WithOpID(opID *string) *InspectParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the inspect params
+func (o *InspectParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithConfig adds the config to the inspect params
 func (o *InspectParams) WithConfig(config *models.TaskInspectConfig) *InspectParams {
 	o.SetConfig(config)
@@ -120,6 +133,15 @@ func (o *InspectParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Regis
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	if o.Config == nil {
 		o.Config = new(models.TaskInspectConfig)
 	}

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/tasks/join_parameters.go

@@ -62,6 +62,8 @@ for the join operation typically these are written to a http.Request
 */
 type JoinParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*Config*/
 	Config *models.TaskJoinConfig
 
@@ -103,6 +105,17 @@ func (o *JoinParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the join params
+func (o *JoinParams) WithOpID(opID *string) *JoinParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the join params
+func (o *JoinParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithConfig adds the config to the join params
 func (o *JoinParams) WithConfig(config *models.TaskJoinConfig) *JoinParams {
 	o.SetConfig(config)
@@ -120,6 +133,15 @@ func (o *JoinParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	if o.Config == nil {
 		o.Config = new(models.TaskJoinConfig)
 	}

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/tasks/remove_parameters.go

@@ -62,6 +62,8 @@ for the remove operation typically these are written to a http.Request
 */
 type RemoveParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*Config*/
 	Config *models.TaskRemoveConfig
 
@@ -103,6 +105,17 @@ func (o *RemoveParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the remove params
+func (o *RemoveParams) WithOpID(opID *string) *RemoveParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the remove params
+func (o *RemoveParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithConfig adds the config to the remove params
 func (o *RemoveParams) WithConfig(config *models.TaskRemoveConfig) *RemoveParams {
 	o.SetConfig(config)
@@ -120,6 +133,15 @@ func (o *RemoveParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Regist
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	if o.Config == nil {
 		o.Config = new(models.TaskRemoveConfig)
 	}

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/tasks/tasks_client.go

@@ -53,9 +53,9 @@ func (a *Client) Bind(params *BindParams) (*BindOK, error) {
 }
 
 /*
-Inspect initiates an task inspect operation
+Inspect initiates a task inspect operation
 
-Initiates an task inspect operation
+Initiates a task inspect operation
 */
 func (a *Client) Inspect(params *InspectParams) (*InspectOK, error) {
 	// TODO: Validate the params before sending
@@ -83,9 +83,9 @@ func (a *Client) Inspect(params *InspectParams) (*InspectOK, error) {
 }
 
 /*
-Join initiates an task join operation
+Join initiates a task join operation
 
-Initiates an task join operation
+Initiates a task join operation
 */
 func (a *Client) Join(params *JoinParams) (*JoinOK, error) {
 	// TODO: Validate the params before sending
@@ -113,9 +113,9 @@ func (a *Client) Join(params *JoinParams) (*JoinOK, error) {
 }
 
 /*
-Remove initiates an task remove operation
+Remove initiates a task remove operation
 
-Initiates an task remove operation
+Initiates a task remove operation
 */
 func (a *Client) Remove(params *RemoveParams) (*RemoveOK, error) {
 	// TODO: Validate the params before sending
@@ -173,9 +173,9 @@ func (a *Client) Unbind(params *UnbindParams) (*UnbindOK, error) {
 }
 
 /*
-Wait initiates an task wait operation
+Wait initiates a task wait operation
 
-Initiates an task wait operation
+Initiates a task wait operation
 */
 func (a *Client) Wait(params *WaitParams) (*WaitOK, error) {
 	// TODO: Validate the params before sending
@@ -185,8 +185,8 @@ func (a *Client) Wait(params *WaitParams) (*WaitOK, error) {
 
 	result, err := a.transport.Submit(&runtime.ClientOperation{
 		ID:                 "Wait",
-		Method:             "PUT",
-		PathPattern:        "/tasks",
+		Method:             "GET",
+		PathPattern:        "/tasks/wait",
 		ProducesMediaTypes: []string{"application/json"},
 		ConsumesMediaTypes: []string{"application/json", "application/octet-stream"},
 		Schemes:            []string{"http"},

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/tasks/unbind_parameters.go

@@ -62,6 +62,8 @@ for the unbind operation typically these are written to a http.Request
 */
 type UnbindParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*Config*/
 	Config *models.TaskUnbindConfig
 
@@ -103,6 +105,17 @@ func (o *UnbindParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the unbind params
+func (o *UnbindParams) WithOpID(opID *string) *UnbindParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the unbind params
+func (o *UnbindParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithConfig adds the config to the unbind params
 func (o *UnbindParams) WithConfig(config *models.TaskUnbindConfig) *UnbindParams {
 	o.SetConfig(config)
@@ -120,6 +133,15 @@ func (o *UnbindParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Regist
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	if o.Config == nil {
 		o.Config = new(models.TaskUnbindConfig)
 	}

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/tasks/wait_parameters.go

@@ -62,6 +62,8 @@ for the wait operation typically these are written to a http.Request
 */
 type WaitParams struct {
 
+	/*OpID*/
+	OpID *string
 	/*Config*/
 	Config *models.TaskWaitConfig
 
@@ -103,6 +105,17 @@ func (o *WaitParams) SetHTTPClient(client *http.Client) {
 	o.HTTPClient = client
 }
 
+// WithOpID adds the opID to the wait params
+func (o *WaitParams) WithOpID(opID *string) *WaitParams {
+	o.SetOpID(opID)
+	return o
+}
+
+// SetOpID adds the opId to the wait params
+func (o *WaitParams) SetOpID(opID *string) {
+	o.OpID = opID
+}
+
 // WithConfig adds the config to the wait params
 func (o *WaitParams) WithConfig(config *models.TaskWaitConfig) *WaitParams {
 	o.SetConfig(config)
@@ -120,6 +133,15 @@ func (o *WaitParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry
 	r.SetTimeout(o.timeout)
 	var res []error
 
+	if o.OpID != nil {
+
+		// header param Op-ID
+		if err := r.SetHeaderParam("Op-ID", *o.OpID); err != nil {
+			return err
+		}
+
+	}
+
 	if o.Config == nil {
 		o.Config = new(models.TaskWaitConfig)
 	}

vendor/github.com/vmware/vic/lib/apiservers/portlayer/client/tasks/wait_responses.go

@@ -69,7 +69,7 @@ type WaitOK struct {
 }
 
 func (o *WaitOK) Error() string {
-	return fmt.Sprintf("[PUT /tasks][%d] waitOK ", 200)
+	return fmt.Sprintf("[GET /tasks/wait][%d] waitOK ", 200)
 }
 
 func (o *WaitOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error {
@@ -91,7 +91,7 @@ type WaitNotFound struct {
 }
 
 func (o *WaitNotFound) Error() string {
-	return fmt.Sprintf("[PUT /tasks][%d] waitNotFound  %+v", 404, o.Payload)
+	return fmt.Sprintf("[GET /tasks/wait][%d] waitNotFound  %+v", 404, o.Payload)
 }
 
 func (o *WaitNotFound) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error {
@@ -120,7 +120,7 @@ type WaitPreconditionRequired struct {
 }
 
 func (o *WaitPreconditionRequired) Error() string {
-	return fmt.Sprintf("[PUT /tasks][%d] waitPreconditionRequired  %+v", 428, o.Payload)
+	return fmt.Sprintf("[GET /tasks/wait][%d] waitPreconditionRequired  %+v", 428, o.Payload)
 }
 
 func (o *WaitPreconditionRequired) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error {
@@ -142,14 +142,14 @@ func NewWaitInternalServerError() *WaitInternalServerError {
 
 /*WaitInternalServerError handles this case with default header values.
 
-Wait of task failed
+wait of task failed
 */
 type WaitInternalServerError struct {
 	Payload *models.Error
 }
 
 func (o *WaitInternalServerError) Error() string {
-	return fmt.Sprintf("[PUT /tasks][%d] waitInternalServerError  %+v", 500, o.Payload)
+	return fmt.Sprintf("[GET /tasks/wait][%d] waitInternalServerError  %+v", 500, o.Payload)
 }
 
 func (o *WaitInternalServerError) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error {

vendor/github.com/vmware/vic/lib/apiservers/portlayer/models/task_inspect_response.go

@@ -37,8 +37,8 @@ type TaskInspectResponse struct {
 	// process config
 	ProcessConfig *ProcessConfig `json:"processConfig,omitempty"`
 
-	// running
-	Running bool `json:"running,omitempty"`
+	// state
+	State string `json:"state,omitempty"`
 
 	// tty
 	Tty bool `json:"tty,omitempty"`

vendor/github.com/vmware/vic/lib/config/executor/container_vm.go

@@ -234,7 +234,6 @@ type Cmd struct {
 type SessionConfig struct {
 	// The primary session may have the same ID as the executor owning it
 	Common `vic:"0.1" scope:"read-only" key:"common"`
-	Detail `vic:"0.1" scope:"read-write" key:"detail"`
 
 	// The primary process for the session
 	Cmd Cmd `vic:"0.1" scope:"read-only" key:"cmd"`
@@ -278,6 +277,10 @@ type SessionConfig struct {
 	// Need to go here since UID/GID resolution must be done on appliance
 	User  string `vic:"0.1" scope:"read-only" key:"User"`
 	Group string `vic:"0.1" scope:"read-only" key:"Group"`
+
+	// Detail contains create/started/stopped timestamps. It is placed last in the structure so that all
+	// other state serialization is complete by the time this is updated when iterating in order.
+	Detail `vic:"0.1" scope:"read-write" key:"detail"`
 }
 
 type Detail struct {

vendor/github.com/vmware/vic/lib/constants/constants.go

@@ -1,4 +1,4 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
+// Copyright 2016-2018 VMware, Inc. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -78,6 +78,13 @@ const (
 
 	// Scratch layer ID
 	ScratchLayerID = "scratch"
+
+	// Task States
+	TaskRunningState = "running"
+	TaskStoppedState = "stopped"
+	TaskCreatedState = "created"
+	TaskFailedState  = "failed"
+	TaskUnknownState = "unknown"
 )
 
 func DefaultAltVCHGuestName() string {

vendor/github.com/vmware/vic/pkg/trace/operation.go

@@ -129,6 +129,10 @@ func (o *Operation) ID() string {
 	return o.id
 }
 
+func (o *Operation) Auditf(format string, args ...interface{}) {
+	o.Infof(format, args...)
+}
+
 func (o *Operation) Infof(format string, args ...interface{}) {
 	o.Info(fmt.Sprintf(format, args...))
 }
@@ -213,13 +217,22 @@ func (o *Operation) Fatal(args ...interface{}) {
 	}
 }
 
-func (o *Operation) newChild(ctx context.Context, msg string) Operation {
-	child := newOperation(ctx, o.id, 4, msg)
+func (o Operation) newChildCommon(ctx context.Context, opID string, msg string) Operation {
+	child := newOperation(ctx, opID, 5, msg)
 	child.t = append(child.t, o.t...)
 	child.Logger = o.Logger
 	return child
 }
 
+func (o Operation) newChild(ctx context.Context, msg string) Operation {
+	return o.newChildCommon(ctx, o.id, msg)
+}
+
+func (o Operation) newChildWithChainedID(ctx context.Context, msg string) Operation {
+	childOpID := fmt.Sprintf("%s.%d", o.id, atomic.AddUint64(&opCount, 1))
+	return o.newChildCommon(ctx, childOpID, msg)
+}
+
 func opID(opNum uint64) string {
 	return fmt.Sprintf("%d.%d", opIDPrefix, opNum)
 }
@@ -233,6 +246,24 @@ func NewOperation(ctx context.Context, format string, args ...interface{}) Opera
 	return o
 }
 
+// NewOperationFromID returns a an Operation with the incoming ID if valid
+// It creates a parent operation with the incoming ID and a child with
+// the parent operation ID as a prefix and a monotonically incremented
+// integer as the suffix
+func NewOperationFromID(ctx context.Context, ID *string, format string, args ...interface{}) Operation {
+	var o Operation
+	if ID == nil || *ID == "" {
+		o = newOperation(ctx, opID(atomic.AddUint64(&opCount, 1)), 3, fmt.Sprintf(format, args...))
+	} else {
+		msg := fmt.Sprintf(format, args...)
+		o = newOperation(ctx, *ID, 3, msg).newChildWithChainedID(ctx, msg)
+	}
+
+	frame := o.t[0]
+	o.Debugf("[NewOperationFromID] %s [%s:%d]", o.header(), frame.funcName, frame.lineNo)
+	return o
+}
+
 // NewOperationWithLoggerFrom will return a new operation with operationID added as a value to the
 // context and logging settings copied from the supplied operation.
 //

vendor/github.com/vmware/vic/pkg/trace/trace.go

@@ -108,7 +108,7 @@ func newTrace(msg string, skip int, opID string) *Message {
 // Begin starts the trace.  Msg is the msg to log.
 // context provided to allow tracing of operationID
 // context added as optional to avoid breaking current usage
-func Begin(msg string, ctx ...context.Context) *Message {
+func begin(msg string, ctx ...context.Context) *Message {
 	if tracingEnabled && Logger.Level >= logrus.DebugLevel {
 		var opID string
 		// populate operationID if provided
@@ -117,7 +117,7 @@ func Begin(msg string, ctx ...context.Context) *Message {
 				opID = id
 			}
 		}
-		if t := newTrace(msg, 2, opID); t != nil {
+		if t := newTrace(msg, 3, opID); t != nil {
 			if msg == "" {
 				Logger.Debugf("[BEGIN] %s [%s:%d]", t.operationID, t.funcName, t.lineNo)
 			} else {
@@ -130,6 +130,19 @@ func Begin(msg string, ctx ...context.Context) *Message {
 	return nil
 }
 
+func Begin(msg string, ctx ...context.Context) *Message {
+	return begin(msg, ctx...)
+}
+
+// Audit is a wrapper around Begin which logs an Audit message after
+func Audit(msg string, op Operation) *Message {
+	m := begin(msg, op)
+	if len(op.t) > 0 { // We expect an operation to always have at least one frame, but check for safety
+		op.Auditf(op.t[0].msg)
+	}
+	return m
+}
+
 // End ends the trace.
 func End(t *Message) {
 	if t == nil {

vendor/github.com/vmware/vic/pkg/vsphere/extraconfig/decode.go

@@ -60,7 +60,7 @@ func init() {
 // decode is the generic switcher that decides which decoder to use for a field
 func decode(src DataSource, dest reflect.Value, prefix string, depth recursion) (reflect.Value, error) {
 	// if depth has reached zero, we skip decoding entirely
-	if depth.depth == 0 {
+	if depth.depth == 0 || depth.skipDecode {
 		return dest, nil
 	}
 	depth.depth--
@@ -445,7 +445,7 @@ func Decode(src DataSource, dest interface{}) interface{} {
 	}
 
 	// #nosec: Errors unhandled.
-	value, _ := decode(src, reflect.ValueOf(dest), DefaultPrefix, Unbounded)
+	value, _ := decode(src, reflect.ValueOf(dest), "", Unbounded)
 
 	return value.Interface()
 }

vendor/github.com/vmware/vic/pkg/vsphere/extraconfig/decode_linux.go

@@ -42,7 +42,7 @@ func GuestInfoSourceWithPrefix(prefix string) (DataSource, error) {
 
 	source := func(key string) (string, error) {
 		if key != GuestInfoSecretKey {
-			key = addPrefixToKey(DefaultGuestInfoPrefix, prefix, key)
+			key = addPrefixToKey(defaultGuestInfoPrefix(), prefix, key)
 		}
 
 		value, err := guestinfo.String(key, "")

vendor/github.com/vmware/vic/pkg/vsphere/extraconfig/encode.go

@@ -62,7 +62,7 @@ func init() {
 // decode is the generic switcher that decides which decoder to use for a field
 func encode(sink DataSink, src reflect.Value, prefix string, depth recursion) {
 	// if depth has reached zero, we skip encoding entirely
-	if depth.depth == 0 {
+	if depth.depth == 0 || depth.skipEncode {
 		return
 	}
 	depth.depth--
@@ -258,7 +258,7 @@ type DataSink func(string, string) error
 
 // Encode serializes the given type to the supplied data sink
 func Encode(sink DataSink, src interface{}) {
-	encode(sink, reflect.ValueOf(src), DefaultPrefix, Unbounded)
+	encode(sink, reflect.ValueOf(src), "", Unbounded)
 }
 
 // EncodeWithPrefix serializes the given type to the supplied data sink, using

vendor/github.com/vmware/vic/pkg/vsphere/extraconfig/encode_linux.go

@@ -47,7 +47,7 @@ func GuestInfoSinkWithPrefix(prefix string) (DataSink, error) {
 			return nil
 		}
 
-		key = addPrefixToKey(DefaultGuestInfoPrefix, prefix, key)
+		key = addPrefixToKey(defaultGuestInfoPrefix(), prefix, key)
 
 		if value == "" {
 			value = "<nil>"

vendor/github.com/vmware/vic/pkg/vsphere/extraconfig/keys.go

@@ -27,23 +27,64 @@ import (
 )
 
 const (
-	// DefaultTagName value
+	// GuestInfoPrefix is dictated by vSphere
+	GuestInfoPrefix = "guestinfo."
+
+	// ScopeTag is the tag name used for declaring scopes for a field
+	ScopeTag = "scope"
+	// KeyTag is the tag name by which to override default key naming based on field name
+	KeyTag = "key"
+	// RecurseTag is the tag name with which different recursion properties are declared
+	RecurseTag = "recurse"
+
+	// HiddenScope means the key is hidden from the guest and will not have a GuestInfoPrefix
+	HiddenScope = "hidden"
+	// ReadOnlyScope means the key is read-only from the guest
+	ReadOnlyScope = "read-only"
+	// ReadWriteScope means the key may be read and modified by the guest
+	ReadWriteScope = "read-write"
+	// VolatileScope means that the value is expected to change and should be refreshed on use
+	VolatileScope = "volatile"
+
+	// SecretSuffix means the value should be encrypted in the vmx.
+	SecretSuffix = "secret"
+	// NonPersistentSuffix means the key should only be written if the key will be deleted on guest power off.
+	NonPersistentSuffix = "non-persistent"
+
+	// RecurseDepthProperty controls how deep to recuse into a structure field from this level. A value of zero
+	// prevents both encode and decode of that field. This is provided to control recursion into unannotated structures.
+	// This is unbounded if not specified.
+	RecurseDepthProperty = "depth"
+	// RecurseFollowProperty instructs encode and decode to follow pointers.
+	RecurseFollowProperty = "follow"
+	// RecurseNoFollowProperty instructs encode and decode not to follow pointers.
+	RecurseNoFollowProperty = "nofollow"
+	// RecurseSkipEncodeProperty causes the marked field and subfields to be skipped when encoding.
+	RecurseSkipEncodeProperty = "skip-encode"
+	// RecurseSkipDecodeProperty causes the marked field and subfields to be skipped when decoding.
+	RecurseSkipDecodeProperty = "skip-decode"
+)
+
+// TODO: this entire section of variables should be turned into a config struct
+// that can be passed to Encode and Decode, or that Encode and Decode are method on
+var (
+	// DefaultTagName is the annotation tag name we use for basic semantic version. Not currently used.
 	DefaultTagName = "vic"
-	// DefaultPrefix value
-	DefaultPrefix = ""
-	// DefaultGuestInfoPrefix value
-	DefaultGuestInfoPrefix = "guestinfo.vice."
+
+	// DefaultPrefix is prepended to generated key paths for basic namespacing
+	DefaultPrefix = "vice."
+
 	//Separator for slice values and map keys
 	Separator = "|"
 
 	// suffix separator character
 	suffixSeparator = "@"
-	// secret suffix
-	secretSuffix = "secret"
-	// non-persistent suffix
-	nonpersistentSuffix = "non-persistent"
 )
 
+func defaultGuestInfoPrefix() string {
+	return GuestInfoPrefix + DefaultPrefix
+}
+
 const (
 	// Invalid value
 	Invalid = 1 << iota
@@ -51,6 +92,8 @@ const (
 	Hidden
 	// ReadOnly value
 	ReadOnly
+	// WriteOnly value
+	WriteOnly
 	// ReadWrite value
 	ReadWrite
 	// NonPersistent value
@@ -66,6 +109,10 @@ type recursion struct {
 	depth int
 	// follow controls whether we follow pointers
 	follow bool
+	// set to skip decode of a field but still allow encode
+	skipDecode bool
+	// set to skip encode of a field but still allow decode
+	skipEncode bool
 }
 
 // Unbounded is the value used for unbounded recursion
@@ -103,17 +150,17 @@ func calculateScope(scopes []string) uint {
 
 	for _, v := range scopes {
 		switch v {
-		case "hidden":
+		case HiddenScope:
 			scope |= Hidden
-		case "read-only":
+		case ReadOnlyScope:
 			scope |= ReadOnly
-		case "read-write":
+		case ReadWriteScope:
 			scope |= ReadWrite
-		case nonpersistentSuffix:
-			scope |= NonPersistent
-		case "volatile":
+		case VolatileScope:
 			scope |= Volatile
-		case secretSuffix:
+		case NonPersistentSuffix:
+			scope |= NonPersistent
+		case SecretSuffix:
 			scope |= Secret | ReadOnly
 		default:
 			return Invalid
@@ -130,7 +177,7 @@ func isSecret(key string) bool {
 	}
 
 	for i := range suffix[1:] {
-		if suffix[i+1] == secretSuffix {
+		if suffix[i+1] == SecretSuffix {
 			return true
 		}
 	}
@@ -146,7 +193,7 @@ func isNonPersistent(key string) bool {
 	}
 
 	for i := range suffix[1:] {
-		if suffix[i+1] == nonpersistentSuffix {
+		if suffix[i+1] == NonPersistentSuffix {
 			return true
 		}
 	}
@@ -157,22 +204,22 @@ func isNonPersistent(key string) bool {
 func calculateScopeFromKey(key string) []string {
 	scopes := []string{}
 
-	if !strings.HasPrefix(key, DefaultGuestInfoPrefix) {
-		scopes = append(scopes, "hidden")
+	if !strings.HasPrefix(key, GuestInfoPrefix) {
+		scopes = append(scopes, HiddenScope)
 	}
 
 	if strings.Contains(key, "/") {
-		scopes = append(scopes, "read-only")
+		scopes = append(scopes, ReadOnlyScope)
 	} else {
-		scopes = append(scopes, "read-write")
+		scopes = append(scopes, ReadWriteScope)
 	}
 
 	if isSecret(key) {
-		scopes = append(scopes, secretSuffix)
+		scopes = append(scopes, SecretSuffix)
 	}
 
 	if isNonPersistent(key) {
-		scopes = append(scopes, nonpersistentSuffix)
+		scopes = append(scopes, NonPersistentSuffix)
 	}
 
 	return scopes
@@ -202,21 +249,21 @@ func calculateKeyFromField(field reflect.StructField, prefix string, depth recur
 	// do we have DefaultTagName?
 	if tags.Get(DefaultTagName) != "" {
 		// get the scopes
-		scopes = strings.Split(tags.Get("scope"), ",")
+		scopes = strings.Split(tags.Get(ScopeTag), ",")
 		logger.Debugf("Scopes: %#v", scopes)
 
 		// get the keys and split properties from it
-		key = tags.Get("key")
+		key = tags.Get(KeyTag)
 		logger.Debugf("Key specified: %s", key)
 
 		// get the keys and split properties from it
-		recurse := tags.Get("recurse")
+		recurse := tags.Get(RecurseTag)
 		if recurse != "" {
 			props := strings.Split(recurse, ",")
 			// process properties
 			for _, prop := range props {
 				// determine recursion depth
-				if strings.HasPrefix(prop, "depth") {
+				if strings.HasPrefix(prop, RecurseDepthProperty) {
 					parts := strings.Split(prop, "=")
 					if len(parts) != 2 {
 						logger.Warnf("Skipping field with incorrect recurse property: %s", prop)
@@ -229,10 +276,14 @@ func calculateKeyFromField(field reflect.StructField, prefix string, depth recur
 						return "", skip
 					}
 					fdepth.depth = int(val)
-				} else if prop == "nofollow" {
+				} else if prop == RecurseNoFollowProperty {
 					fdepth.follow = false
-				} else if prop == "follow" {
+				} else if prop == RecurseFollowProperty {
 					fdepth.follow = true
+				} else if prop == RecurseSkipDecodeProperty {
+					fdepth.skipDecode = true
+				} else if prop == RecurseSkipEncodeProperty {
+					fdepth.skipEncode = true
 				} else {
 					logger.Warnf("Ignoring unknown recurse property %s (%s)", key, prop)
 					continue
@@ -278,7 +329,7 @@ func calculateKey(scope uint, prefix string, key string) string {
 
 	hide := scope&Hidden != 0
 	write := scope&ReadWrite != 0
-	visible := strings.HasPrefix(prefix, DefaultGuestInfoPrefix)
+	visible := strings.HasPrefix(prefix, GuestInfoPrefix)
 
 	if !hide && write {
 		oldSep = "/"
@@ -298,7 +349,7 @@ func calculateKey(scope uint, prefix string, key string) string {
 	}
 
 	if scope&Secret != 0 {
-		out += suffixSeparator + secretSuffix
+		out += suffixSeparator + SecretSuffix
 	}
 
 	if scope&NonPersistent != 0 {
@@ -306,7 +357,7 @@ func calculateKey(scope uint, prefix string, key string) string {
 			logger.Debugf("Unable to combine non-persistent and hidden scopes")
 			return ""
 		}
-		out += suffixSeparator + nonpersistentSuffix
+		out += suffixSeparator + NonPersistentSuffix
 	}
 
 	// we don't care about existing separators when hiden
@@ -316,7 +367,7 @@ func calculateKey(scope uint, prefix string, key string) string {
 		}
 
 		// strip the prefix and the leading r/w signifier
-		return out[len(DefaultGuestInfoPrefix)+1:]
+		return out[len(defaultGuestInfoPrefix())+1:]
 	}
 
 	// ensure that separators are correct
@@ -324,11 +375,11 @@ func calculateKey(scope uint, prefix string, key string) string {
 
 	// Assemble the base that controls key publishing in guest
 	if !visible {
-		return DefaultGuestInfoPrefix + newSep + out
+		return defaultGuestInfoPrefix() + newSep + out
 	}
 
 	// prefix will have been mangled by strings.Replace
-	return DefaultGuestInfoPrefix + out[len(DefaultGuestInfoPrefix):]
+	return defaultGuestInfoPrefix() + out[len(defaultGuestInfoPrefix()):]
 }
 
 // utility function to allow adding of arbitrary prefix into key
@@ -508,3 +559,14 @@ func calculateKeys(v reflect.Value, field string, prefix string) []string {
 func CalculateKeys(obj interface{}, field string, prefix string) []string {
 	return calculateKeys(reflect.ValueOf(obj), field, prefix)
 }
+
+// CalculateKey is a specific case of CalculateKeys that will panic if more than one key
+// matches the field pattern passed in.
+func CalculateKey(obj interface{}, field string, prefix string) string {
+	keys := calculateKeys(reflect.ValueOf(obj), field, prefix)
+	if len(keys) != 1 {
+		panic("CalculateKey should only ever return one key")
+	}
+
+	return keys[0]
+}

vendor/github.com/vmware/vic/pkg/vsphere/extraconfig/secret.go

@@ -27,7 +27,7 @@ import (
 
 // The value of this key is hidden from API requests, but visible within the guest
 // #nosec: Potential hardcoded credentials
-const GuestInfoSecretKey = "guestinfo.ovfEnv"
+const GuestInfoSecretKey = GuestInfoPrefix + "ovfEnv"
 
 // SecretKey provides helpers to encrypt/decrypt extraconfig values
 type SecretKey struct {

vendor/github.com/vmware/vic/pkg/vsphere/session/session.go

@@ -226,6 +226,9 @@ func (s *Session) Connect(ctx context.Context) (*Session, error) {
 	}
 
 	soapClient.UserAgent = s.UserAgent
+	if s.UserAgent == "" {
+		op.Debug("DEVNOTICE: Session created with default user agent.")
+	}
 
 	soapClient.SetThumbprint(soapURL.Host, s.Thumbprint)
 
@@ -366,10 +369,46 @@ func (s *Session) Populate(ctx context.Context) (*Session, error) {
 		op.Debugf("Cached pool: %s", s.PoolPath)
 	}
 
+	err = s.setDatacenterFolders(op)
+	if err != nil {
+		errs = append(errs, fmt.Sprintf("Failure finding folders (%s): %s", s.DatacenterPath, err.Error()))
+	}
+
+	if len(errs) > 0 {
+		op.Debugf("Error count populating vSphere cache: (%d)", len(errs))
+		return nil, errors.New(strings.Join(errs, "\n"))
+	}
+	op.Debug("vSphere resource cache populated...")
+	return s, nil
+}
+
+func (s *Session) SetDatacenter(op trace.Operation, datacenter *object.Datacenter) error {
+	s.Datacenter = datacenter
+	s.Finder.SetDatacenter(datacenter)
+
+	if datacenter == nil {
+		s.DatacenterPath = ""
+		return nil
+	}
+
+	s.DatacenterPath = datacenter.InventoryPath
+
+	// Do what Populate would have done if datacenterPath were set
+	err := s.setDatacenterFolders(op)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (s *Session) setDatacenterFolders(op trace.Operation) error {
+	var err error
+
 	if s.Datacenter != nil {
-		folders, err := s.Datacenter.Folders(op)
-		if err != nil {
-			errs = append(errs, fmt.Sprintf("Failure finding folders (%s): %s", s.DatacenterPath, err.Error()))
+		folders, e := s.Datacenter.Folders(op)
+		if e != nil {
+			err = e
 		} else {
 			op.Debugf("Cached folders: %s", s.DatacenterPath)
 		}
@@ -384,12 +423,7 @@ func (s *Session) Populate(ctx context.Context) (*Session, error) {
 		s.VCHFolder = folders.VmFolder
 	}
 
-	if len(errs) > 0 {
-		op.Debugf("Error count populating vSphere cache: (%d)", len(errs))
-		return nil, errors.New(strings.Join(errs, "\n"))
-	}
-	op.Debug("vSphere resource cache populated...")
-	return s, nil
+	return err
 }
 
 func (s *Session) logEnvironmentInfo(op trace.Operation) {