iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix network card fixer (#9311)

This commit is contained in:
Megan Marsh 2020-05-28 02:30:21 -07:00 committed by GitHub
parent 40947c2bf6
commit 3ad2f86cc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fix/fixer_vsphere_network_storage.go
View File

@ -46,13 +46,22 @@ func (FixerVSphereNetworkDisk) Fix(input map[string]interface{}) (map[string]int
hasNetwork = true
}
// legacy syntax from when VSphere was 3rd party
networkCardRaw, ok := builder["networkCard"]
if ok {
nic["networkCard"] = networkCardRaw
nic["network_card"] = networkCardRaw
delete(builder, "networkCard")
hasNetwork = true
}
// underscored syntax used when Packer merged vSphere
networkCardRaw, ok = builder["network_card"]
if ok {
nic["network_card"] = networkCardRaw
delete(builder, "network_card")
hasNetwork = true
}
if hasNetwork {
networkAdapters = append(networkAdapters, nic)
adaptersRaw, ok := builder["network_adapters"]

43
fix/fixer_vsphere_network_storage_test.go
View File

@ -26,8 +26,31 @@ func TestFixerVSphereNetwork_Fix(t *testing.T) {
"type": "vsphere-iso",
"network_adapters": []interface{}{
map[string]interface{}{
"network": "",
"networkCard": "vmxnet3",
"network": "",
"network_card": "vmxnet3",
},
},
"storage": []interface{}{
map[string]interface{}{
"disk_size": 5000,
},
},
},
},
{
Input: map[string]interface{}{
"type": "vsphere-iso",
"network": "",
"network_card": "vmxnet3",
"disk_size": 5000,
},
Expected: map[string]interface{}{
"type": "vsphere-iso",
"network_adapters": []interface{}{
map[string]interface{}{
"network": "",
"network_card": "vmxnet3",
},
},
"storage": []interface{}{
@ -51,8 +74,8 @@ func TestFixerVSphereNetwork_Fix(t *testing.T) {
"type": "vsphere-iso",
"network_adapters": []interface{}{
map[string]interface{}{
"network": "myNetwork",
"networkCard": "vmxnet3",
"network": "myNetwork",
"network_card": "vmxnet3",
},
},
"storage": []interface{}{
@ -74,8 +97,8 @@ func TestFixerVSphereNetwork_Fix(t *testing.T) {
"disk_eagerly_scrub": true,
"network_adapters": []interface{}{
map[string]interface{}{
"network": "net1",
"networkCard": "vmxnet3",
"network": "net1",
"network_card": "vmxnet3",
},
},
"storage": []interface{}{
@ -91,12 +114,12 @@ func TestFixerVSphereNetwork_Fix(t *testing.T) {
"type": "vsphere-iso",
"network_adapters": []interface{}{
map[string]interface{}{
"network": "myNetwork",
"networkCard": "vmxnet3",
"network": "myNetwork",
"network_card": "vmxnet3",
},
map[string]interface{}{
"network": "net1",
"networkCard": "vmxnet3",
"network": "net1",
"network_card": "vmxnet3",
},
},
"storage": []interface{}{