aherman
/
packer
mirror of https://github.com/hashicorp/packer
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update tests for datadisk name change

Browse Source
pull/8986/head
Vijay Rajah 6 years ago
parent 5340af4d49
commit 0589f57d4d
22 changed files with 79 additions and 12 deletions
Show Stats Download Patch File Download Diff File

3
builder/azure/arm/template_factory_test.TestPlanInfo01.approved.json
Unescape View File

@ -8,6 +8,9 @@
"adminUsername": {
"type": "string"
},
"dataDiskName": {
"type": "string"
},
"dnsNameForPublicIP": {
"type": "string"
},

3
builder/azure/arm/template_factory_test.TestPlanInfo02.approved.json
Unescape View File

@ -8,6 +8,9 @@
"adminUsername": {
"type": "string"
},
"dataDiskName": {
"type": "string"
},
"dnsNameForPublicIP": {
"type": "string"
},

3
builder/azure/arm/template_factory_test.TestVirtualMachineDeployment03.approved.json
Unescape View File

@ -8,6 +8,9 @@
"adminUsername": {
"type": "string"
},
"dataDiskName": {
"type": "string"
},
"dnsNameForPublicIP": {
"type": "string"
},

3
builder/azure/arm/template_factory_test.TestVirtualMachineDeployment04.approved.json
Unescape View File

@ -8,6 +8,9 @@
"adminUsername": {
"type": "string"
},
"dataDiskName": {
"type": "string"
},
"dnsNameForPublicIP": {
"type": "string"
},

3
builder/azure/arm/template_factory_test.TestVirtualMachineDeployment05.approved.json
Unescape View File

@ -8,6 +8,9 @@
"adminUsername": {
"type": "string"
},
"dataDiskName": {
"type": "string"
},
"dnsNameForPublicIP": {
"type": "string"
},

3
builder/azure/arm/template_factory_test.TestVirtualMachineDeployment06.approved.json
Unescape View File

@ -8,6 +8,9 @@
"adminUsername": {
"type": "string"
},
"dataDiskName": {
"type": "string"
},
"dnsNameForPublicIP": {
"type": "string"
},

3
builder/azure/arm/template_factory_test.TestVirtualMachineDeployment07.approved.json
Unescape View File

@ -8,6 +8,9 @@
"adminUsername": {
"type": "string"
},
"dataDiskName": {
"type": "string"
},
"dnsNameForPublicIP": {
"type": "string"
},

3
builder/azure/arm/template_factory_test.TestVirtualMachineDeployment08.approved.json
Unescape View File

@ -8,6 +8,9 @@
"adminUsername": {
"type": "string"
},
"dataDiskName": {
"type": "string"
},
"dnsNameForPublicIP": {
"type": "string"
},

3
builder/azure/arm/template_factory_test.TestVirtualMachineDeployment09.approved.json
Unescape View File

@ -8,6 +8,9 @@
"adminUsername": {
"type": "string"
},
"dataDiskName": {
"type": "string"
},
"dnsNameForPublicIP": {
"type": "string"
},

3
builder/azure/arm/template_factory_test.TestVirtualMachineDeployment10.approved.json
Unescape View File

@ -8,6 +8,9 @@
"adminUsername": {
"type": "string"
},
"dataDiskName": {
"type": "string"
},
"dnsNameForPublicIP": {
"type": "string"
},

7
builder/azure/arm/template_factory_test.TestVirtualMachineDeployment11.approved.json
Unescape View File

@ -8,6 +8,9 @@
"adminUsername": {
"type": "string"
},
"dataDiskName": {
"type": "string"
},
"dnsNameForPublicIP": {
"type": "string"
},
@ -144,9 +147,9 @@
"createOption": "Empty",
"diskSizeGB": 32,
"lun": 0,
"name": "datadisk-1",
"name": "[concat(parameters('dataDiskName'),'-1'",
"vhd": {
"uri": "[concat(parameters('storageAccountBlobEndpoint'),variables('vmStorageAccountContainerName'),'/datadisk-', '1','.vhd')]"
"uri": "[concat(parameters('storageAccountBlobEndpoint'),variables('vmStorageAccountContainerName'),parameters('dataDiskName'), '-1','.vhd')]"
}
}
],

5
builder/azure/arm/template_factory_test.TestVirtualMachineDeployment12.approved.json
Unescape View File

@ -8,6 +8,9 @@
"adminUsername": {
"type": "string"
},
"dataDiskName": {
"type": "string"
},
"dnsNameForPublicIP": {
"type": "string"
},
@ -147,7 +150,7 @@
"managedDisk": {
"storageAccountType": "Standard_LRS"
},
"name": "datadisk-1"
"name": "[concat(parameters('dataDiskName'),'-1'"
}
],
"imageReference": {

3
builder/azure/arm/template_factory_test.TestVirtualMachineDeployment13.approved.json
Unescape View File

@ -8,6 +8,9 @@
"adminUsername": {
"type": "string"
},
"dataDiskName": {
"type": "string"
},
"dnsNameForPublicIP": {
"type": "string"
},

10
builder/azure/common/template/template_builder.go
Unescape View File

@ -243,7 +243,8 @@ func (s *TemplateBuilder) SetAdditionalDisks(diskSizeGB []int32, dataDiskname st
for i, additionalSize := range diskSizeGB {
dataDisks[i].DiskSizeGB = to.Int32Ptr(additionalSize)
dataDisks[i].Lun = to.IntPtr(i)
dataDisks[i].Name = to.StringPtr(fmt.Sprintf("%s-%d", dataDiskname, i+1))
// dataDisks[i].Name = to.StringPtr(fmt.Sprintf("%s-%d", dataDiskname, i+1))
dataDisks[i].Name = to.StringPtr(fmt.Sprintf("[concat(parameters('dataDiskName'),'-%d'", i+1))
dataDisks[i].CreateOption = "Empty"
dataDisks[i].Caching = cachingType
if isManaged {
@ -251,7 +252,7 @@ func (s *TemplateBuilder) SetAdditionalDisks(diskSizeGB []int32, dataDiskname st
dataDisks[i].ManagedDisk = profile.OsDisk.ManagedDisk
} else {
dataDisks[i].Vhd = &compute.VirtualHardDisk{
URI: to.StringPtr(fmt.Sprintf("[concat(parameters('storageAccountBlobEndpoint'),variables('vmStorageAccountContainerName'),'/%s-', '%d','.vhd')]", dataDiskname, i+1)),
URI: to.StringPtr(fmt.Sprintf("[concat(parameters('storageAccountBlobEndpoint'),variables('vmStorageAccountContainerName'),parameters('dataDiskName'), '-%d','.vhd')]", i+1)),
}
dataDisks[i].ManagedDisk = nil
}
@ -581,7 +582,10 @@ const BasicTemplate = `{
},
"vmName": {
"type": "string"
}
},
"dataDiskName": {
"type": "string"
}
},
"variables": {
"addressPrefix": "10.0.0.0/16",

3
builder/azure/common/template/template_builder_test.TestBuildLinux00.approved.json
Unescape View File

@ -8,6 +8,9 @@
"adminUsername": {
"type": "string"
},
"dataDiskName": {
"type": "string"
},
"dnsNameForPublicIP": {
"type": "string"
},

3
builder/azure/common/template/template_builder_test.TestBuildLinux01.approved.json
Unescape View File

@ -8,6 +8,9 @@
"adminUsername": {
"type": "string"
},
"dataDiskName": {
"type": "string"
},
"dnsNameForPublicIP": {
"type": "string"
},

3
builder/azure/common/template/template_builder_test.TestBuildLinux02.approved.json
Unescape View File

@ -8,6 +8,9 @@
"adminUsername": {
"type": "string"
},
"dataDiskName": {
"type": "string"
},
"dnsNameForPublicIP": {
"type": "string"
},

3
builder/azure/common/template/template_builder_test.TestBuildWindows00.approved.json
Unescape View File

@ -8,6 +8,9 @@
"adminUsername": {
"type": "string"
},
"dataDiskName": {
"type": "string"
},
"dnsNameForPublicIP": {
"type": "string"
},

7
builder/azure/common/template/template_builder_test.TestBuildWindows01.approved.json
Unescape View File

@ -8,6 +8,9 @@
"adminUsername": {
"type": "string"
},
"dataDiskName": {
"type": "string"
},
"dnsNameForPublicIP": {
"type": "string"
},
@ -161,7 +164,7 @@
"managedDisk": {
"storageAccountType": "Premium_LRS"
},
"name": "datadisk-1"
"name": "[concat(parameters('dataDiskName'),'-1'"
},
{
"caching": "ReadWrite",
@ -171,7 +174,7 @@
"managedDisk": {
"storageAccountType": "Premium_LRS"
},
"name": "datadisk-2"
"name": "[concat(parameters('dataDiskName'),'-2'"
}
],
"imageReference": {

11
builder/azure/common/template/template_builder_test.TestBuildWindows02.approved.json
Unescape View File

@ -8,6 +8,9 @@
"adminUsername": {
"type": "string"
},
"dataDiskName": {
"type": "string"
},
"dnsNameForPublicIP": {
"type": "string"
},
@ -158,9 +161,9 @@
"createOption": "Empty",
"diskSizeGB": 32,
"lun": 0,
"name": "datadisk-1",
"name": "[concat(parameters('dataDiskName'),'-1'",
"vhd": {
"uri": "[concat(parameters('storageAccountBlobEndpoint'),variables('vmStorageAccountContainerName'),'/datadisk-', '1','.vhd')]"
"uri": "[concat(parameters('storageAccountBlobEndpoint'),variables('vmStorageAccountContainerName'),parameters('dataDiskName'), '-1','.vhd')]"
}
},
{
@ -168,9 +171,9 @@
"createOption": "Empty",
"diskSizeGB": 64,
"lun": 1,
"name": "datadisk-2",
"name": "[concat(parameters('dataDiskName'),'-2'",
"vhd": {
"uri": "[concat(parameters('storageAccountBlobEndpoint'),variables('vmStorageAccountContainerName'),'/datadisk-', '2','.vhd')]"
"uri": "[concat(parameters('storageAccountBlobEndpoint'),variables('vmStorageAccountContainerName'),parameters('dataDiskName'), '-2','.vhd')]"
}
}
],

3
builder/azure/common/template/template_builder_test.TestNetworkSecurityGroup00.approved.json
Unescape View File

@ -8,6 +8,9 @@
"adminUsername": {
"type": "string"
},
"dataDiskName": {
"type": "string"
},
"dnsNameForPublicIP": {
"type": "string"
},

3
builder/azure/common/template/template_builder_test.TestSharedImageGallery00.approved.json
Unescape View File

@ -8,6 +8,9 @@
"adminUsername": {
"type": "string"
},
"dataDiskName": {
"type": "string"
},
"dnsNameForPublicIP": {
"type": "string"
},

Write Preview
Loading…
Cancel
Save