Merge "New local certificate generator uses local time"

This commit is contained in:
Jenkins 2015-11-10 00:36:46 +00:00 committed by Gerrit Code Review
commit c912775dbe
2 changed files with 7 additions and 6 deletions
octavia
certificates/generator
tests/unit/certificates/generator

@ -123,9 +123,9 @@ class LocalCertGenerator(cert_gen.CertGenerator):
backend=backends.default_backend())
new_cert = x509.CertificateBuilder()
new_cert = new_cert.serial_number(cls._new_serial())
valid_from_datetime = datetime.datetime.today()
valid_to_datetime = datetime.datetime.now() + datetime.timedelta(
seconds=validity)
valid_from_datetime = datetime.datetime.utcnow()
valid_to_datetime = (datetime.datetime.utcnow() +
datetime.timedelta(seconds=validity))
new_cert = new_cert.not_valid_before(valid_from_datetime)
new_cert = new_cert.not_valid_after(valid_to_datetime)
new_cert = new_cert.issuer_name(lo_cert.subject)

@ -57,9 +57,10 @@ class TestLocalGenerator(base.TestCase):
)
ca_cert = x509.CertificateBuilder()
valid_from_datetime = datetime.datetime.today()
valid_until_datetime = datetime.datetime.now() + datetime.timedelta(
seconds=2 * 365 * 24 * 60 * 60)
valid_from_datetime = datetime.datetime.utcnow()
valid_until_datetime = (datetime.datetime.utcnow() +
datetime.timedelta(
seconds=2 * 365 * 24 * 60 * 60))
ca_cert = ca_cert.not_valid_before(valid_from_datetime)
ca_cert = ca_cert.not_valid_after(valid_until_datetime)
ca_cert = ca_cert.serial_number(1)