update migration test

lib/migration/samples/plugins/plugin1/stop_signal_rename_sample.go

@@ -31,7 +31,7 @@ import (
 // If only a couple of items changed in the configuration, you don't have to copy all VirtualContainerHost. Only define the few items used by
 // this upgrade plugin will simplify the extraconfig encoding/decoding process
 const (
-	version = 1
+	version = 4
 	target  = manager.ApplianceConfigure
 )
 

lib/portlayer/exec/commit.go

@@ -28,11 +28,8 @@ import (
 	"github.com/vmware/vic/pkg/vsphere/vm"
 
 	log "github.com/Sirupsen/logrus"
-	"github.com/docker/docker/pkg/stringid"
 )
 
-const maxVMNameLength = 80
-
 // Commit executes the requires steps on the handle
 func Commit(ctx context.Context, sess *session.Session, h *Handle, waitTime *int32) error {
 	defer trace.End(trace.Begin(h.ExecConfig.ID))
@@ -97,21 +94,7 @@ func Commit(ctx context.Context, sess *session.Session, h *Handle, waitTime *int
 		h.Spec = nil
 
 		// reconfigure vm display name to containerName-containerID
-		shortID := stringid.TruncateID(c.ExecConfig.ID)
-		nameMaxLen := maxVMNameLength - len(shortID)
-		prettyName := c.ExecConfig.Name
-		if len(prettyName) > nameMaxLen-1 {
-			prettyName = prettyName[:nameMaxLen-1]
-		}
-
-		fullName := fmt.Sprintf("%s-%s", prettyName, shortID)
-		task, err := h.vm.VirtualMachine.Rename(ctx, fullName)
-		if err != nil {
-			return err
-		}
-
-		_, err = task.WaitForResult(ctx, nil)
-		if err != nil {
+		if err = c.UpdateDisplayName(ctx); err != nil {
 			return err
 		}
 

lib/portlayer/exec/container.go

@@ -35,6 +35,7 @@ import (
 	"github.com/vmware/vic/pkg/vsphere/vm"
 
 	log "github.com/Sirupsen/logrus"
+	"github.com/docker/docker/pkg/stringid"
 	"github.com/google/uuid"
 )
 
@@ -58,6 +59,8 @@ const (
 
 	vmNotSuspendedKey = "msg.suspend.powerOff.notsuspended"
 	vmPoweringOffKey  = "msg.rpc.error.poweringoff"
+
+	maxVMNameLength = 80
 )
 
 func (s State) String() string {
@@ -555,6 +558,37 @@ func (c *Container) Remove(ctx context.Context, sess *session.Session) error {
 	return nil
 }
 
+// Update the VM display name on vSphere UI
+func (c *Container) UpdateDisplayName(ctx context.Context) error {
+	defer trace.End(trace.Begin(c.ExecConfig.ID))
+	c.m.Lock()
+	defer c.m.Unlock()
+
+	if c.vm == nil {
+		return NotFoundError{}
+	}
+
+	shortID := stringid.TruncateID(c.ExecConfig.ID)
+	nameMaxLen := maxVMNameLength - len(shortID)
+	prettyName := c.ExecConfig.Name
+	if len(prettyName) > nameMaxLen-1 {
+		prettyName = prettyName[:nameMaxLen-1]
+	}
+
+	fullName := fmt.Sprintf("%s-%s", prettyName, shortID)
+	task, err := c.vm.VirtualMachine.Rename(ctx, fullName)
+	if err != nil {
+		return err
+	}
+
+	_, err = task.WaitForResult(ctx, nil)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
 // get the containerVMs from infrastructure for this resource pool
 func infraContainers(ctx context.Context, sess *session.Session) ([]*Container, error) {
 	defer trace.End(trace.Begin(""))

pkg/version/plugin2/commonSpecForVCH.go

@@ -0,0 +1,123 @@
+// Copyright 2017 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.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package plugin1
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/vmware/vic/lib/migration/manager"
+
+	log "github.com/Sirupsen/logrus"
+	"github.com/vmware/vic/lib/migration/errors"
+	"github.com/vmware/vic/pkg/trace"
+	"github.com/vmware/vic/pkg/vsphere/extraconfig"
+	"github.com/vmware/vic/pkg/vsphere/session"
+)
+
+const (
+	version = 2
+	target  = manager.ApplianceConfigure
+)
+
+func init() {
+	defer trace.End(trace.Begin(fmt.Sprintf("Registering plugin %s:%d", target, version)))
+	if err := manager.Migrator.Register(version, target, &AddCommonSpecForVCH{}); err != nil {
+		log.Errorf("Failed to register plugin %s:%d, %s", target, version, err)
+	}
+}
+
+// AddCommonSpecForVM is plugin for vic 0.8.0-GA version upgrade
+type AddCommonSpecForVCH struct {
+}
+
+type VirtualContainerHostConfigSpec struct {
+	ExecutorConfig `vic:"0.1" scope:"read-only" key:"init"`
+}
+
+type ExecutorConfig struct {
+	Common `vic:"0.1" scope:"read-only" key:"common"`
+}
+
+type Common struct {
+	// A reference to the components hosting execution environment, if any
+	ExecutionEnvironment string
+
+	// Unambiguous ID with meaning in the context of its hosting execution environment
+	ID string `vic:"0.1" scope:"read-only" key:"id"`
+
+	// Convenience field to record a human readable name
+	Name string `vic:"0.1" scope:"read-only" key:"name"`
+
+	// Freeform notes related to the entity
+	Notes string `vic:"0.1" scope:"hidden" key:"notes"`
+}
+
+type NewVirtualContainerHostConfigSpec struct {
+	NewExecutorConfig `vic:"0.1" scope:"read-only" key:"init"`
+}
+
+type NewExecutorConfig struct {
+	CommonSpecForVM `vic:"0.1" scope:"read-only" key:"common"`
+}
+
+type CommonSpecForVM struct {
+	// A reference to the components hosting execution environment, if any
+	ExecutionEnvironment string
+
+	// Unambiguous ID with meaning in the context of its hosting execution environment
+	ID string `vic:"0.1" scope:"read-only" key:"id"`
+
+	// Convenience field to record a human readable name
+	Name string `vic:"0.1" scope:"hidden" key:"name"`
+
+	// Freeform notes related to the entity
+	Notes string `vic:"0.1" scope:"hidden" key:"notes"`
+}
+
+func (p *AddCommonSpecForVCH) Migrate(ctx context.Context, s *session.Session, data interface{}) error {
+	defer trace.End(trace.Begin(fmt.Sprintf("AddCommonSpecForVCH version: %d", version)))
+	if data == nil {
+		return nil
+	}
+	mapData := data.(map[string]string)
+	oldStruct := &VirtualContainerHostConfigSpec{}
+	result := extraconfig.Decode(extraconfig.MapSource(mapData), oldStruct)
+	log.Debugf("The oldStruct is %+v", oldStruct)
+	if result == nil {
+		return &errors.DecodeError{}
+	}
+
+	newStruct := &NewVirtualContainerHostConfigSpec{
+		NewExecutorConfig: NewExecutorConfig{
+			CommonSpecForVM: CommonSpecForVM{
+				Name: oldStruct.Name,
+				ID: oldStruct.ID,
+				ExecutionEnvironment: oldStruct.ExecutionEnvironment,
+				Notes: oldStruct.Notes,
+			},
+		},
+	}
+
+	cfg := make(map[string]string)
+	extraconfig.Encode(extraconfig.MapSink(cfg), newStruct)
+	log.Debugf("The newStruct is %+v", newStruct)
+
+	for k, v := range cfg {
+		log.Debugf("New data: %s:%s", k, v)
+		mapData[k] = v
+	}
+	return nil
+}

pkg/version/plugin3/commonSpecForContainer.go

@@ -0,0 +1,112 @@
+// Copyright 2017 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.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package plugin1
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/vmware/vic/lib/migration/manager"
+
+	log "github.com/Sirupsen/logrus"
+	"github.com/vmware/vic/lib/migration/errors"
+	"github.com/vmware/vic/pkg/trace"
+	"github.com/vmware/vic/pkg/vsphere/extraconfig"
+	"github.com/vmware/vic/pkg/vsphere/session"
+)
+
+const (
+	version = 3
+	target  = manager.ContainerConfigure
+)
+
+func init() {
+	defer trace.End(trace.Begin(fmt.Sprintf("Registering plugin %s:%d", target, version)))
+	if err := manager.Migrator.Register(version, target, &AddCommonSpecForContainer{}); err != nil {
+		log.Errorf("Failed to register plugin %s:%d, %s", target, version, err)
+	}
+}
+
+// AddCommonSpecForVM is plugin for vic 0.8.0-GA version upgrade
+type AddCommonSpecForContainer struct {
+}
+
+type ExecutorConfig struct {
+	Common `vic:"0.1" scope:"read-only" key:"common"`
+}
+
+type Common struct {
+	// A reference to the components hosting execution environment, if any
+	ExecutionEnvironment string
+
+	// Unambiguous ID with meaning in the context of its hosting execution environment
+	ID string `vic:"0.1" scope:"read-only" key:"id"`
+
+	// Convenience field to record a human readable name
+	Name string `vic:"0.1" scope:"read-only" key:"name"`
+
+	// Freeform notes related to the entity
+	Notes string `vic:"0.1" scope:"hidden" key:"notes"`
+}
+
+type NewExecutorConfig struct {
+	CommonSpecForVM `vic:"0.1" scope:"read-only" key:"common"`
+}
+
+type CommonSpecForVM struct {
+	// A reference to the components hosting execution environment, if any
+	ExecutionEnvironment string
+
+	// Unambiguous ID with meaning in the context of its hosting execution environment
+	ID string `vic:"0.1" scope:"read-only" key:"id"`
+
+	// Convenience field to record a human readable name
+	Name string `vic:"0.1" scope:"hidden" key:"name"`
+
+	// Freeform notes related to the entity
+	Notes string `vic:"0.1" scope:"hidden" key:"notes"`
+}
+
+func (p *AddCommonSpecForContainer) Migrate(ctx context.Context, s *session.Session, data interface{}) error {
+	defer trace.End(trace.Begin(fmt.Sprintf("AddCommonSpecForContainer version %d", version)))
+	if data == nil {
+		return nil
+	}
+	mapData := data.(map[string]string)
+	oldStruct := &ExecutorConfig{}
+	result := extraconfig.Decode(extraconfig.MapSource(mapData), oldStruct)
+	log.Debugf("The oldStruct is %+v", oldStruct)
+	if result == nil {
+		return &errors.DecodeError{}
+	}
+
+	newStruct := &NewExecutorConfig{
+		CommonSpecForVM: CommonSpecForVM{
+			Name:                 oldStruct.Name,
+			ID:                   oldStruct.ID,
+			Notes:                oldStruct.Notes,
+			ExecutionEnvironment: oldStruct.ExecutionEnvironment,
+		}}
+
+	cfg := make(map[string]string)
+	extraconfig.Encode(extraconfig.MapSink(cfg), newStruct)
+	log.Debugf("The newStruct is %+v", newStruct)
+
+	for k, v := range cfg {
+		log.Debugf("New data: %s:%s", k, v)
+		mapData[k] = v
+	}
+	return nil
+}