Rename num_of_enclaves to NumberOfEnclaves

This modifucaiton better aligns the style of the toml files Signed-off-by: Bruno Vavala <[email protected]>
bvavala · Apr 8, 2024 · 61ad951 · 61ad951
1 parent 57ecc18
commit 61ad951
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git a/build/template/eservice.toml b/build/template/eservice.toml
@@ -79,7 +79,7 @@ BaseName = "${identity}"
 [EnclaveModule]
 
 # Number of available enclave workers to service requests
-num_of_enclaves = '7'
+NumberOfEnclaves = '7'
 
 # ias_url is the URL of the Intel Attestation Service (IAS) server.  The
 # example server is for debug enclaves only,

diff --git a/build/template/pservice.toml b/build/template/pservice.toml
@@ -75,7 +75,7 @@ BaseName = "${identity}"
 [EnclaveModule]
 
 # Number of available enclave workers to service requests
-num_of_enclaves = '7'
+NumberOfEnclaves = '7'
 
 # ias_url is the URL of the Intel Attestation Service (IAS) server.  The
 # example server is for debug enclaves only,

diff --git a/eservice/pdo/eservice/enclave/enclave_info.cpp b/eservice/pdo/eservice/enclave/enclave_info.cpp
@@ -35,7 +35,7 @@ bool is_sgx_simulator()
 pdo_enclave_info::pdo_enclave_info(
     const std::string& enclaveModulePath,
     const std::string& spid,
-    const int num_of_enclaves
+    const int NumberOfEnclaves
     )
 {
     SAFE_LOG1(PDO_LOG_INFO, "Initializing SGX PDO enclave");
@@ -44,7 +44,7 @@ pdo_enclave_info::pdo_enclave_info(
 
     pdo_err_t ret = pdo::enclave_api::base::Initialize(enclaveModulePath,
                                                        spid,
-                                                       num_of_enclaves);
+                                                       NumberOfEnclaves);
     ThrowPDOError(ret);
     SAFE_LOG1(PDO_LOG_INFO, "SGX PDO enclave initialized.");
 

diff --git a/eservice/pdo/eservice/enclave/enclave_info.h b/eservice/pdo/eservice/enclave/enclave_info.h
@@ -26,7 +26,7 @@ class pdo_enclave_info
     pdo_enclave_info(
         const std::string& enclaveModulePath,
         const std::string& spid,
-        const int num_of_enclaves
+        const int NumberOfEnclaves
         );
     virtual ~pdo_enclave_info();
     std::string get_epid_group();

diff --git a/eservice/pdo/eservice/pdo_enclave.py b/eservice/pdo/eservice/pdo_enclave.py
@@ -149,7 +149,7 @@ def initialize_with_configuration(config) :
                 '{}'.format(
                     ', '.join(sorted(list(missing_keys)))))
 
-    num_of_enclaves = int(config.get('num_of_enclaves', 1))
+    NumberOfEnclaves = int(config.get('NumberOfEnclaves', 1))
 
     try:
         spid = Path(os.path.join(config['sgx_key_root'], "sgx_spid.txt")).read_text()
@@ -167,7 +167,7 @@ def initialize_with_configuration(config) :
     if not _pdo:
         signed_enclave = __find_enclave_library(config)
         logger.debug("Attempting to load enclave at: %s", signed_enclave)
-        _pdo = enclave.pdo_enclave_info(signed_enclave, spid, num_of_enclaves)
+        _pdo = enclave.pdo_enclave_info(signed_enclave, spid, NumberOfEnclaves)
         logger.info("Basename: %s", get_enclave_basename())
         logger.info("MRENCLAVE: %s", get_enclave_measurement())
 
@@ -238,8 +238,8 @@ def get_enclave_service_info(spid, config=None) :
     signed_enclave = __find_enclave_library(None)
     logger.debug("Attempting to load enclave at: %s", signed_enclave)
 
-    num_of_enclaves = 1
-    pdo = enclave.pdo_enclave_info(signed_enclave, spid, num_of_enclaves)
+    NumberOfEnclaves = 1
+    pdo = enclave.pdo_enclave_info(signed_enclave, spid, NumberOfEnclaves)
     if pdo is None :
         raise Exception('unable to load the enclave')
 

diff --git a/eservice/pdo/eservice/scripts/EServiceCLI.py b/eservice/pdo/eservice/scripts/EServiceCLI.py
@@ -360,7 +360,7 @@ def Main() :
     # set up the default enclave module configuration (if necessary)
     if config.get('EnclaveModule') is None :
         config['EnclaveModule'] = {
-            'num_of_enclaves' : 7,
+            'NumberOfEnclaves' : 7,
             'ias_url' : 'https://api.trustedservices.intel.com/sgx/dev',
             'sgx_key_root' : os.environ.get('PDO_SGX_KEY_ROOT', '.')
         }

diff --git a/eservice/pdo/eservice/scripts/EServiceEnclaveInfoCLI.py b/eservice/pdo/eservice/scripts/EServiceEnclaveInfoCLI.py
@@ -169,7 +169,7 @@ def Main() :
     # set up the default enclave module configuration (if necessary)
     if config.get('EnclaveModule') is None :
         config['EnclaveModule'] = {
-            'num_of_enclaves' : 7,
+            'NumberOfEnclaves' : 7,
             'ias_url' : 'https://api.trustedservices.intel.com/sgx/dev',
             'sgx_key_root' : os.environ.get('PDO_SGX_KEY_ROOT', '.')
         }

diff --git a/eservice/tests/test-secrets.py b/eservice/tests/test-secrets.py
@@ -104,7 +104,7 @@ def ErrorShutdown() :
 # set up the default enclave module configuration (if necessary)
 if config.get('EnclaveModule') is None :
     config['EnclaveModule'] = {
-        'num_of_enclaves' : 7,
+        'NumberOfEnclaves' : 7,
         'ias_url' : 'https://api.trustedservices.intel.com/sgx/dev',
         'sgx_key_root' : os.environ.get('PDO_SGX_KEY_ROOT', '.')
     }

diff --git a/pservice/pdo/pservice/scripts/PServiceCLI.py b/pservice/pdo/pservice/scripts/PServiceCLI.py
@@ -526,7 +526,7 @@ def Main() :
     # set up the default enclave module configuration (if necessary)
     if config.get('EnclaveModule') is None :
         config['EnclaveModule'] = {
-            'num_of_enclaves' : 7,
+            'NumberOfEnclaves' : 7,
             'ias_url' : 'https://api.trustedservices.intel.com/sgx/dev',
             'sgx_key_root' : os.environ.get('PDO_SGX_KEY_ROOT', '.')
         }