From a5d573cbe9288cff0fdf36c3d46a35f1036c675b Mon Sep 17 00:00:00 2001 From: Florin Papa Date: Mon, 13 Apr 2020 21:35:59 +0000 Subject: [PATCH 1/2] remove default keyword from AWS and Azure boot disk size --- perfkitbenchmarker/providers/aws/aws_virtual_machine.py | 2 +- perfkitbenchmarker/providers/azure/azure_virtual_machine.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/perfkitbenchmarker/providers/aws/aws_virtual_machine.py b/perfkitbenchmarker/providers/aws/aws_virtual_machine.py index e8a7df4c3b..8bce7cfd5c 100644 --- a/perfkitbenchmarker/providers/aws/aws_virtual_machine.py +++ b/perfkitbenchmarker/providers/aws/aws_virtual_machine.py @@ -1009,7 +1009,7 @@ def GetResourceMetadata(self): """ result = super(AwsVirtualMachine, self).GetResourceMetadata() result['boot_disk_type'] = self.DEFAULT_ROOT_DISK_TYPE - result['boot_disk_size'] = self.boot_disk_size or 'default' + result['boot_disk_size'] = self.boot_disk_size if self.use_dedicated_host: result['num_vms_per_host'] = self.num_vms_per_host result['efa'] = FLAGS.aws_efa diff --git a/perfkitbenchmarker/providers/azure/azure_virtual_machine.py b/perfkitbenchmarker/providers/azure/azure_virtual_machine.py index 77ca1cb9d0..1c247073d2 100644 --- a/perfkitbenchmarker/providers/azure/azure_virtual_machine.py +++ b/perfkitbenchmarker/providers/azure/azure_virtual_machine.py @@ -726,7 +726,7 @@ def GetResourceMetadata(self): result = super(AzureVirtualMachine, self).GetResourceMetadata() result['accelerated_networking'] = self.nic.accelerated_networking result['boot_disk_type'] = self.os_disk.disk_type - result['boot_disk_size'] = self.os_disk.disk_size or 'default' + result['boot_disk_size'] = self.os_disk.disk_size if self.network.placement_group: result['placement_group_strategy'] = self.network.placement_group.strategy else: From 4532f8871d5de5afcf5eecd01e9a44e7f0c0815f Mon Sep 17 00:00:00 2001 From: Florin Papa Date: Thu, 16 Apr 2020 18:22:15 +0000 Subject: [PATCH 2/2] Update CHANGES.next.md --- CHANGES.next.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.next.md b/CHANGES.next.md index 3ec26bc841..c8a76e4a50 100644 --- a/CHANGES.next.md +++ b/CHANGES.next.md @@ -101,4 +101,5 @@ (to 20GB). - The current defaults leave other Linux OSes at 10GB and Windows OSes at 50GB. +- Remove 'default' keyword from AWS and Azure boot_disk_size - Explicitly setting Netperf to Python 3.