Commit f890e5dd authored by guillecxb's avatar guillecxb
Browse files

refactor: rename camelCase variables to snake_case

parent e4f0e86c

services/helper/config.yaml

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ mongo: { 
  'col_services': "serviceapidescriptions",

  'col_security': "security",

  'col_event': "eventsdetails",

  'col_capifConfiguration': "capifConfiguration",

  'col_capif_configuration': "capif_configuration",

  'host': 'mongo',

  'port': "27017"

}
@@ -19,7 +19,7 @@ ca_factory: { 
  "verify": False

}



capifConfiguration: {

capif_configuration: {

  config_name: "default",

  version: "1.0",

  description: "Default CAPIF Configuration",

services/helper/helper_service/app.py

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ config = Config().get_config() 


# Connect MongoDB and get TTL for superadmin certificate

db = MongoDatabse()

capif_config = db.get_col_by_name("capifConfiguration").find_one({"config_name": "default"})

capif_config = db.get_col_by_name("capif_configuration").find_one({"config_name": "default"})

ttl_superadmin_cert = capif_config["settings"].get("ttl_superadmin_cert", "43000h")



# Setting log level

services/helper/helper_service/db/db.py

+6 −6
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ class MongoDatabse(): 
        self.services_col = self.config['mongo']['col_services']

        self.security_context_col = self.config['mongo']['col_security']

        self.events = self.config['mongo']['col_event']

        self.capifConfiguration = self.config['mongo']['col_capifConfiguration']

        self.capif_configuration = self.config['mongo']['col_capif_configuration']



        self.initialize_capif_configuration()
@@ -50,17 +50,17 @@ class MongoDatabse(): 


    def initialize_capif_configuration(self):

        """

        Inserts default data into the capifConfiguration collection if it is empty.

        Inserts default data into the capif_configuration collection if it is empty.

        The data is taken from config.yaml.

        """

        capif_col = self.get_col_by_name(self.capifConfiguration)

        capif_col = self.get_col_by_name(self.capif_configuration)



        if capif_col.count_documents({}) == 0:

            # Read configuration from config.yaml

            default_config = self.config["capifConfiguration"]

            default_config = self.config["capif_configuration"]



            capif_col.insert_one(default_config)

            print("Default data inserted into the capifConfiguration collection from config.yaml")

            print("Default data inserted into the capif_configuration collection from config.yaml")

        else:

            print("The capifConfiguration collection already contains data. No default values were inserted.")

            print("The capif_configuration collection already contains data. No default values were inserted.")

services/register/config.yaml

+11 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ mongo: { 
  'password': 'example',

  'db': 'capif_users',

  'col': 'user',

  'col_capif_configuration': "capif_configuration",

  'admins': 'admins',

  'host': 'mongo_register',

  'port': '27017'
@@ -26,3 +27,12 @@ register: { 
  "admin_users": {admin_user: "admin",

                admin_pass: "password123"}

}



capif_configuration: {

  "config_name": "default",

  "version": "1.0",

  "description": "Default Register Configuration",

  "settings": {

    ttl_superadmin_cert: "4300h"

  }

}

services/register/register_service/db/db.py

+5 −5
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ class MongoDatabse(): 
        self.db = self.__connect()

        self.capif_users = self.config['mongo']['col']

        self.capif_admins = self.config['mongo']['admins']

        self.capifConfiguration = self.config['mongo']['col_capifConfiguration']

        self.capif_configuration = self.config['mongo']['col_capif_configuration']

        

        self.initialize_capif_configuration()
@@ -36,13 +36,13 @@ class MongoDatabse(): 
        return None



    def initialize_capif_configuration(self):

        capif_col = self.get_col_by_name(self.capifConfiguration)

        capif_col = self.get_col_by_name(self.capif_configuration)

        if capif_col.count_documents({}) == 0:

            default_config = self.config["capifConfiguration"]

            default_config = self.config["capif_configuration"]

            capif_col.insert_one(default_config)

            print("Default data inserted into the capifConfiguration collection from config.yaml")

            print("Default data inserted into the capif_configuration collection from config.yaml")

        else:

            print("The capifConfiguration collection already contains data. No default values were inserted.")

            print("The capif_configuration collection already contains data. No default values were inserted.")



    def close_connection(self):

        if self.db.client: