From 841f54fc1e425f5ee4d9302faf7efc5733db0f72 Mon Sep 17 00:00:00 2001 From: Christopher Boumenot Date: Thu, 8 Jun 2017 18:03:37 -0700 Subject: [PATCH] azure: unit test fixes --- ...plate_builder_test.TestBuildLinux00.approved.json | 12 ++++++++---- ...plate_builder_test.TestBuildLinux01.approved.json | 12 ++++++++---- ...plate_builder_test.TestBuildLinux02.approved.json | 8 ++++++-- ...ate_builder_test.TestBuildWindows00.approved.json | 12 ++++++++---- 4 files changed, 30 insertions(+), 14 deletions(-) diff --git a/builder/azure/common/template/template_builder_test.TestBuildLinux00.approved.json b/builder/azure/common/template/template_builder_test.TestBuildLinux00.approved.json index 59b5da643..b94fa0628 100644 --- a/builder/azure/common/template/template_builder_test.TestBuildLinux00.approved.json +++ b/builder/azure/common/template/template_builder_test.TestBuildLinux00.approved.json @@ -26,7 +26,7 @@ }, "resources": [ { - "apiVersion": "[variables('apiVersion')]", + "apiVersion": "[variables('publicIPAddressApiVersion')]", "location": "[variables('location')]", "name": "[variables('publicIPAddressName')]", "properties": { @@ -38,7 +38,7 @@ "type": "Microsoft.Network/publicIPAddresses" }, { - "apiVersion": "[variables('apiVersion')]", + "apiVersion": "[variables('virtualNetworksApiVersion')]", "location": "[variables('location')]", "name": "[variables('virtualNetworkName')]", "properties": { @@ -59,7 +59,7 @@ "type": "Microsoft.Network/virtualNetworks" }, { - "apiVersion": "[variables('apiVersion')]", + "apiVersion": "[variables('networkInterfacesApiVersion')]", "dependsOn": [ "[concat('Microsoft.Network/publicIPAddresses/', variables('publicIPAddressName'))]", "[concat('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]" @@ -144,9 +144,12 @@ ], "variables": { "addressPrefix": "10.0.0.0/16", - "apiVersion": "2015-06-15", + "apiVersion": "2017-03-30", "location": "[resourceGroup().location]", + "managedDiskApiVersion": "2017-03-30", + "networkInterfacesApiVersion": "2017-04-01", "nicName": "packerNic", + "publicIPAddressApiVersion": "2017-04-01", "publicIPAddressName": "packerPublicIP", "publicIPAddressType": "Dynamic", "sshKeyPath": "[concat('/home/',parameters('adminUsername'),'/.ssh/authorized_keys')]", @@ -155,6 +158,7 @@ "subnetRef": "[concat(variables('vnetID'),'/subnets/',variables('subnetName'))]", "virtualNetworkName": "packerNetwork", "virtualNetworkResourceGroup": "[resourceGroup().name]", + "virtualNetworksApiVersion": "2017-04-01", "vmStorageAccountContainerName": "images", "vnetID": "[resourceId(variables('virtualNetworkResourceGroup'), 'Microsoft.Network/virtualNetworks', variables('virtualNetworkName'))]" } diff --git a/builder/azure/common/template/template_builder_test.TestBuildLinux01.approved.json b/builder/azure/common/template/template_builder_test.TestBuildLinux01.approved.json index f26c3f1c2..8eac0647d 100644 --- a/builder/azure/common/template/template_builder_test.TestBuildLinux01.approved.json +++ b/builder/azure/common/template/template_builder_test.TestBuildLinux01.approved.json @@ -26,7 +26,7 @@ }, "resources": [ { - "apiVersion": "[variables('apiVersion')]", + "apiVersion": "[variables('publicIPAddressApiVersion')]", "location": "[variables('location')]", "name": "[variables('publicIPAddressName')]", "properties": { @@ -38,7 +38,7 @@ "type": "Microsoft.Network/publicIPAddresses" }, { - "apiVersion": "[variables('apiVersion')]", + "apiVersion": "[variables('virtualNetworksApiVersion')]", "location": "[variables('location')]", "name": "[variables('virtualNetworkName')]", "properties": { @@ -59,7 +59,7 @@ "type": "Microsoft.Network/virtualNetworks" }, { - "apiVersion": "[variables('apiVersion')]", + "apiVersion": "[variables('networkInterfacesApiVersion')]", "dependsOn": [ "[concat('Microsoft.Network/publicIPAddresses/', variables('publicIPAddressName'))]", "[concat('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]" @@ -142,9 +142,12 @@ ], "variables": { "addressPrefix": "10.0.0.0/16", - "apiVersion": "2015-06-15", + "apiVersion": "2017-03-30", "location": "[resourceGroup().location]", + "managedDiskApiVersion": "2017-03-30", + "networkInterfacesApiVersion": "2017-04-01", "nicName": "packerNic", + "publicIPAddressApiVersion": "2017-04-01", "publicIPAddressName": "packerPublicIP", "publicIPAddressType": "Dynamic", "sshKeyPath": "[concat('/home/',parameters('adminUsername'),'/.ssh/authorized_keys')]", @@ -153,6 +156,7 @@ "subnetRef": "[concat(variables('vnetID'),'/subnets/',variables('subnetName'))]", "virtualNetworkName": "packerNetwork", "virtualNetworkResourceGroup": "[resourceGroup().name]", + "virtualNetworksApiVersion": "2017-04-01", "vmStorageAccountContainerName": "images", "vnetID": "[resourceId(variables('virtualNetworkResourceGroup'), 'Microsoft.Network/virtualNetworks', variables('virtualNetworkName'))]" } diff --git a/builder/azure/common/template/template_builder_test.TestBuildLinux02.approved.json b/builder/azure/common/template/template_builder_test.TestBuildLinux02.approved.json index 06ff1ad5a..fffb0d7bb 100644 --- a/builder/azure/common/template/template_builder_test.TestBuildLinux02.approved.json +++ b/builder/azure/common/template/template_builder_test.TestBuildLinux02.approved.json @@ -26,7 +26,7 @@ }, "resources": [ { - "apiVersion": "[variables('apiVersion')]", + "apiVersion": "[variables('networkInterfacesApiVersion')]", "dependsOn": [], "location": "[variables('location')]", "name": "[variables('nicName')]", @@ -104,9 +104,12 @@ ], "variables": { "addressPrefix": "10.0.0.0/16", - "apiVersion": "2015-06-15", + "apiVersion": "2017-03-30", "location": "[resourceGroup().location]", + "managedDiskApiVersion": "2017-03-30", + "networkInterfacesApiVersion": "2017-04-01", "nicName": "packerNic", + "publicIPAddressApiVersion": "2017-04-01", "publicIPAddressName": "packerPublicIP", "publicIPAddressType": "Dynamic", "sshKeyPath": "[concat('/home/',parameters('adminUsername'),'/.ssh/authorized_keys')]", @@ -115,6 +118,7 @@ "subnetRef": "[concat(variables('vnetID'),'/subnets/',variables('subnetName'))]", "virtualNetworkName": "--virtual-network--", "virtualNetworkResourceGroup": "--virtual-network-resource-group--", + "virtualNetworksApiVersion": "2017-04-01", "vmStorageAccountContainerName": "images", "vnetID": "[resourceId(variables('virtualNetworkResourceGroup'), 'Microsoft.Network/virtualNetworks', variables('virtualNetworkName'))]" } diff --git a/builder/azure/common/template/template_builder_test.TestBuildWindows00.approved.json b/builder/azure/common/template/template_builder_test.TestBuildWindows00.approved.json index 67dec1b2d..1c3138deb 100644 --- a/builder/azure/common/template/template_builder_test.TestBuildWindows00.approved.json +++ b/builder/azure/common/template/template_builder_test.TestBuildWindows00.approved.json @@ -26,7 +26,7 @@ }, "resources": [ { - "apiVersion": "[variables('apiVersion')]", + "apiVersion": "[variables('publicIPAddressApiVersion')]", "location": "[variables('location')]", "name": "[variables('publicIPAddressName')]", "properties": { @@ -38,7 +38,7 @@ "type": "Microsoft.Network/publicIPAddresses" }, { - "apiVersion": "[variables('apiVersion')]", + "apiVersion": "[variables('virtualNetworksApiVersion')]", "location": "[variables('location')]", "name": "[variables('virtualNetworkName')]", "properties": { @@ -59,7 +59,7 @@ "type": "Microsoft.Network/virtualNetworks" }, { - "apiVersion": "[variables('apiVersion')]", + "apiVersion": "[variables('networkInterfacesApiVersion')]", "dependsOn": [ "[concat('Microsoft.Network/publicIPAddresses/', variables('publicIPAddressName'))]", "[concat('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]" @@ -158,9 +158,12 @@ ], "variables": { "addressPrefix": "10.0.0.0/16", - "apiVersion": "2015-06-15", + "apiVersion": "2017-03-30", "location": "[resourceGroup().location]", + "managedDiskApiVersion": "2017-03-30", + "networkInterfacesApiVersion": "2017-04-01", "nicName": "packerNic", + "publicIPAddressApiVersion": "2017-04-01", "publicIPAddressName": "packerPublicIP", "publicIPAddressType": "Dynamic", "sshKeyPath": "[concat('/home/',parameters('adminUsername'),'/.ssh/authorized_keys')]", @@ -169,6 +172,7 @@ "subnetRef": "[concat(variables('vnetID'),'/subnets/',variables('subnetName'))]", "virtualNetworkName": "packerNetwork", "virtualNetworkResourceGroup": "[resourceGroup().name]", + "virtualNetworksApiVersion": "2017-04-01", "vmStorageAccountContainerName": "images", "vnetID": "[resourceId(variables('virtualNetworkResourceGroup'), 'Microsoft.Network/virtualNetworks', variables('virtualNetworkName'))]" }