mirror of https://github.com/hashicorp/packer
(vsphere-iso) remove deprecated network and disk fields (#9149)
* remove deprecated network and disk fieldspull/9258/head
jhawk28
6 years ago
committed by
GitHub
parent
541ec89654
commit
820f353573
@ -0,0 +1,110 @@
|
||||
package fix
|
||||
|
||||
import (
|
||||
"github.com/mitchellh/mapstructure"
|
||||
)
|
||||
|
||||
// FixerVSphereNetworkDisk changes vsphere-iso network and networkCard fields into a network adapter and
|
||||
// changes the disk_size, disk_thin_provisioned, and disk_eagerly_scrub into a storage adapter
|
||||
type FixerVSphereNetworkDisk struct{}
|
||||
|
||||
func (FixerVSphereNetworkDisk) Fix(input map[string]interface{}) (map[string]interface{}, error) {
|
||||
// The type we'll decode into; we only care about builders
|
||||
type template struct {
|
||||
Builders []map[string]interface{}
|
||||
}
|
||||
|
||||
// Decode the input into our structure, if we can
|
||||
var tpl template
|
||||
if err := mapstructure.Decode(input, &tpl); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
for _, builder := range tpl.Builders {
|
||||
builderTypeRaw, ok := builder["type"]
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
|
||||
builderType, ok := builderTypeRaw.(string)
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
|
||||
if builderType != "vsphere-iso" {
|
||||
continue
|
||||
}
|
||||
|
||||
var networkAdapters []interface{}
|
||||
nic := make(map[string]interface{})
|
||||
hasNetwork := false
|
||||
|
||||
networkRaw, ok := builder["network"]
|
||||
if ok {
|
||||
nic["network"] = networkRaw
|
||||
delete(builder, "network")
|
||||
hasNetwork = true
|
||||
}
|
||||
|
||||
networkCardRaw, ok := builder["networkCard"]
|
||||
if ok {
|
||||
nic["networkCard"] = networkCardRaw
|
||||
delete(builder, "networkCard")
|
||||
hasNetwork = true
|
||||
}
|
||||
|
||||
if hasNetwork {
|
||||
networkAdapters = append(networkAdapters, nic)
|
||||
adaptersRaw, ok := builder["network_adapters"]
|
||||
if ok {
|
||||
existingAdapters := adaptersRaw.([]interface{})
|
||||
networkAdapters = append(networkAdapters, existingAdapters...)
|
||||
}
|
||||
|
||||
builder["network_adapters"] = networkAdapters
|
||||
}
|
||||
|
||||
var storage []interface{}
|
||||
disk := make(map[string]interface{})
|
||||
hasStorage := false
|
||||
|
||||
diskSizeRaw, ok := builder["disk_size"]
|
||||
if ok {
|
||||
disk["disk_size"] = diskSizeRaw
|
||||
delete(builder, "disk_size")
|
||||
hasStorage = true
|
||||
}
|
||||
|
||||
discThinProvisionedRaw, ok := builder["disk_thin_provisioned"]
|
||||
if ok {
|
||||
disk["disk_thin_provisioned"] = discThinProvisionedRaw
|
||||
hasStorage = true
|
||||
delete(builder, "disk_thin_provisioned")
|
||||
}
|
||||
|
||||
diskEagerlyScrubRaw, ok := builder["disk_eagerly_scrub"]
|
||||
if ok {
|
||||
disk["disk_eagerly_scrub"] = diskEagerlyScrubRaw
|
||||
hasStorage = true
|
||||
delete(builder, "disk_eagerly_scrub")
|
||||
}
|
||||
|
||||
if hasStorage {
|
||||
storage = append(storage, disk)
|
||||
storageRaw, ok := builder["storage"]
|
||||
if ok {
|
||||
existingStorage := storageRaw.([]interface{})
|
||||
storage = append(storage, existingStorage...)
|
||||
}
|
||||
|
||||
builder["storage"] = storage
|
||||
}
|
||||
}
|
||||
|
||||
input["builders"] = tpl.Builders
|
||||
return input, nil
|
||||
}
|
||||
|
||||
func (FixerVSphereNetworkDisk) Synopsis() string {
|
||||
return `Removes deprecated network and disk fields from "vsphere-iso" builder`
|
||||
}
|
||||
@ -0,0 +1,138 @@
|
||||
package fix
|
||||
|
||||
import (
|
||||
"reflect"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestFixerVSphereNetwork_impl(t *testing.T) {
|
||||
var _ Fixer = new(FixerVSphereNetworkDisk)
|
||||
}
|
||||
|
||||
func TestFixerVSphereNetwork_Fix(t *testing.T) {
|
||||
cases := []struct {
|
||||
Input map[string]interface{}
|
||||
Expected map[string]interface{}
|
||||
}{
|
||||
{
|
||||
Input: map[string]interface{}{
|
||||
"type": "vsphere-iso",
|
||||
"network": "",
|
||||
"networkCard": "vmxnet3",
|
||||
"disk_size": 5000,
|
||||
},
|
||||
|
||||
Expected: map[string]interface{}{
|
||||
"type": "vsphere-iso",
|
||||
"network_adapters": []interface{}{
|
||||
map[string]interface{}{
|
||||
"network": "",
|
||||
"networkCard": "vmxnet3",
|
||||
},
|
||||
},
|
||||
"storage": []interface{}{
|
||||
map[string]interface{}{
|
||||
"disk_size": 5000,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
Input: map[string]interface{}{
|
||||
"type": "vsphere-iso",
|
||||
"network": "myNetwork",
|
||||
"networkCard": "vmxnet3",
|
||||
"disk_size": 5000,
|
||||
"disk_thin_provisioned": true,
|
||||
"disk_eagerly_scrub": true,
|
||||
},
|
||||
|
||||
Expected: map[string]interface{}{
|
||||
"type": "vsphere-iso",
|
||||
"network_adapters": []interface{}{
|
||||
map[string]interface{}{
|
||||
"network": "myNetwork",
|
||||
"networkCard": "vmxnet3",
|
||||
},
|
||||
},
|
||||
"storage": []interface{}{
|
||||
map[string]interface{}{
|
||||
"disk_size": 5000,
|
||||
"disk_thin_provisioned": true,
|
||||
"disk_eagerly_scrub": true,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
Input: map[string]interface{}{
|
||||
"type": "vsphere-iso",
|
||||
"network": "myNetwork",
|
||||
"networkCard": "vmxnet3",
|
||||
"disk_size": 5000,
|
||||
"disk_thin_provisioned": true,
|
||||
"disk_eagerly_scrub": true,
|
||||
"network_adapters": []interface{}{
|
||||
map[string]interface{}{
|
||||
"network": "net1",
|
||||
"networkCard": "vmxnet3",
|
||||
},
|
||||
},
|
||||
"storage": []interface{}{
|
||||
map[string]interface{}{
|
||||
"disk_size": 5001,
|
||||
"disk_thin_provisioned": true,
|
||||
"disk_eagerly_scrub": true,
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
Expected: map[string]interface{}{
|
||||
"type": "vsphere-iso",
|
||||
"network_adapters": []interface{}{
|
||||
map[string]interface{}{
|
||||
"network": "myNetwork",
|
||||
"networkCard": "vmxnet3",
|
||||
},
|
||||
map[string]interface{}{
|
||||
"network": "net1",
|
||||
"networkCard": "vmxnet3",
|
||||
},
|
||||
},
|
||||
"storage": []interface{}{
|
||||
map[string]interface{}{
|
||||
"disk_size": 5000,
|
||||
"disk_thin_provisioned": true,
|
||||
"disk_eagerly_scrub": true,
|
||||
},
|
||||
map[string]interface{}{
|
||||
"disk_size": 5001,
|
||||
"disk_thin_provisioned": true,
|
||||
"disk_eagerly_scrub": true,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
for _, tc := range cases {
|
||||
var f FixerVSphereNetworkDisk
|
||||
|
||||
input := map[string]interface{}{
|
||||
"builders": []map[string]interface{}{tc.Input},
|
||||
}
|
||||
|
||||
expected := map[string]interface{}{
|
||||
"builders": []map[string]interface{}{tc.Expected},
|
||||
}
|
||||
|
||||
output, err := f.Fix(input)
|
||||
if err != nil {
|
||||
t.Fatalf("err: %s", err)
|
||||
}
|
||||
|
||||
if !reflect.DeepEqual(output, expected) {
|
||||
t.Fatalf("unexpected: %#v\nexpected: %#v\n", output, expected)
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in new issue