← Back to branch summary

~nskaggs/juju-ci-tools/add-essential-operations

« back to all changes in this revision

Viewing changes to certificates.py

  • Committer: Christopher Lee
  • Date: 2016-07-19 07:47:19 UTC
  • mto: (1505.1.30 trunk)
  • mto: This revision was merged to the branch mainline in revision 1508.
  • Revision ID: chris.lee@canonical.com-20160719074719-ixb0d1ub4t1d3lv6
Change certificate details to not be a getter function.

Show diffs side-by-side

added added

removed removed

Lines of Context:
certificates.py
22
22
    req = crypto.load_certificate_request(crypto.FILETYPE_PEM, csr_contents)
23
23
 
24
24
    ca_cert = crypto.load_certificate(
25
 
        crypto.FILETYPE_PEM, get_ca_pem_contents())
 
25
        crypto.FILETYPE_PEM, ca_pem_contents)
26
26
    ca_key = crypto.load_privatekey(
27
 
        crypto.FILETYPE_PEM, get_ca_key_pem_contents())
 
27
        crypto.FILETYPE_PEM, ca_key_pem_contents)
28
28
 
29
29
    cert = crypto.X509()
30
30
    cert.set_version(0x2)
68
68
    return crypto.dump_certificate_request(crypto.FILETYPE_PEM, req)
69
69
 
70
70
 
71
 
def get_ca_pem_contents():
72
 
    return dedent("""\
 
71
ca_pem_contents = dedent("""\
73
72
    -----BEGIN CERTIFICATE-----
74
73
    MIIEFTCCAn2gAwIBAgIBBzANBgkqhkiG9w0BAQsFADAjMRIwEAYDVQQDEwlhbnlT
75
74
    ZXJ2ZXIxDTALBgNVBAoTBGp1anUwHhcNMTYwNzExMDQyOTM1WhcNMjYwNzA5MDQy
97
96
    """)
98
97
 
99
98
 
100
 
def get_ca_key_pem_contents():
101
 
    return dedent("""\
 
99
ca_key_pem_contents = dedent("""\
102
100
    -----BEGIN RSA PRIVATE KEY-----
103
101
    MIIG4wIBAAKCAYEAp+jsWN98gIqwAaBOFGmSQTp0DkSMwtduUe9RNkxuYEh4xygO
104
102
    9C9At3YMloVvcHMoVG1wbs/Dnqdie5B787lD8NgFlyPmNnNGn1lan4+ZLslKRoV7