pyegeria 0.2.4__py3-none-any.whl → 5.3.0.dev3__py3-none-any.whl

pyegeria/core_omag_server_config.py

@@ -11,67 +11,54 @@ deployed to take effect.
 
 import json
 
+import psycopg2
+from psycopg2 import sql
+from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT
+
 # import json
 from pyegeria._client import Client
 from pyegeria._globals import enable_ssl_check
-from pyegeria._validators import (
-    validate_name,
-    validate_guid,
-    validate_url
-)
+from pyegeria._validators import validate_name, validate_guid, validate_url
 
 
 class CoreServerConfig(Client):
     """
     CoreServerConfig is a class that extends the Client class. It provides methods to configure and interact with access
-     services in the OMAG server.
-
-    Methods:
-
-        - get_stored_configuration(server_name: str = None) -> dict:
-            Retrieves all the configuration documents for a server.
+    services in the OMAG server.
 
-        - get_configured_access_services(server_name: str = None) -> dict:
-            Returns the list of access services that are configured for this server.
+    Attributes:
 
-        - configure_all_access_services(server_name: str = None) -> None:
-            Enables all access services that are registered with this server platform.
-
-        - configure_all_access_services_no_topics(server_name: str = None) -> None:
-            Configures all access services for the specified server with no cohort/Event Bus.
-
-        - clear_all_access_services(server_name: str = None) -> None:
-            Disables the access services. This removes all configuration for the access services and disables the
-            enterprise repository services.
+        server_name: str
+            The name of the OMAG server to configure.
+        platform_url : str
+            URL of the server platform to connect to
+        user_id : str
+            The identity of the user calling the method - this sets a default optionally used by the methods
+            when the user doesn't pass the user_id on a method call.
+        user_pwd: str
+            The password associated with the user_id. Defaults to None
 
-        - get_access_service_config(access_service_name: str, server_name: str = None) -> dict:
-            Retrieves the config for an access service.
-
-        - configure_access_service(access_service_name: str, server_name: str = None) -> None:
-            Enables a single access service.
-     """
+    """
 
     def __init__(
-            self,
-            server_name: str,
-            platform_url: str,
-            user_id: str,
-            user_pwd: str = None,
-            verify_flag: bool = enable_ssl_check,
+        self,
+        server_name: str,
+        platform_url: str,
+        user_id: str,
+        user_pwd: str = None,
+        verify_flag: bool = enable_ssl_check,
     ):
-        self.admin_command_root: str
-        Client.__init__(self, server_name, platform_url, user_id, user_pwd, verify_flag)
-        self.admin_command_root = (
-                self.platform_url
-                + "/open-metadata/admin-services/users/"
-                + user_id
+        self.core_command_root: str
+        Client.__init__(self, server_name, platform_url, user_id, user_pwd)
+        self.core_command_root = (
+            self.platform_url + "/open-metadata/admin-services/users/" + user_id
         )
 
     #
     #       Configure Access Services
     #
     def get_stored_configuration(self, server_name: str = None) -> dict:
-        """ Retrieves all the configuration documents for a server
+        """Retrieves all the configuration documents for a server
         Parameters
         ----------
             self :
@@ -104,17 +91,17 @@ class CoreServerConfig(Client):
 
         if server_name is None:
             server_name = self.server_name
-        url = f"{self.admin_command_root}/servers/{server_name}/configuration"
+        url = f"{self.core_command_root}/servers/{server_name}/configuration"
         response = self.make_request("GET", url)
         return response.json().get("omagserverConfig", "No configuration found")
 
-    def is_server_configured(self, server_name:str= None) -> bool:
-        """ Check if the server has a stored configuration
+    def is_server_configured(self, server_name: str = None) -> bool:
+        """Check if the server has a stored configuration
 
         Parameters
         ----------
         server_name : str, optional
-            The name of the server. If not provided, it uses the default server_name from the instance.
+            The name of the server. If not provided, it uses the default view_server from the instance.
 
         Returns
         -------
@@ -126,14 +113,13 @@ class CoreServerConfig(Client):
 
         response = self.get_stored_configuration(server_name=server_name)
 
-        if 'auditTrail' in response:
+        if "auditTrail" in response:
             return True
         else:
             return False
 
-
     def get_configured_access_services(self, server_name: str = None) -> list | str:
-        """ Return the list of access services that are configured for this server.
+        """Return the list of access services that are configured for this server.
 
         Parameters
         ----------
@@ -160,12 +146,12 @@ class CoreServerConfig(Client):
         if server_name is None:
             server_name = self.server_name
 
-        url = f"{self.admin_command_root}/servers/{server_name}/access-services"
+        url = f"{self.core_command_root}/servers/{server_name}/access-services"
         response = self.make_request("GET", url)
         return response.json().get("services", "No access services found")
 
     def configure_all_access_services(self, server_name: str = None) -> None:
-        """ Enable all access services that are registered with this server platform.
+        """Enable all access services that are registered with this server platform.
             The access services will send notifications if it is part of its implementation.
         Parameters
         ----------
@@ -193,11 +179,11 @@ class CoreServerConfig(Client):
         if server_name is None:
             server_name = self.server_name
 
-        url = f"{self.admin_command_root}/servers/{server_name}/access-services"
+        url = f"{self.core_command_root}/servers/{server_name}/access-services"
         self.make_request("POST", url)
 
     def configure_all_access_services_no_topics(self, server_name: str = None) -> None:
-        """ Configure all access services for the specified server with no cohort/Event Bus.
+        """Configure all access services for the specified server with no cohort/Event Bus.
         Parameters
         ----------
         server_name : str, optional
@@ -223,11 +209,13 @@ class CoreServerConfig(Client):
         """
         if server_name is None:
             server_name = self.server_name
-        url = f"{self.admin_command_root}/servers/{server_name}/access-services/no-topics"
+        url = (
+            f"{self.core_command_root}/servers/{server_name}/access-services/no-topics"
+        )
         self.make_request("POST", url)
 
     def clear_all_access_services(self, server_name: str = None) -> None:
-        """ Disable the access services. This removes all configuration for the access services and disables the
+        """Disable the access services. This removes all configuration for the access services and disables the
             enterprise repository services.
         Parameters
         ----------
@@ -256,11 +244,13 @@ class CoreServerConfig(Client):
         if server_name is None:
             server_name = self.server_name
 
-        url = f"{self.admin_command_root}/servers/{server_name}/access-services"
+        url = f"{self.core_command_root}/servers/{server_name}/access-services"
         self.make_request("DELETE", url)
 
-    def get_access_service_config(self, access_service_name: str, server_name: str = None) -> dict:
-        """ Retrieve the config for an access service.
+    def get_access_service_config(
+        self, access_service_name: str, server_name: str = None
+    ) -> dict:
+        """Retrieve the config for an access service.
 
         Parameters
         ----------
@@ -288,18 +278,22 @@ class CoreServerConfig(Client):
         ConfigurationErrorException
           Raised when configuration parameters passed on earlier calls turn out to be
           invalid or make the new call invalid.
-       """
+        """
         if server_name is None:
             server_name = self.server_name
         validate_name(access_service_name)
 
-        url = f"{self.admin_command_root}/servers/{server_name}/access-services/{access_service_name}"
+        url = f"{self.core_command_root}/servers/{server_name}/access-services/{access_service_name}"
         response = self.make_request("GET", url)
         return response.json().get("config", "Access service not found")
 
-    def configure_access_service(self, access_service_name: str, access_service_options: dict = None,
-                                 server_name: str = None) -> None:
-        """ Enable a single access service. This access service will send notifications if it is part
+    def configure_access_service(
+        self,
+        access_service_name: str,
+        access_service_options: dict = None,
+        server_name: str = None,
+    ) -> None:
+        """Enable a single access service. This access service will send notifications if it is part
             of its implementation.
 
         Parameters
@@ -338,12 +332,16 @@ class CoreServerConfig(Client):
         if server_name is None:
             server_name = self.server_name
         validate_name(access_service_name)
-        url = f"{self.admin_command_root}/servers/{server_name}/access-services/{access_service_name}"
+        url = f"{self.core_command_root}/servers/{server_name}/access-services/{access_service_name}"
         self.make_request("POST", url, access_service_options)
 
-    def configure_access_service_no_topics(self, access_service_name: str, access_service_options: dict = None,
-                                           server_name: str = None) -> None:
-        """ Enable a single access service. Notifications, if supported, are disabled.
+    def configure_access_service_no_topics(
+        self,
+        access_service_name: str,
+        access_service_options: dict = None,
+        server_name: str = None,
+    ) -> None:
+        """Enable a single access service. Notifications, if supported, are disabled.
 
         Parameters
         ----------
@@ -384,11 +382,13 @@ class CoreServerConfig(Client):
             server_name = self.server_name
         validate_name(access_service_name)
 
-        url = f"{self.admin_command_root}/servers/{server_name}/access-services/{access_service_name}/no-topics"
+        url = f"{self.core_command_root}/servers/{server_name}/access-services/{access_service_name}/no-topics"
         self.make_request("POST", url, access_service_options)
 
-    def clear_access_service(self, access_service_name: str, server_name: str = None) -> None:
-        """ Remove the config for an access service.
+    def clear_access_service(
+        self, access_service_name: str, server_name: str = None
+    ) -> None:
+        """Remove the config for an access service.
 
         Parameters
         ----------
@@ -421,11 +421,11 @@ class CoreServerConfig(Client):
             server_name = self.server_name
         validate_name(access_service_name)
 
-        url = f"{self.admin_command_root}/servers/{server_name}/access-services/{access_service_name}"
+        url = f"{self.core_command_root}/servers/{server_name}/access-services/{access_service_name}"
         self.make_request("DELETE", url)
 
     def get_access_services_configuration(self, server_name: str = None) -> list:
-        """ Return the detailed configuration for the access services in this server.
+        """Return the detailed configuration for the access services in this server.
 
         Parameters
         ----------
@@ -441,7 +441,7 @@ class CoreServerConfig(Client):
         """
         if server_name is None:
             server_name = self.server_name
-        url = f"{self.admin_command_root}/servers/{server_name}/access-services/configuration"
+        url = f"{self.core_command_root}/servers/{server_name}/access-services/configuration"
         response = self.make_request("GET", url)
 
         return response.json().get("services", "No access services configured")
@@ -450,7 +450,7 @@ class CoreServerConfig(Client):
     #       Configure Event Bus
     #
     def get_event_bus(self, server_name: str = None) -> dict:
-        """ Returns the event bus configuration for the specified server
+        """Returns the event bus configuration for the specified server
 
         Parameters
         ----------
@@ -474,13 +474,13 @@ class CoreServerConfig(Client):
         """
         if server_name is None:
             server_name = self.server_name
-        url = f"{self.admin_command_root}/servers/{server_name}/event-bus"
+        url = f"{self.core_command_root}/servers/{server_name}/event-bus"
 
         response = self.make_request("GET", url)
         return response.json().get("config", "No event bus configured")
 
     def set_event_bus(self, event_bus_config: dict, server_name: str = None) -> None:
-        """ Sets the event bus configuration for the server.
+        """Sets the event bus configuration for the server.
 
         Parameters
         ----------
@@ -519,11 +519,11 @@ class CoreServerConfig(Client):
         if server_name is None:
             server_name = self.server_name
 
-        url = f"{self.admin_command_root}/servers/{server_name}/event-bus"
+        url = f"{self.core_command_root}/servers/{server_name}/event-bus"
         self.make_request("POST", url, event_bus_config)
 
     def clear_event_bus(self, server_name: str = None) -> None:
-        """ Delete the event bus configuration for the given server.
+        """Delete the event bus configuration for the given server.
 
         Parameters
         ----------
@@ -555,45 +555,47 @@ class CoreServerConfig(Client):
         if server_name is None:
             server_name = self.server_name
 
-        url = f"{self.admin_command_root}/servers/{server_name}/event-bus"
+        url = f"{self.core_command_root}/servers/{server_name}/event-bus"
         self.make_request("DELETE", url)
 
     #
     #       Configure Audit Logs
     #
     def get_audit_log_destinations(self, server_name: str = None) -> dict:
-        """ Get the destinations for a servers audit log
+        """Get the destinations for a servers audit log
 
-         Parameters
-         ----------
-         server_name : str, optional
-         The name of the server to retrieve the audit configuration for. If no value is provided will pull
-         the default from the class definition.
+        Parameters
+        ----------
+        server_name : str, optional
+        The name of the server to retrieve the audit configuration for. If no value is provided will pull
+        the default from the class definition.
 
-         Returns
-         -------
-         Returns json string containing the audit log destinations configuration.
+        Returns
+        -------
+        Returns json string containing the audit log destinations configuration.
 
-         Raises
-         ------
+        Raises
+        ------
 
-         InvalidParameterException
-             If the client passes incorrect parameters on the request - such as bad URLs or invalid values
-         PropertyServerException
-             Raised by the server when an issue arises in processing a valid request
-         NotAuthorizedException
-             The principle specified by the user_id does not have authorization for the requested action
+        InvalidParameterException
+            If the client passes incorrect parameters on the request - such as bad URLs or invalid values
+        PropertyServerException
+            Raised by the server when an issue arises in processing a valid request
+        NotAuthorizedException
+            The principle specified by the user_id does not have authorization for the requested action
         """
 
         if server_name is None:
             server_name = self.server_name
 
-        url = f"{self.admin_command_root}/servers/{server_name}/audit-log-destinations"
+        url = f"{self.core_command_root}/servers/{server_name}/audit-log-destinations"
         response = self.make_request("GET", url)
-        return response.json().get("connections", "No audit log destinations configured")
+        return response.json().get(
+            "connections", "No audit log destinations configured"
+        )
 
     def clear_audit_log_destinations(self, server_name: str = None) -> None:
-        """ Clears the audit log destination configuration for the specified server
+        """Clears the audit log destination configuration for the specified server
 
         Parameters
         ----------
@@ -619,11 +621,11 @@ class CoreServerConfig(Client):
         if server_name is None:
             server_name = self.server_name
 
-        url = f"{self.admin_command_root}/servers/{server_name}/audit-log-destinations"
+        url = f"{self.core_command_root}/servers/{server_name}/audit-log-destinations"
         self.make_request("DELETE", url)
 
     def clear_a_log_destination(self, dest_name: str, server_name: str = None) -> None:
-        """  Clears audit log destinations for a server
+        """Clears audit log destinations for a server
 
         Parameters
         ----------
@@ -651,11 +653,13 @@ class CoreServerConfig(Client):
         if server_name is None:
             server_name = self.server_name
         validate_name(dest_name)
-        url = f"{self.admin_command_root}/servers/{server_name}/audit-log-destinations/connection/{dest_name}"
+        url = f"{self.core_command_root}/servers/{server_name}/audit-log-destinations/connection/{dest_name}"
         self.make_request("DELETE", url)
 
-    def add_console_log_destinations(self, severities: [str], server_name: str = None) -> None:
-        """ Adds a console log destination to a server
+    def add_console_log_destinations(
+        self, severities: [str], server_name: str = None
+    ) -> None:
+        """Adds a console log destination to a server
 
         Parameters
         ----------
@@ -686,11 +690,11 @@ class CoreServerConfig(Client):
             server_name = self.server_name
         if severities is None:
             severities = []
-        url = f"{self.admin_command_root}/servers/{server_name}/audit-log-destinations/console"
+        url = f"{self.core_command_root}/servers/{server_name}/audit-log-destinations/console"
         self.make_request("POST", url, severities)
 
     def add_default_log_destinations(self, server_name: str = None) -> None:
-        """ Adds the default log destination to a server
+        """Adds the default log destination to a server
 
         Parameters
         ----------
@@ -715,11 +719,13 @@ class CoreServerConfig(Client):
         """
         if server_name is None:
             server_name = self.server_name
-        url = f"{self.admin_command_root}/servers/{server_name}/audit-log-destinations/default"
+        url = f"{self.core_command_root}/servers/{server_name}/audit-log-destinations/default"
         self.make_request("POST", url)
 
-    def add_event_topic_log_destinations(self, topic_name: str, severities: [str], server_name: str = None) -> None:
-        """ Adds an event topic log destination to a server
+    def add_event_topic_log_destinations(
+        self, topic_name: str, severities: [str], server_name: str = None
+    ) -> None:
+        """Adds an event topic log destination to a server
 
         Parameters
         ----------
@@ -758,12 +764,16 @@ class CoreServerConfig(Client):
         if severities is None:
             severities = []
 
-        url = (f"{self.admin_command_root}/servers/{server_name}/audit-log-destinations/event-topic?topicName="
-               f"{topic_name}")
+        url = (
+            f"{self.core_command_root}/servers/{server_name}/audit-log-destinations/event-topic?topicName="
+            f"{topic_name}"
+        )
         self.make_request("POST", url, severities)
 
-    def add_file_log_destinations(self, directory_name: str, severities: [str] = None, server_name: str = None) -> None:
-        """ Adds a file log destination to a server. Each message is a separate file in the directory
+    def add_file_log_destinations(
+        self, directory_name: str, severities=None, server_name: str = None
+    ) -> None:
+        """Adds a file log destination to a server. Each message is a separate file in the directory
             indicated by the directory name.
 
         Parameters
@@ -793,6 +803,8 @@ class CoreServerConfig(Client):
             invalid or make the new call invalid.
 
         """
+        if severities is None:
+            severities = ["Error", "Exception"]
         if server_name is None:
             server_name = self.server_name
 
@@ -800,12 +812,52 @@ class CoreServerConfig(Client):
 
         if severities is None:
             severities = []
-        url = (f"{self.admin_command_root}/servers/{server_name}/audit-log-destinations/files?directoryName="
-               f"{directory_name}")
+        url = (
+            f"{self.core_command_root}/servers/{server_name}/audit-log-destinations/files?directoryName="
+            f"{directory_name}"
+        )
         self.make_request("POST", url, severities)
 
-    def add_slf4j_log_destination(self, severities: [str] = None, server_name: str = None) -> None:
-        """ Adds an SLF4J log destination to a server
+    def add_postgres_log_destinations(
+        self, config_body: dict, server_name: str = None
+    ) -> None:
+        """Adds a postgres log destination to a server.
+
+        Parameters
+        ----------
+        config_body : str
+            Configuration of the postgres database for the audit log destination.
+        server_name : str
+            Name of the server to update.
+
+        Returns
+        -------
+        Void
+
+        Raises
+        ------
+
+        InvalidParameterException:
+            If the client passes incorrect parameters on the request - such as bad URLs or invalid values
+        PropertyServerException:
+            Raised by the server when an issue arises in processing a valid request
+        NotAuthorizedException:
+            The principle specified by the user_id does not have authorization for the requested action
+        ConfigurationErrorException:
+            Raised when configuration parameters passed on earlier calls turn out to be
+            invalid or make the new call invalid.
+
+        """
+        if server_name is None:
+            server_name = self.server_name
+
+        url = f"{self.core_command_root}/servers/{server_name}/audit-log-destinations/postgres"
+        self.make_request("POST", url, config_body)
+
+    def add_slf4j_log_destination(
+        self, severities: [str] = None, server_name: str = None
+    ) -> None:
+        """Adds an SLF4J log destination to a server
 
         Parameters
         ----------
@@ -832,19 +884,19 @@ class CoreServerConfig(Client):
             server_name = self.server_name
         if severities is None:
             severities = []
-        url = f"{self.admin_command_root}/servers/{server_name}/audit-log-destinations/slf4j"
+        url = f"{self.core_command_root}/servers/{server_name}/audit-log-destinations/slf4j"
         self.make_request("POST", url, severities)
 
     #
     #   Basic Repository Configuration
     #
     def set_no_repository_mode(self, server_name: str = None) -> None:
-        """ Disable the local repository for this server
+        """Disable the local repository for this server
 
         Parameters
         ----------
         server_name : str, optional
-            The name of the server. If not provided, the method uses the value stored in `self.server_name`.
+            The name of the server. If not provided, the method uses the value stored in `self.view_server`.
 
         Returns
         -------
@@ -862,11 +914,11 @@ class CoreServerConfig(Client):
         if server_name is None:
             server_name = self.server_name
 
-        url = f"{self.admin_command_root}/servers/{server_name}/local-repository"
+        url = f"{self.core_command_root}/servers/{server_name}/local-repository"
         self.make_request("DELETE", url)
 
     def get_local_repository_config(self, server_name: str = None) -> dict:
-        """ Retrieve the local repository configuration as a JSON dictionary
+        """Retrieve the local repository configuration as a JSON dictionary
 
         Parameters
         ----------
@@ -891,7 +943,12 @@ class CoreServerConfig(Client):
         """
         if server_name is None:
             server_name = self.server_name
-        url = self.admin_command_root + "/servers/" + server_name + "/local-repository/configuration"
+        url = (
+            self.core_command_root
+            + "/servers/"
+            + server_name
+            + "/local-repository/configuration"
+        )
         response = self.make_request("GET", url)
 
         # return response.json().get("config")
@@ -899,7 +956,7 @@ class CoreServerConfig(Client):
         return response.json().get("config", "No configuration found")
 
     def clear_local_repository_config(self, server_name: str = None) -> None:
-        """ Clear the configuration of the local repository
+        """Clear the configuration of the local repository
 
         Parameters
         ----------
@@ -923,11 +980,18 @@ class CoreServerConfig(Client):
         """
         if server_name is None:
             server_name = self.server_name
-        url = self.admin_command_root + "/servers/" + server_name + "/local-repository/configuration"
+        url = (
+            self.core_command_root
+            + "/servers/"
+            + server_name
+            + "/local-repository/configuration"
+        )
         self.make_request("DELETE", url)
 
-    def set_local_metadata_collection_id(self, metadata_collection_id: str, server_name: str = None) -> None:
-        """ set the metadata collection id of the local repository
+    def set_local_metadata_collection_id(
+        self, metadata_collection_id: str, server_name: str = None
+    ) -> None:
+        """set the metadata collection id of the local repository
 
         Parameters
         ----------
@@ -954,11 +1018,11 @@ class CoreServerConfig(Client):
             server_name = self.server_name
         validate_guid(metadata_collection_id)
 
-        url = f"{self.admin_command_root}/servers/{server_name}/local-repository/metadata-collection-id"
+        url = f"{self.core_command_root}/servers/{server_name}/local-repository/metadata-collection-id"
         self.make_request("POST", url, metadata_collection_id)
 
     def get_local_metadata_collection_id(self, server_name: str = None) -> str:
-        """ get the local metadata collection id
+        """get the local metadata collection id
         Parameters
         ----------
                 server_name : str, optional
@@ -984,12 +1048,15 @@ class CoreServerConfig(Client):
         if server_name is None:
             server_name = self.server_name
 
-        url = f"{self.admin_command_root}/servers/{server_name}/local-repository/metadata-collection-id"
-        response = self.make_request("GET", url, )
-        return response.json().get('guid', "No ID found")
+        url = f"{self.core_command_root}/servers/{server_name}/local-repository/metadata-collection-id"
+        response = self.make_request(
+            "GET",
+            url,
+        )
+        return response.json().get("guid", "No ID found")
 
     def get_local_metadata_collection_name(self, server_name: str = None) -> str:
-        """ get the local metadata collection name
+        """get the local metadata collection name
         Parameters
         ----------
                 server_name : str, optional
@@ -1015,12 +1082,17 @@ class CoreServerConfig(Client):
         if server_name is None:
             server_name = self.server_name
 
-        url = f"{self.admin_command_root}/servers/{server_name}/local-repository/metadata-collection-name"
-        response = self.make_request("GET", url, )
+        url = f"{self.core_command_root}/servers/{server_name}/local-repository/metadata-collection-name"
+        response = self.make_request(
+            "GET",
+            url,
+        )
         return response.json().get("resultString", "No name found")
 
-    def set_local_metadata_collection_name(self, metadata_collection_name: str, server_name: str = None) -> None:
-        """ Set local metadata collection name
+    def set_local_metadata_collection_name(
+        self, metadata_collection_name: str, server_name: str = None
+    ) -> None:
+        """Set local metadata collection name
 
         Parameters
         ----------
@@ -1049,12 +1121,14 @@ class CoreServerConfig(Client):
             server_name = self.server_name
         validate_name(metadata_collection_name)
 
-        url = (f"{self.admin_command_root}/servers/{server_name}/local-repository/"
-               f"metadata-collection-name/{metadata_collection_name}")
+        url = (
+            f"{self.core_command_root}/servers/{server_name}/local-repository/"
+            f"metadata-collection-name/{metadata_collection_name}"
+        )
         self.make_request("POST", url)
 
     def set_in_mem_local_repository(self, server_name: str = None) -> None:
-        """  Sets the local repository to use the native in-memory repository
+        """Sets the local repository to use the native in-memory repository
 
         Parameters
         ----------
@@ -1076,11 +1150,11 @@ class CoreServerConfig(Client):
         """
         if server_name is None:
             server_name = self.server_name
-        url = f"{self.admin_command_root}/servers/{server_name}/local-repository/mode/in-memory-repository"
+        url = f"{self.core_command_root}/servers/{server_name}/local-repository/mode/in-memory-repository"
         self.make_request("POST", url)
 
     def set_graph_local_repository(self, server_name: str = None) -> None:
-        """ Sets the local repository to use JanusGraph file based repository
+        """Sets the local repository to use JanusGraph file based repository
 
         Parameters
         ----------
@@ -1104,14 +1178,46 @@ class CoreServerConfig(Client):
         """
         if server_name is None:
             server_name = self.server_name
-        url = f"{self.admin_command_root}/servers/{server_name}/local-repository/mode/local-graph-repository"
+        url = f"{self.core_command_root}/servers/{server_name}/local-repository/mode/local-graph-repository"
         self.make_request("POST", url)
 
     def set_read_only_local_repository(self, server_name: str = None) -> None:
-        """ Sets the local repository to be read-only
+        """Sets the local repository to be read-only
+
+        Parameters
+        ----------
+        server_name : str, optional
+            The name of the server. If not provided, the default server name of the instance will be used.
+
+        Returns
+        -------
+        None
+            This method does not return anything.
+
+        Raises
+        ------
+        InvalidParameterException
+            If the response code is not 200.
+        PropertyServerException:
+            Raised by the server when an issue arises in processing a valid request
+        NotAuthorizedException:
+            The principle specified by the user_id does not have authorization for the requested action
+
+        """
+        if server_name is None:
+            server_name = self.server_name
+        url = f"{self.core_command_root}/servers/{server_name}/local-repository/mode/read-only-repository"
+        self.make_request("POST", url)
+
+    def set_repository_proxy_details(
+        self, connector_provider: str, server_name: str = None
+    ) -> None:
+        """Sets the local repository to use the proxy repository specified by the connection.
 
         Parameters
         ----------
+        connector_provider: str
+            Specifies the class of the proxy connector provider.
         server_name : str, optional
             The name of the server. If not provided, the default server name of the instance will be used.
 
@@ -1132,16 +1238,24 @@ class CoreServerConfig(Client):
         """
         if server_name is None:
             server_name = self.server_name
-        url = f"{self.admin_command_root}/servers/{server_name}/local-repository/mode/read-only-repository"
+
+        validate_name(connector_provider)
+
+        url = (
+            f"{self.core_command_root}/servers/{server_name}/local-repository/mode/repository-proxy/"
+            f"details?connectorProvider={connector_provider}"
+        )
         self.make_request("POST", url)
 
-    def set_plug_in_repository(self, config_body: dict, server_name:str = None)-> None:
-        """ Configure the metadata repository using a full repository connection body.
+    def set_postgres_local_repository(
+        self, config_body: dict, server_name: str = None
+    ) -> None:
+        """Set up the local repository to use the PostgreSQL Repository implementation.
 
         Parameters
         ----------
         config_body : dict
-            The configuration body for the plug-in repository. This should contain the necessary parameters for
+            The configuration body for the repository. This should contain the necessary parameters for
             connecting to the repository.
 
         server_name : str, optional
@@ -1160,16 +1274,61 @@ class CoreServerConfig(Client):
             Raised by the server when an issue arises in processing a valid request
         NotAuthorizedException:
             The principle specified by the user_id does not have authorization for the requested action
+
+        Notes
+        -----
+
+        Sample body:
+        {
+            "databaseURL": "{{postgreSQLDatabaseURL}}",
+            "databaseSchema": "repository_{{server}}",
+            "secretsStore": "{{secretsStore}}",
+            "secretsCollectionName": "{{postgreSQLServerCollectionName}}"
+        }
+
         """
         if server_name is None:
             server_name = self.server_name
 
-        url = f"{self.admin_command_root}/servers/{server_name}/local-repository/mode/plugin-repository/connection"
+        url = f"{self.core_command_root}/servers/{server_name}/local-repository/mode/postgres-repository"
         self.make_request("POST", url, config_body)
 
+    def set_plug_in_repository(
+        self, config_body: dict, server_name: str = None
+    ) -> None:
+        """Configure the metadata repository using a full repository connection body.
+
+        Parameters
+        ----------
+        config_body : dict
+            The configuration body for the plug-in repository. This should contain the necessary parameters for
+            connecting to the repository.
+
+        server_name : str, optional
+            The name of the server. If not provided, the default server name will be used.
+
+        Returns
+        -------
+        None
+            This method does not return anything.
+
+        Raises
+        ------
+        InvalidParameterException
+            If the response code is not 200.
+        PropertyServerException:
+            Raised by the server when an issue arises in processing a valid request
+        NotAuthorizedException:
+            The principle specified by the user_id does not have authorization for the requested action
+        """
+        if server_name is None:
+            server_name = self.server_name
+
+        url = f"{self.core_command_root}/servers/{server_name}/local-repository/mode/plugin-repository/connection"
+        self.make_request("POST", url, config_body)
 
     def set_xtdb_in_mem_repository(self, server_name: str = None) -> None:
-        """ Set xtdb local repository connection to be XTDB with an in memory repository
+        """Set xtdb local repository connection to be XTDB with an in memory repository
 
         Parameters
         ----------
@@ -1193,11 +1352,11 @@ class CoreServerConfig(Client):
         """
         if server_name is None:
             server_name = self.server_name
-        url = f"{self.admin_command_root}/servers/{server_name}/local-repository/mode/xtdb-in-memory-repository"
+        url = f"{self.core_command_root}/servers/{server_name}/local-repository/mode/xtdb-in-memory-repository"
         self.make_request("POST", url)
 
     def set_xtdb_local_kv_repository(self, server_name: str = None) -> None:
-        """ Set xtdb local repository connection to be XTDB with a local file based key-value store
+        """Set xtdb local repository connection to be XTDB with a local file based key-value store
 
         Parameters
         ----------
@@ -1226,11 +1385,13 @@ class CoreServerConfig(Client):
         """
         if server_name is None:
             server_name = self.server_name
-        url = f"{self.admin_command_root}/servers/{server_name}/local-repository/mode/xtdb-local-kv-repository"
+        url = f"{self.core_command_root}/servers/{server_name}/local-repository/mode/xtdb-local-kv-repository"
         self.make_request("POST", url)
 
-    def set_xtdb_local_repository(self, xtdb_config_body: dict, server_name: str = None) -> None:
-        """ Set the local repository connection to be XTDB with a potentially complex XTDB configuration
+    def set_xtdb_local_repository(
+        self, xtdb_config_body: dict, server_name: str = None
+    ) -> None:
+        """Set the local repository connection to be XTDB with a potentially complex XTDB configuration
 
         Parameters
         ----------
@@ -1261,17 +1422,22 @@ class CoreServerConfig(Client):
         if server_name is None:
             server_name = self.server_name
 
-        url = f"{self.admin_command_root}/servers/{server_name}/local-repository/mode/xtdb-local-repository"
+        url = f"{self.core_command_root}/servers/{server_name}/local-repository/mode/xtdb-local-repository"
         self.make_request("POST", url, xtdb_config_body)
 
-    def set_xtdb_pg_repository(self, host: str, pg_user: str, pg_pwd: str, server_name: str = None) -> None:
-        """ Set the local repository connection to be XTDB using PostgresSQL Server, passing in basic parameters
+    def set_xtdb_pg_repository(
+        self, host: str, port: str, pg_user: str, pg_pwd: str, server_name: str = None
+    ) -> None:
+        """Set the local repository connection to be XTDB using PostgresSQL Server, passing in basic parameters.
+            A postgres database with the name of the metadata server will be created if it doesn't exist.
+
 
         Parameters
         ----------
         host : str
-            the full hostname and port of the postgres server
-
+            the full hostname of the postgres server
+        port: str
+            the port number of the postgres server
         pg_user : str
             postgresql user name
 
@@ -1302,30 +1468,62 @@ class CoreServerConfig(Client):
         """
         if server_name is None:
             server_name = self.server_name
+
         validate_name(pg_pwd)
         validate_name(pg_user)
         validate_name(host)
         pg_db = server_name.lower()
 
-        jdbc_url = f'"jdbc:postgresql://{host}/{pg_db}?user={pg_user}&password={pg_pwd}"'
-        index_dir = f'"data/servers/{server_name}/repository/xtdb/rdb-index"'
-        lucene_dir = f'"data/servers/{server_name}/repository/xtdb/lucene"'
+        # Connect to the PostgreSQL server
+        conn = psycopg2.connect(
+            host=host,
+            port=port,
+            user=pg_user,
+            password=pg_pwd,
+            dbname="postgres",  # Connect to the default 'postgres' database to perform operations
+        )
+        conn.set_isolation_level(ISOLATION_LEVEL_AUTOCOMMIT)  # Enable autocommit mode
+
+        cursor = conn.cursor()
+
+        # Check if database exists
+        cursor.execute(sql.SQL("SELECT 1 FROM pg_database WHERE datname = %s"), [pg_db])
+        database_exists = cursor.fetchone()
+
+        # If the database does not exist, create it
+        if not database_exists:
+            cursor.execute(sql.SQL("CREATE DATABASE { }").format(sql.Identifier(pg_db)))
+            print(f"Database '{pg_db}' created.")
+        else:
+            print(f"Database '{pg_db}' already exists.")
 
-        index_str = '{:xtdb/index-store {:kv-store {:xtdb/module xtdb.rocksdb/->kv-store :db-dir '
-        index_str2 = index_str + index_dir + '}}'
+        # Close the connection to the server
+        cursor.close()
+        conn.close()
 
-        lucene_str = ':xtdb.lucene/lucene-store {:db-dir ' + lucene_dir
-        lucene_str2 = lucene_str + ' :indexer {:xtdb/module xtdb.lucene.egeria/->egeria-indexer} '
-        lucene_str3 = lucene_str2 + ':analyzer {:xtdb/module xtdb.lucene.egeria/->ci-analyzer}} '
+        jdbc_url = f'"jdbc:postgresql://{host}:{port}/{pg_db}?user={pg_user}&password={pg_pwd}"'
+        index_dir = f'"data/servers/{server_name}/repository/{server_name}/rdb-index"'
+        lucene_dir = f'"data/servers/{server_name}/repository/{server_name}/lucene"'
 
-        conn_pool_str = ':xtdb.jdbc/connection-pool {:dialect {:xtdb/module xtdb.jdbc.psql/->dialect} '
-        conn_pool_str2 = f'{conn_pool_str} :db-spec {{:jdbcUrl {jdbc_url} }} }}'
+        index_str = "{:xtdb/index-store {:kv-store {:xtdb/module xtdb.rocksdb/->kv-store :db-dir "
+        index_str2 = index_str + index_dir + "}}"
 
-        tx_str = ':xtdb/tx-log {:xtdb/module xtdb.jdbc/->tx-log :connection-pool '
+        lucene_str = ":xtdb.lucene/lucene-store {:db-dir " + lucene_dir
+        lucene_str2 = (
+            lucene_str + " :indexer {:xtdb/module xtdb.lucene.egeria/->egeria-indexer} "
+        )
+        lucene_str3 = (
+            lucene_str2 + ":analyzer {:xtdb/module xtdb.lucene.egeria/->ci-analyzer}} "
+        )
+
+        conn_pool_str = ":xtdb.jdbc/connection-pool {:dialect {:xtdb/module xtdb.jdbc.psql/->dialect} "
+        conn_pool_str2 = f"{conn_pool_str} :db-spec {{:jdbcUrl {jdbc_url} }} }}"
+
+        tx_str = ":xtdb/tx-log {:xtdb/module xtdb.jdbc/->tx-log :connection-pool "
         tx_str2 = tx_str + ':xtdb.jdbc/connection-pool :poll-sleep-duration "PT1S"}'
 
-        doc_str = ':xtdb/document-store {:xtdb/module xtdb.jdbc/->document-store :connection-pool'
-        doc_str2 = doc_str + ' :xtdb.jdbc/connection-pool}}'
+        doc_str = ":xtdb/document-store {:xtdb/module xtdb.jdbc/->document-store :connection-pool"
+        doc_str2 = doc_str + " :xtdb.jdbc/connection-pool}}"
 
         edn = f"{index_str2} {lucene_str3} {conn_pool_str2} {tx_str2} {doc_str2}"
         body = {
@@ -1333,11 +1531,11 @@ class CoreServerConfig(Client):
         }
 
         print(json.dumps(body, indent=4))
-        url = f'{self.admin_command_root}/servers/{server_name}/local-repository/mode/xtdb-local-repository'
+        url = f"{self.core_command_root}/servers/{server_name}/local-repository/mode/xtdb-local-repository"
         self.make_request("POST", url, body)
 
     def get_open_metadata_archives(self, server_name: str = None) -> dict:
-        """ Return the list of open metadata archives configured to load on startup.
+        """Return the list of open metadata archives configured to load on startup.
 
         Parameters
         ----------
@@ -1361,13 +1559,13 @@ class CoreServerConfig(Client):
         """
         if server_name is None:
             server_name = self.server_name
-        url = f"{self.admin_command_root}/servers/{server_name}/open-metadata-archives"
+        url = f"{self.core_command_root}/servers/{server_name}/open-metadata-archives"
         response = self.make_request("GET", url)
 
         return response.json().get("connections", "No archives found")
 
     def clear_open_metadata_archives(self, server_name: str = None) -> None:
-        """ Clear open metadata archives from being loaded at startup
+        """Clear open metadata archives from being loaded at startup
 
         Parameters
         ----------
@@ -1390,11 +1588,13 @@ class CoreServerConfig(Client):
         """
         if server_name is None:
             server_name = self.server_name
-        url = f"{self.admin_command_root}/servers/{server_name}/open-metadata-archives"
+        url = f"{self.core_command_root}/servers/{server_name}/open-metadata-archives"
         self.make_request("DELETE", url)
 
-    def add_startup_open_metadata_archive_file(self, archive_file: str, server_name: str = None) -> None:
-        """ Add a metadata archive file to be loaded on startup
+    def add_startup_open_metadata_archive_file(
+        self, archive_file: str, server_name: str = None
+    ) -> None:
+        """Add a metadata archive file to be loaded on startup
         Parameters
         ----------
 
@@ -1422,16 +1622,23 @@ class CoreServerConfig(Client):
             server_name = self.server_name
         validate_name(archive_file)
 
-        url = f"{self.admin_command_root}/servers/{server_name}/open-metadata-archives/file"
+        url = f"{self.core_command_root}/servers/{server_name}/open-metadata-archives/file"
         self.make_request("POST", url, archive_file)
 
     #
     #   Basic settings and security
     #
-    def set_basic_server_properties(self, local_server_description: str, organization_name: str,
-                                    local_server_url: str, local_server_user_id: str, local_server_password: str,
-                                    max_page_size: int = 0, server_name: str = None):
-        """ Sets the basic server properties.
+    def set_basic_server_properties(
+        self,
+        local_server_description: str,
+        organization_name: str,
+        local_server_url: str,
+        local_server_user_id: str,
+        local_server_password: str,
+        max_page_size: int = 0,
+        server_name: str = None,
+    ):
+        """Sets the basic server properties.
         Parameters
         ----------
         local_server_description : str
@@ -1472,14 +1679,14 @@ class CoreServerConfig(Client):
             "localServerURL": local_server_url,
             "localServerUserId": local_server_user_id,
             "localServerPassword": local_server_password,
-            "maxPageSize": max_page_size
+            "maxPageSize": max_page_size,
         }
-        url = self.admin_command_root + "/servers/" + server_name + "/server-properties"
-        print(url)
+        url = self.core_command_root + "/servers/" + server_name + "/server-properties"
+
         self.make_request("POST", url, basic_props)
 
     def get_basic_server_properties(self, server_name: str = None) -> dict | str:
-        """ Retrieve the basic properties associated with this server
+        """Retrieve the basic properties associated with this server
 
         Parameters
         ----------
@@ -1504,13 +1711,15 @@ class CoreServerConfig(Client):
         """
         if server_name is None:
             server_name = self.server_name
-        url = self.admin_command_root + "/servers/" + server_name + "/server-properties"
+        url = self.core_command_root + "/servers/" + server_name + "/server-properties"
         response = self.make_request("GET", url)
 
-        return response.json().get("basicServerProperties", "No server properties found")
+        return response.json().get(
+            "basicServerProperties", "No server properties found"
+        )
 
     def get_server_type_classification(self, server_name: str = None) -> dict | str:
-        """ Clears the server type for the given server
+        """Clears the server type for the given server
 
         Parameters
         ----------
@@ -1534,13 +1743,15 @@ class CoreServerConfig(Client):
         """
         if server_name is None:
             server_name = self.server_name
-        url = f"{self.admin_command_root}/servers/{server_name}/server-type-classification"
+        url = (
+            f"{self.core_command_root}/servers/{server_name}/server-type-classification"
+        )
         response = self.make_request("GET", url)
 
         return response.json().get("serverTypeClassification", "No server type found")
 
     def get_server_security_connection(self, server_name: str = None) -> dict | str:
-        """ Retrieve the security connection configuration for a server.
+        """Retrieve the security connection configuration for a server.
 
         Parameters
         ----------
@@ -1565,12 +1776,14 @@ class CoreServerConfig(Client):
         """
         if server_name is None:
             server_name = self.server_name
-        url = f"{self.admin_command_root}/servers/{server_name}/security/connection"
+        url = f"{self.core_command_root}/servers/{server_name}/security/connection"
         response = self.make_request("GET", url)
         return response.json()
 
-    def set_server_security_connection(self, security_connection_body: dict, server_name: str = None) -> None:
-        """ Set the server security configuration
+    def set_server_security_connection(
+        self, security_connection_body: dict, server_name: str = None
+    ) -> None:
+        """Set the server security configuration
 
         Parameters
         ----------
@@ -1597,45 +1810,45 @@ class CoreServerConfig(Client):
         """
         if server_name is None:
             server_name = self.server_name
-        url = f"{self.admin_command_root}/servers/{server_name}/security/connection"
+        url = f"{self.core_command_root}/servers/{server_name}/security/connection"
         self.make_request("POST", url, security_connection_body)
 
     def clear_server_security_connection(self, server_name: str = None) -> None:
-        """ Clears the server security configuration
+        """Clears the server security configuration
 
-                Parameters
-                ----------
+        Parameters
+        ----------
 
-                server_name : str (optional)
-                    The name of the server for which the security connection should be set.
-                    If not provided, the default server name will be used.
+        server_name : str (optional)
+            The name of the server for which the security connection should be set.
+            If not provided, the default server name will be used.
 
-                Returns
-                -------
-                None
+        Returns
+        -------
+        None
 
-                Raises
-                ------
-                InvalidParameterException
-                    If the response code is not 200.
-                PropertyServerException:
-                    Raised by the server when an issue arises in processing a valid request
-                NotAuthorizedException:
-                    The principle specified by the user_id does not have authorization for the requested action
+        Raises
+        ------
+        InvalidParameterException
+            If the response code is not 200.
+        PropertyServerException:
+            Raised by the server when an issue arises in processing a valid request
+        NotAuthorizedException:
+            The principle specified by the user_id does not have authorization for the requested action
 
-                """
+        """
         if server_name is None:
             server_name = self.server_name
-        url = f"{self.admin_command_root}/servers/{server_name}/security/connection"
+        url = f"{self.core_command_root}/servers/{server_name}/security/connection"
         self.make_request("DELETE", url)
 
     def get_server_classification(self, server_name: str = None) -> dict:
-        """ Get server classification
+        """Get server classification
 
         Parameters
         ----------
         server_name : str, optional
-            The name of the server. If not provided, the value from `self.server_name` will be used.
+            The name of the server. If not provided, the value from `self.view_server` will be used.
 
         Returns
         -------
@@ -1654,7 +1867,9 @@ class CoreServerConfig(Client):
         """
         if server_name is None:
             server_name = self.server_name
-        url = f"{self.admin_command_root}/servers/{server_name}/server-type-classification"
+        url = (
+            f"{self.core_command_root}/servers/{server_name}/server-type-classification"
+        )
         response = self.make_request("GET", url)
 
         return response.json().get("serverTypeClassification")
@@ -1664,7 +1879,7 @@ class CoreServerConfig(Client):
     #
 
     def get_configured_view_svcs(self, server_name: str = None) -> dict:
-        """ Get the list of view services configured for the specified server
+        """Get the list of view services configured for the specified server
 
         Parameters
         ----------
@@ -1688,14 +1903,18 @@ class CoreServerConfig(Client):
         """
         if server_name is None:
             server_name = self.server_name
-        url = f"{self.admin_command_root}/servers/{server_name}/view-services"
+        url = f"{self.core_command_root}/servers/{server_name}/view-services"
         response = self.make_request("GET", url)
 
         return response.json().get("services", "No view services found")
 
-    def config_all_view_services(self, mdr_server_name: str,
-                                 mdr_server_platform_root_url: str, server_name: str = None) -> None:
-        """ Enable all view services that are registered with this OMAG server platform.
+    def config_all_view_services(
+        self,
+        mdr_server_name: str,
+        mdr_server_platform_root_url: str,
+        server_name: str = None,
+    ) -> None:
+        """Enable all view services that are registered with this OMAG server platform.
 
         Parameters
         ----------
@@ -1738,14 +1957,16 @@ class CoreServerConfig(Client):
         view_service_body = {
             "class": "ViewServiceRequestBody",
             "omagserverName": mdr_server_name,
-            "omagserverPlatformRootURL": mdr_server_platform_root_url
+            "omagserverPlatformRootURL": mdr_server_platform_root_url,
         }
 
-        url = f"{self.admin_command_root}/servers/{server_name}/view-services"
+        url = f"{self.core_command_root}/servers/{server_name}/view-services"
         self.make_request("POST", url, view_service_body)
 
-    def config_all_view_services_w_body(self, view_services_request_body, server_name: str = None) -> None:
-        """ Configure all view services for the specified view server with a simple configuration.
+    def config_all_view_services_w_body(
+        self, view_services_request_body, server_name: str = None
+    ) -> None:
+        """Configure all view services for the specified view server with a simple configuration.
 
         Parameters
         ----------
@@ -1777,11 +1998,11 @@ class CoreServerConfig(Client):
         if server_name is None:
             server_name = self.server_name
 
-        url = f"{self.admin_command_root}/servers/{server_name}/view-services"
+        url = f"{self.core_command_root}/servers/{server_name}/view-services"
         self.make_request("POST", url, view_services_request_body)
 
     def clear_all_view_services(self, server_name: str = None) -> None:
-        """ Clears all the view services for the given server
+        """Clears all the view services for the given server
 
         Parameters
         ----------
@@ -1804,11 +2025,13 @@ class CoreServerConfig(Client):
         """
         if server_name is None:
             server_name = self.server_name
-        url = f"{self.admin_command_root}/servers/{server_name}/view-services"
+        url = f"{self.core_command_root}/servers/{server_name}/view-services"
         self.make_request("DELETE", url)
 
-    def get_view_svc_config(self, service_url_marker: str, server_name: str = None) -> dict | str:
-        """ Retrieves the view service configuration for the given view server.
+    def get_view_svc_config(
+        self, service_url_marker: str, server_name: str = None
+    ) -> dict | str:
+        """Retrieves the view service configuration for the given view server.
         Parameters
         ----------
         service_url_marker : str
@@ -1843,13 +2066,18 @@ class CoreServerConfig(Client):
             server_name = self.server_name
         validate_name(service_url_marker)
 
-        url = f"{self.admin_command_root}/servers/{server_name}/view-services/{service_url_marker}"
+        url = f"{self.core_command_root}/servers/{server_name}/view-services/{service_url_marker}"
         response = self.make_request("GET", url)
         return response.json().get("config", "No view services found")
 
-    def config_view_service(self, service_url_marker: str, mdr_server_name: str,
-                            mdr_server_platform_root_url: str, server_name: str = None) -> None:
-        """ Configure a view service specified by the service_url_marker with basic properties.
+    def config_view_service(
+        self,
+        service_url_marker: str,
+        mdr_server_name: str,
+        mdr_server_platform_root_url: str,
+        server_name: str = None,
+    ) -> None:
+        """Configure a view service specified by the service_url_marker with basic properties.
 
         Parameters
         ----------
@@ -1895,14 +2123,16 @@ class CoreServerConfig(Client):
         view_service_body = {
             "class": "ViewServiceRequestBody",
             "omagserverName": mdr_server_name,
-            "omagserverPlatformRootURL": mdr_server_platform_root_url
+            "omagserverPlatformRootURL": mdr_server_platform_root_url,
         }
 
-        url = f"{self.admin_command_root}/servers/{server_name}/view-services/{service_url_marker}"
+        url = f"{self.core_command_root}/servers/{server_name}/view-services/{service_url_marker}"
         self.make_request("POST", url, view_service_body)
 
-    def clear_view_service(self, service_url_marker: str, server_name: str = None) -> None:
-        """ Remove the view service specified by the service_url_marker.
+    def clear_view_service(
+        self, service_url_marker: str, server_name: str = None
+    ) -> None:
+        """Remove the view service specified by the service_url_marker.
 
         Parameters
         ----------
@@ -1937,11 +2167,11 @@ class CoreServerConfig(Client):
             server_name = self.server_name
         validate_name(service_url_marker)
 
-        url = f"{self.admin_command_root}/servers/{server_name}/view-services/{service_url_marker}"
+        url = f"{self.core_command_root}/servers/{server_name}/view-services/{service_url_marker}"
         self.make_request("DELETE", url)
 
     def get_view_svcs_config(self, server_name: str = None) -> str | list:
-        """ Retrieves the view services configuration for the specified view server.
+        """Retrieves the view services configuration for the specified view server.
         Parameters
         ----------
         server_name : str, optional
@@ -1972,7 +2202,7 @@ class CoreServerConfig(Client):
         if server_name is None:
             server_name = self.server_name
 
-        url = f"{self.admin_command_root}/servers/{server_name}/view-services/configuration"
+        url = f"{self.core_command_root}/servers/{server_name}/view-services/configuration"
         response = self.make_request("GET", url)
 
         return response.json().get("services", "No services found")
@@ -1980,8 +2210,15 @@ class CoreServerConfig(Client):
     #
     #   Cohort Configuration, etc.
     #
-    def add_cohort_registration(self, cohort_name: str, server_name: str = None) -> None:
-        """ add a cohort registration
+    def add_cohort_registration(
+        self, cohort_name: str, server_name: str = None
+    ) -> None:
+        """Enable registration of server to an open metadata repository cohort using the default topic structure
+            (DEDICATED_TOPICS). A cohort is a group of open metadata repositories that are sharing metadata.
+            An OMAG server can connect to zero, one or more cohorts. Each cohort needs a unique name.
+            The members of the cohort use a shared topic to exchange registration information and events
+            related to the changes in their supported metadata types and instances. They are also able to query
+            each other's metadata directly through REST calls.
 
         Parameters
         ----------
@@ -2005,11 +2242,11 @@ class CoreServerConfig(Client):
             server_name = self.server_name
         validate_name(cohort_name)
 
-        url = f"{self.admin_command_root}/servers/{server_name}/cohorts/{cohort_name}"
+        url = f"{self.core_command_root}/servers/{server_name}/cohorts/{cohort_name}"
         self.make_request("POST", url)
 
     def get_cohort_config(self, cohort_name: str, server_name: str = None) -> dict:
-        """ Get the cohort configuration for the given cohort.
+        """Get the cohort configuration for the given cohort.
 
         Parameters
         ----------
@@ -2037,13 +2274,21 @@ class CoreServerConfig(Client):
 
         validate_name(cohort_name)
 
-        url = self.admin_command_root + "/servers/" + server_name + "/cohorts/" + cohort_name
+        url = (
+            self.core_command_root
+            + "/servers/"
+            + server_name
+            + "/cohorts/"
+            + cohort_name
+        )
         response = self.make_request("GET", url)
 
         return response.json().get("config", "No cohort configuration found")
 
-    def deploy_server_config(self, target_platform_body: dict, server_name: str = None) -> None:
-        """ Add a metadata archive file to be loaded on startup
+    def deploy_server_config(
+        self, target_platform_body: dict, server_name: str = None
+    ) -> None:
+        """Add a metadata archive file to be loaded on startup
         Parameters
         ----------
 
@@ -2070,14 +2315,14 @@ class CoreServerConfig(Client):
         if server_name is None:
             server_name = self.server_name
 
-        url = f"{self.admin_command_root}/servers/{server_name}/configuration/deploy"
+        url = f"{self.core_command_root}/servers/{server_name}/configuration/deploy"
         self.make_request("POST", url, target_platform_body)
 
     #
     #   Integration Groups
     #
     def clear_all_integration_groups(self, server_name: str = None) -> None:
-        """ Remove all the integration groups associated with the server.
+        """Remove all the integration groups associated with the server.
 
         Parameters
         ----------
@@ -2106,11 +2351,13 @@ class CoreServerConfig(Client):
         if server_name is None:
             server_name = self.server_name
 
-        url = f"{self.admin_command_root}/servers/{server_name}/integration-groups"
+        url = f"{self.core_command_root}/servers/{server_name}/integration-groups"
         self.make_request("DELETE", url)
 
-    def clear_an_integration_group(self, group_qualified_name: str, server_name: str = None) -> None:
-        """ Remove the integration group specified by the group_qualified_name parameter.
+    def clear_an_integration_group(
+        self, group_qualified_name: str, server_name: str = None
+    ) -> None:
+        """Remove the integration group specified by the group_qualified_name parameter.
 
         Parameters
         ----------
@@ -2141,11 +2388,11 @@ class CoreServerConfig(Client):
             server_name = self.server_name
         validate_name(group_qualified_name)
 
-        url = f"{self.admin_command_root}/servers/{server_name}/view-services/{group_qualified_name}"
+        url = f"{self.core_command_root}/servers/{server_name}/view-services/{group_qualified_name}"
         self.make_request("DELETE", url)
 
     def get_integration_groups_config(self, server_name: str = None) -> list | str:
-        """ Get the Integration Groups configuration server specified by the server_name parameter.
+        """Get the Integration Groups configuration server specified by the view_server parameter.
 
         Parameters
         ----------
@@ -2170,14 +2417,24 @@ class CoreServerConfig(Client):
         if server_name is None:
             server_name = self.server_name
 
-        url = self.admin_command_root + "/servers/" + server_name + "/integration-groups/configuration"
+        url = (
+            self.core_command_root
+            + "/servers/"
+            + server_name
+            + "/integration-groups/configuration"
+        )
         response = self.make_request("GET", url)
 
         return response.json().get("groups", "No Integration Group configuration found")
 
-    def config_integration_group(self, omag_server_name: str, omag_server_platform_root_url: str,
-                                 qualified_name: str, server_name: str = None) -> None:
-        """ Add configuration for a single integration group to the server's config document.
+    def config_integration_group(
+        self,
+        omag_server_name: str,
+        omag_server_platform_root_url: str,
+        qualified_name: str,
+        server_name: str = None,
+    ) -> None:
+        """Add configuration for a single integration group to the server's config document.
 
         Parameters
         ----------
@@ -2223,10 +2480,10 @@ class CoreServerConfig(Client):
             "class": "IntegrationGroupConfig",
             "omagserverName": omag_server_name,
             "omagserverPlatformRootURL": omag_server_platform_root_url,
-            "integrationGroupQualifiedName": qualified_name
+            "integrationGroupQualifiedName": qualified_name,
         }
 
-        url = f"{self.admin_command_root}/servers/{server_name}/integration-groups/configuration"
+        url = f"{self.core_command_root}/servers/{server_name}/integration-groups/configuration"
         self.make_request("POST", url, integration_group_service_body)
 
     #
@@ -2234,7 +2491,7 @@ class CoreServerConfig(Client):
     #
 
     def clear_engine_definitions_client_config(self, server_name: str = None) -> None:
-        """ Remove the configuration for the Governance Engine OMAS Engine client configuration in a single call.
+        """Remove the configuration for the Governance Engine OMAS Engine client configuration in a single call.
         This overrides the current values.
 
         Parameters
@@ -2263,12 +2520,16 @@ class CoreServerConfig(Client):
         if server_name is None:
             server_name = self.server_name
 
-        url = f"{self.admin_command_root}/servers/{server_name}/engine-definitions/client-config"
+        url = f"{self.core_command_root}/servers/{server_name}/engine-definitions/client-config"
         self.make_request("DELETE", url)
 
-    def set_engine_definitions_client_config(self, mdr_server_name: str, mdr_server_platform_root_url: str,
-                                             server_name: str = None) -> None:
-        """ Set up the name and platform URL root for the metadata server running the Governance Engine OMAS that
+    def set_engine_definitions_client_config(
+        self,
+        mdr_server_name: str,
+        mdr_server_platform_root_url: str,
+        server_name: str = None,
+    ) -> None:
+        """Set up the name and platform URL root for the metadata server running the Governance Engine OMAS that
          provides the governance engine definitions used by the engine services.
 
         Parameters
@@ -2313,11 +2574,11 @@ class CoreServerConfig(Client):
             "omagserverPlatformRootURL": mdr_server_platform_root_url,
         }
 
-        url = f"{self.admin_command_root}/servers/{server_name}/engine-definitions/client-config"
+        url = f"{self.core_command_root}/servers/{server_name}/engine-definitions/client-config"
         self.make_request("POST", url, body)
 
     def clear_engine_list(self, server_name: str = None) -> None:
-        """ Remove the configuration for the Governance Engine OMAS Engine client configuration in a single call.
+        """Remove the configuration for the Governance Engine OMAS Engine client configuration in a single call.
         This overrides the current values.
 
         Parameters
@@ -2346,43 +2607,11 @@ class CoreServerConfig(Client):
         if server_name is None:
             server_name = self.server_name
 
-        url = f"{self.admin_command_root}/servers/{server_name}/engine-list"
+        url = f"{self.core_command_root}/servers/{server_name}/engine-list"
         self.make_request("DELETE", url)
 
-    # def get_engine_list(self, server_name: str = None) -> list | str:
-    #     """ Get the list of engines from the specified by the server_name parameter.
-    #
-    #     Parameters
-    #     ----------
-    #
-    #     server_name : str, optional
-    #         The name of the server. If None, the default server name will be used.
-    #
-    #     Returns
-    #     -------
-    #     List containing the JSON structure of the Integration Groups configuration.
-    #
-    #     Raises
-    #     ------
-    #     InvalidParameterException
-    #         If the response code is not 200.
-    #     PropertyServerException:
-    #         Raised by the server when an issue arises in processing a valid request
-    #     NotAuthorizedException:
-    #         The principle specified by the user_id does not have authorization for the requested action
-    #
-    #     """
-    #     if server_name is None:
-    #         server_name = self.server_name
-    #
-    #     url = self.admin_command_root + "/servers/" + server_name + "/engine-list"
-    #     response = self.make_request("GET", url)
-    #
-    #     # return response.json().get("config", "No engine definitions client configuration found")
-    #     return response.json()
-
     def set_engine_list(self, engine_list: [dict], server_name: str = None) -> None:
-        """ Set up the list of governance engine that will use the metadata from the same metadata access server
+        """Set up the list of governance engine that will use the metadata from the same metadata access server
          as the engine host uses for retrieving the engine configuration.
 
         Parameters
@@ -2428,11 +2657,11 @@ class CoreServerConfig(Client):
         if server_name is None:
             server_name = self.server_name
 
-        url = f"{self.admin_command_root}/servers/{server_name}/engine-list"
+        url = f"{self.core_command_root}/servers/{server_name}/engine-list"
         self.make_request("POST", url, engine_list)
 
     def get_engine_host_services_config(self, server_name: str = None) -> dict | str:
-        """ Return the configuration for the complete engine host services in this server.
+        """Return the configuration for the complete engine host services in this server.
 
         Parameters
         ----------
@@ -2457,14 +2686,19 @@ class CoreServerConfig(Client):
         if server_name is None:
             server_name = self.server_name
 
-        url = self.admin_command_root + "/servers/" + server_name + "/engine-host-services/configuration"
+        url = (
+            self.core_command_root
+            + "/servers/"
+            + server_name
+            + "/engine-host-services/configuration"
+        )
         response = self.make_request("GET", url)
 
         # return response.json().get("config", "No engine definitions client configuration found")
         return response.json().get("services", "No engine host services")
 
     def get_placeholder_variables(self) -> dict:
-        """ get placeholder variables
+        """get placeholder variables
 
         Get the placeholder variables from the platform.
 
@@ -2483,13 +2717,13 @@ class CoreServerConfig(Client):
 
 
         """
-        url = self.admin_command_root + "/stores/placeholder-variables"
+        url = self.core_command_root + "/stores/placeholder-variables"
         response = self.make_request("GET", url)
 
         return response.json().get("stringMap")
 
     def set_placeholder_variables(self, placeholder_variables: dict) -> None:
-        """ Set placeholder variables - replaces previous placeholders with the new list
+        """Set placeholder variables - replaces previous placeholders with the new list
 
         Parameters
         ----------
@@ -2510,7 +2744,7 @@ class CoreServerConfig(Client):
             The principle specified by the user_id does not have authorization for the requested action
 
         """
-        url = f"{self.admin_command_root}/stores/placeholder-variables"
+        url = f"{self.core_command_root}/stores/placeholder-variables"
         self.make_request("POST", url, placeholder_variables)
 
     def clear_placeholder_variables(self) -> None:
@@ -2533,6 +2767,9 @@ class CoreServerConfig(Client):
             The principle specified by the user_id does not have authorization for the requested action
 
         """
-        url = f"{self.admin_command_root}/stores/placeholder-variables"
+        url = f"{self.core_command_root}/stores/placeholder-variables"
         self.make_request("DELETE", url)
 
+
+if __name__ == "__main__":
+    print("Main-Core OMAG server config")