Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix a few problems with Windows on Azure #374

Merged
merged 2 commits into from
Jul 7, 2015
Merged

Fix a few problems with Windows on Azure #374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a056d49
Fix Windows on Azure by decreasing vm name length to less than 15 chars
ehankland Jul 7, 2015
69e85be
Fix Windows password generation on Azure
ehankland Jul 7, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion perfkitbenchmarker/pkb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
'Specify a proxy for FTP in the form '
'[user:passwd@]proxy.server:port.')

MAX_RUN_URI_LENGTH = 10
MAX_RUN_URI_LENGTH = 8


# TODO(user): Consider moving to benchmark_spec.
Expand Down
2 changes: 1 addition & 1 deletion perfkitbenchmarker/virtual_machine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ def __init__(self, vm_spec):
super(BaseVirtualMachine, self).__init__()
with self._instance_counter_lock:
self.instance_number = self._instance_counter
self.name = 'perfkit-%s-%d' % (FLAGS.run_uri, self.instance_number)
self.name = 'pkb-%s-%d' % (FLAGS.run_uri, self.instance_number)
BaseVirtualMachine._instance_counter += 1
self.project = vm_spec.project
self.zone = vm_spec.zone
Expand Down
6 changes: 5 additions & 1 deletion perfkitbenchmarker/vm_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,7 +686,11 @@ def _RegisterDStatCollector(sender, parsed_flags):

def GenerateRandomWindowsPassword(password_length=PASSWORD_LENGTH):
"""Generates a password that meets Windows complexity requirements."""
special_chars = '~!$%*_-+=\\[]:.?/'
# The special characters have to be recognized by the Azure CLI as
# special characters. This greatly limits the set of characters
# that we can safely use. See
# https://github.com/Azure/azure-xplat-cli/blob/master/lib/commands/arm/vm/vmOsProfile._js#L145
special_chars = '*!@#$%^+='
password = [
random.choice(string.ascii_letters + string.digits + special_chars)
for _ in range(password_length - 4)]
Expand Down