_KS_CONTEXT -> _KS_ENCLAVES

Signed-off-by: Mikael Arguedas <[email protected]>

sros2/sros2/api/_key.py

@@ -37,7 +37,7 @@ def create_key(keystore_path, identity):
     print("creating key for identity: '%s'" % identity)
 
     relative_path = os.path.normpath(identity.lstrip('/'))
-    key_dir = os.path.join(_keystore.get_keystore_enclave_dir(keystore_path), relative_path)
+    key_dir = os.path.join(_keystore.get_keystore_enclaves_dir(keystore_path), relative_path)
     os.makedirs(key_dir, exist_ok=True)
 
     # symlink the CA cert in there
@@ -51,7 +51,7 @@ def create_key(keystore_path, identity):
 
     # symlink the governance file in there
     keystore_governance_path = os.path.join(
-        _keystore.get_keystore_enclave_dir(keystore_path), 'governance.p7s')
+        _keystore.get_keystore_enclaves_dir(keystore_path), 'governance.p7s')
     dest_governance_path = os.path.join(key_dir, 'governance.p7s')
     relativepath = os.path.relpath(keystore_governance_path, key_dir)
     _utilities.create_symlink(src=relativepath, dst=dest_governance_path)
@@ -99,7 +99,7 @@ def create_key(keystore_path, identity):
 
 
 def list_keys(keystore_path):
-    enclaves_path = _keystore.get_keystore_enclave_dir(keystore_path)
+    enclaves_path = _keystore.get_keystore_enclaves_dir(keystore_path)
     if not os.path.isdir(keystore_path):
         raise FileNotFoundError(errno.ENOENT, os.strerror(errno.ENOENT), keystore_path)
     if not os.path.isdir(enclaves_path):

sros2/sros2/api/_keystore.py

@@ -24,7 +24,7 @@
 from . import _utilities
 
 
-_KS_CONTEXT = 'enclaves'
+_KS_ENCLAVES = 'enclaves'
 _KS_PUBLIC = 'public'
 _KS_PRIVATE = 'private'
 _DEFAULT_COMMON_NAME = 'sros2testCA'
@@ -40,7 +40,7 @@ def create_keystore(keystore_path):
     os.makedirs(keystore_path, exist_ok=True)
     os.makedirs(os.path.join(keystore_path, _KS_PUBLIC), exist_ok=True)
     os.makedirs(os.path.join(keystore_path, _KS_PRIVATE), exist_ok=True)
-    os.makedirs(os.path.join(keystore_path, _KS_CONTEXT), exist_ok=True)
+    os.makedirs(os.path.join(keystore_path, _KS_ENCLAVES), exist_ok=True)
 
     keystore_ca_cert_path = os.path.join(keystore_path, _KS_PUBLIC, 'ca.cert.pem')
     keystore_ca_key_path = os.path.join(keystore_path, _KS_PRIVATE, 'ca.key.pem')
@@ -72,15 +72,15 @@ def create_keystore(keystore_path):
         print('found CA key and cert, not creating new ones!')
 
     # create governance file
-    gov_path = os.path.join(keystore_path, _KS_CONTEXT, 'governance.xml')
+    gov_path = os.path.join(keystore_path, _KS_ENCLAVES, 'governance.xml')
     if not os.path.isfile(gov_path):
         print('creating governance file: %s' % gov_path)
         _create_governance_file(gov_path, _utilities.domain_id())
     else:
         print('found governance file, not creating a new one!')
 
     # sign governance file
-    signed_gov_path = os.path.join(keystore_path, _KS_CONTEXT, 'governance.p7s')
+    signed_gov_path = os.path.join(keystore_path, _KS_ENCLAVES, 'governance.p7s')
     if not os.path.isfile(signed_gov_path):
         print('creating signed governance file: %s' % signed_gov_path)
         _utilities.create_smime_signed_file(
@@ -102,12 +102,12 @@ def is_valid_keystore(path):
         os.path.isfile(os.path.join(path, _KS_PUBLIC, 'identity_ca.cert.pem')) and
         os.path.isfile(os.path.join(path, _KS_PRIVATE, 'permissions_ca.key.pem')) and
         os.path.isfile(os.path.join(path, _KS_PRIVATE, 'identity_ca.key.pem')) and
-        os.path.isfile(os.path.join(path, _KS_CONTEXT, 'governance.p7s'))
+        os.path.isfile(os.path.join(path, _KS_ENCLAVES, 'governance.p7s'))
     )
 
 
-def get_keystore_enclave_dir(keystore_path: str) -> str:
-    return os.path.join(keystore_path, _KS_CONTEXT)
+def get_keystore_enclaves_dir(keystore_path: str) -> str:
+    return os.path.join(keystore_path, _KS_ENCLAVES)
 
 
 def get_keystore_public_dir(keystore_path: str) -> str:

sros2/sros2/api/_permission.py

@@ -34,7 +34,7 @@ def create_permission(keystore_path, identity, policy_file_path):
 
 def create_permissions_from_policy_element(keystore_path, identity, policy_element):
     relative_path = os.path.normpath(identity.lstrip('/'))
-    key_dir = os.path.join(_keystore.get_keystore_enclave_dir(keystore_path), relative_path)
+    key_dir = os.path.join(_keystore.get_keystore_enclaves_dir(keystore_path), relative_path)
     print("creating permission file for identity: '%s'" % identity)
     permissions_path = os.path.join(key_dir, 'permissions.xml')
     create_permission_file(permissions_path, _utilities.domain_id(), policy_element)