Fixes bug converning filenames with dots (#33493)

The name detminator was incorrect. This fixes it and fixes unit
tests related things that were broken downstream
This commit is contained in:
Tim Rupp 2017-12-02 20:17:14 -08:00 committed by GitHub
commit 212340bf0c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 16 deletions

View file

@ -248,11 +248,10 @@ class KeyParameters(Parameters):
@property
def key_filename(self):
fname, fext = os.path.splitext(self.name)
if fext == '':
return fname + '.key'
else:
if self.name.endswith('.key'):
return self.name
else:
return self.name + '.key'
@property
def key_checksum(self):
@ -308,11 +307,10 @@ class CertParameters(Parameters):
@property
def cert_filename(self):
fname, fext = os.path.splitext(self.name)
if fext == '':
return fname + '.crt'
else:
if self.name.endswith('.crt'):
return self.name
else:
return self.name + '.crt'
@property
def cert_src(self):

View file

@ -167,11 +167,10 @@ class Parameters(AnsibleF5Parameters):
@property
def key_filename(self):
fname, fext = os.path.splitext(self.name)
if fext == '':
return fname + '.key'
else:
if self.name.endswith('.key'):
return self.name
else:
return self.name + '.key'
@property
def key_checksum(self):