2e30ffa49bf81d1db776813a74e587920d1bbde6,perfkitbenchmarker/linux_benchmarks/netperf_benchmark.py,,Run,#Any#,170

Before Change

  server_vm = vms[1]
  logging.info("netperf running on %s", vm)
  results = []
  metadata = {
      "ip_type": "external",
      "server_machine_type": server_vm.machine_type,
      "server_zone": server_vm.zone,
      "receiving_zone": server_vm.zone,
      "client_machine_type": vm.machine_type,
      "client_zone": vm.zone,
      "sending_zone": vm.zone
  }
  for netperf_benchmark in NETPERF_BENCHMARKS:

    if vm_util.ShouldRunOnExternalIpAddress():
      external_ip_results = RunNetperf(vm, netperf_benchmark,

After Change

  server_vm = vms[1]
  logging.info("netperf running on %s", client_vm)
  results = []
  metadata = {"ip_type": "external"}
  for vm_specifier, vm in ("receiving", server_vm), ("sending", client_vm):
    metadata["{0}_zone".format(vm_specifier)] = vm.zone
    for k, v in vm.GetMachineTypeDict().iteritems():
      metadata["{0}_{1}".format(vm_specifier, k)] = v

  for netperf_benchmark in NETPERF_BENCHMARKS:

    if vm_util.ShouldRunOnExternalIpAddress():
      external_ip_results = RunNetperf(client_vm, netperf_benchmark,

Instances