From 561276f33ddbb44c1d1966219bbe51a46861c9eb Mon Sep 17 00:00:00 2001
From: Adit Sarfaty <asarfaty@vmware.com>
Date: Wed, 27 Sep 2017 09:28:23 +0300
Subject: [PATCH] NSX|V3 indentation & typo fixing in client certificate

Change-Id: Ia624c545d0ec93349128bf36387d26d13dc9305f
---
 vmware_nsx/plugins/nsx_v3/cert_utils.py |  2 +-
 vmware_nsx/plugins/nsx_v3/utils.py      | 44 ++++++++++++-------------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/vmware_nsx/plugins/nsx_v3/cert_utils.py b/vmware_nsx/plugins/nsx_v3/cert_utils.py
index 719d7c32fa..74acbda8d0 100644
--- a/vmware_nsx/plugins/nsx_v3/cert_utils.py
+++ b/vmware_nsx/plugins/nsx_v3/cert_utils.py
@@ -63,7 +63,7 @@ class DbCertificateStorageDriver(object):
                     cfg.CONF.nsx_v3.nsx_client_cert_pk_password)
 
     def store_cert(self, purpose, certificate, private_key):
-        # ecrypt private key
+        # encrypt private key
         if _SECRET:
             private_key = symmetric_encrypt(_SECRET, private_key)
 
diff --git a/vmware_nsx/plugins/nsx_v3/utils.py b/vmware_nsx/plugins/nsx_v3/utils.py
index 3f8d5e4a41..74a2a6cb2f 100644
--- a/vmware_nsx/plugins/nsx_v3/utils.py
+++ b/vmware_nsx/plugins/nsx_v3/utils.py
@@ -63,31 +63,31 @@ class DbCertProvider(client_cert.ClientCertProvider):
                         expires_in_days)
 
     def __enter__(self):
-            try:
-                context = q_context.get_admin_context()
-                db_storage_driver = cert_utils.DbCertificateStorageDriver(
-                    context)
-                with client_cert.ClientCertificateManager(
-                    cert_utils.NSX_OPENSTACK_IDENTITY,
-                    None,
-                    db_storage_driver) as cert_manager:
-                    if not cert_manager.exists():
-                        msg = _("Unable to load from nsx-db")
-                        raise nsx_exc.ClientCertificateException(err_msg=msg)
+        try:
+            context = q_context.get_admin_context()
+            db_storage_driver = cert_utils.DbCertificateStorageDriver(
+                context)
+            with client_cert.ClientCertificateManager(
+                cert_utils.NSX_OPENSTACK_IDENTITY,
+                None,
+                db_storage_driver) as cert_manager:
+                if not cert_manager.exists():
+                    msg = _("Unable to load from nsx-db")
+                    raise nsx_exc.ClientCertificateException(err_msg=msg)
 
-                    filename = self._filename
-                    if not os.path.exists(os.path.dirname(filename)):
-                        if len(os.path.dirname(filename)) > 0:
-                            os.makedirs(os.path.dirname(filename))
-                    cert_manager.export_pem(filename)
+                filename = self._filename
+                if not os.path.exists(os.path.dirname(filename)):
+                    if len(os.path.dirname(filename)) > 0:
+                        os.makedirs(os.path.dirname(filename))
+                cert_manager.export_pem(filename)
 
-                    expires_in_days = cert_manager.expires_in_days()
-                    self._check_expiration(expires_in_days)
-            except Exception as e:
-                self._on_exit()
-                raise e
+                expires_in_days = cert_manager.expires_in_days()
+                self._check_expiration(expires_in_days)
+        except Exception as e:
+            self._on_exit()
+            raise e
 
-            return self
+        return self
 
     def _on_exit(self):
         if os.path.isfile(self._filename):