pyegeria 0.8.4.36__py3-none-any.whl → 0.8.4.38__py3-none-any.whl

pyegeria/core_omag_server_config.py

@@ -10,6 +10,7 @@ deployed to take effect.
 """
 
 import json
+
 import psycopg2
 from psycopg2 import sql
 from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT
@@ -47,9 +48,9 @@ class CoreServerConfig(Client):
         user_pwd: str = None,
         verify_flag: bool = enable_ssl_check,
     ):
-        self.admin_command_root: str
+        self.core_command_root: str
         Client.__init__(self, server_name, platform_url, user_id, user_pwd)
-        self.admin_command_root = (
+        self.core_command_root = (
             self.platform_url + "/open-metadata/admin-services/users/" + user_id
         )
 
@@ -90,7 +91,7 @@ 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")
 
@@ -145,7 +146,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"
+        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")
 
@@ -178,7 +179,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"
+        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:
@@ -209,7 +210,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/no-topics"
+            f"{self.core_command_root}/servers/{server_name}/access-services/no-topics"
         )
         self.make_request("POST", url)
 
@@ -243,7 +244,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"
+        url = f"{self.core_command_root}/servers/{server_name}/access-services"
         self.make_request("DELETE", url)
 
     def get_access_service_config(
@@ -282,7 +283,7 @@ 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}"
         response = self.make_request("GET", url)
         return response.json().get("config", "Access service not found")
 
@@ -331,7 +332,7 @@ 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(
@@ -381,7 +382,7 @@ 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(
@@ -420,7 +421,7 @@ 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:
@@ -440,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")
@@ -473,7 +474,7 @@ 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")
@@ -518,7 +519,7 @@ 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:
@@ -554,7 +555,7 @@ 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)
 
     #
@@ -587,7 +588,7 @@ 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"
         response = self.make_request("GET", url)
         return response.json().get(
             "connections", "No audit log destinations configured"
@@ -620,7 +621,7 @@ 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:
@@ -652,7 +653,7 @@ 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(
@@ -689,7 +690,7 @@ 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:
@@ -718,7 +719,7 @@ 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(
@@ -764,7 +765,7 @@ class CoreServerConfig(Client):
             severities = []
 
         url = (
-            f"{self.admin_command_root}/servers/{server_name}/audit-log-destinations/event-topic?topicName="
+            f"{self.core_command_root}/servers/{server_name}/audit-log-destinations/event-topic?topicName="
             f"{topic_name}"
         )
         self.make_request("POST", url, severities)
@@ -812,7 +813,7 @@ class CoreServerConfig(Client):
         if severities is None:
             severities = []
         url = (
-            f"{self.admin_command_root}/servers/{server_name}/audit-log-destinations/files?directoryName="
+            f"{self.core_command_root}/servers/{server_name}/audit-log-destinations/files?directoryName="
             f"{directory_name}"
         )
         self.make_request("POST", url, severities)
@@ -847,7 +848,7 @@ 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)
 
     #
@@ -877,7 +878,7 @@ 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:
@@ -907,7 +908,7 @@ class CoreServerConfig(Client):
         if server_name is None:
             server_name = self.server_name
         url = (
-            self.admin_command_root
+            self.core_command_root
             + "/servers/"
             + server_name
             + "/local-repository/configuration"
@@ -944,7 +945,7 @@ class CoreServerConfig(Client):
         if server_name is None:
             server_name = self.server_name
         url = (
-            self.admin_command_root
+            self.core_command_root
             + "/servers/"
             + server_name
             + "/local-repository/configuration"
@@ -981,7 +982,7 @@ 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:
@@ -1011,7 +1012,7 @@ 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"
+        url = f"{self.core_command_root}/servers/{server_name}/local-repository/metadata-collection-id"
         response = self.make_request(
             "GET",
             url,
@@ -1045,7 +1046,7 @@ 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"
+        url = f"{self.core_command_root}/servers/{server_name}/local-repository/metadata-collection-name"
         response = self.make_request(
             "GET",
             url,
@@ -1085,7 +1086,7 @@ class CoreServerConfig(Client):
         validate_name(metadata_collection_name)
 
         url = (
-            f"{self.admin_command_root}/servers/{server_name}/local-repository/"
+            f"{self.core_command_root}/servers/{server_name}/local-repository/"
             f"metadata-collection-name/{metadata_collection_name}"
         )
         self.make_request("POST", url)
@@ -1113,7 +1114,7 @@ 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:
@@ -1141,7 +1142,7 @@ 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:
@@ -1169,7 +1170,7 @@ 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"
+        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(
@@ -1205,7 +1206,7 @@ class CoreServerConfig(Client):
         validate_name(connector_provider)
 
         url = (
-            f"{self.admin_command_root}/servers/{server_name}/local-repository/mode/repository-proxy/"
+            f"{self.core_command_root}/servers/{server_name}/local-repository/mode/repository-proxy/"
             f"details?connectorProvider={connector_provider}"
         )
         self.make_request("POST", url)
@@ -1241,7 +1242,7 @@ 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/plugin-repository/connection"
+        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:
@@ -1269,7 +1270,7 @@ 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:
@@ -1302,7 +1303,7 @@ 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(
@@ -1339,7 +1340,7 @@ 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(
@@ -1448,7 +1449,7 @@ 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:
@@ -1476,7 +1477,7 @@ 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")
@@ -1505,7 +1506,7 @@ 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(
@@ -1539,7 +1540,7 @@ 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)
 
     #
@@ -1598,7 +1599,7 @@ class CoreServerConfig(Client):
             "localServerPassword": local_server_password,
             "maxPageSize": max_page_size,
         }
-        url = self.admin_command_root + "/servers/" + server_name + "/server-properties"
+        url = self.core_command_root + "/servers/" + server_name + "/server-properties"
 
         self.make_request("POST", url, basic_props)
 
@@ -1628,7 +1629,7 @@ 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(
@@ -1660,7 +1661,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", "No server type found")
@@ -1691,7 +1694,7 @@ 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()
 
@@ -1725,7 +1728,7 @@ 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:
@@ -1754,7 +1757,7 @@ 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("DELETE", url)
 
     def get_server_classification(self, server_name: str = None) -> dict:
@@ -1782,7 +1785,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")
@@ -1816,7 +1821,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"
+        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")
@@ -1873,7 +1878,7 @@ class CoreServerConfig(Client):
             "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(
@@ -1911,7 +1916,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"
+        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:
@@ -1938,7 +1943,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"
+        url = f"{self.core_command_root}/servers/{server_name}/view-services"
         self.make_request("DELETE", url)
 
     def get_view_svc_config(
@@ -1979,7 +1984,7 @@ 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")
 
@@ -2039,7 +2044,7 @@ class CoreServerConfig(Client):
             "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(
@@ -2080,7 +2085,7 @@ 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:
@@ -2115,7 +2120,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")
@@ -2155,7 +2160,7 @@ 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:
@@ -2188,7 +2193,7 @@ class CoreServerConfig(Client):
         validate_name(cohort_name)
 
         url = (
-            self.admin_command_root
+            self.core_command_root
             + "/servers/"
             + server_name
             + "/cohorts/"
@@ -2228,7 +2233,7 @@ 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)
 
     #
@@ -2264,7 +2269,7 @@ 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(
@@ -2301,7 +2306,7 @@ 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:
@@ -2331,7 +2336,7 @@ class CoreServerConfig(Client):
             server_name = self.server_name
 
         url = (
-            self.admin_command_root
+            self.core_command_root
             + "/servers/"
             + server_name
             + "/integration-groups/configuration"
@@ -2396,7 +2401,7 @@ class CoreServerConfig(Client):
             "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)
 
     #
@@ -2433,7 +2438,7 @@ 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(
@@ -2487,7 +2492,7 @@ 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:
@@ -2520,7 +2525,7 @@ 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 set_engine_list(self, engine_list: [dict], server_name: str = None) -> None:
@@ -2570,7 +2575,7 @@ 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:
@@ -2600,7 +2605,7 @@ class CoreServerConfig(Client):
             server_name = self.server_name
 
         url = (
-            self.admin_command_root
+            self.core_command_root
             + "/servers/"
             + server_name
             + "/engine-host-services/configuration"
@@ -2630,7 +2635,7 @@ 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")
@@ -2657,7 +2662,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:
@@ -2680,7 +2685,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("DELETE", url)
 
 

pyegeria/egeria_cat_client.py

@@ -48,24 +48,29 @@ class EgeriaCat(
 
     def __init__(
         self,
-        server_name: str,
+        view_server: str,
         platform_url: str,
         user_id: str,
         user_pwd: str = None,
         token: str = None,
     ):
-        AssetCatalog.__init__(self, server_name, platform_url, user_id, user_pwd, token)
+        self.view_server = view_server
+        self.platform_url = platform_url
+        self.user_id = user_id
+        self.user_pwd = user_pwd
+
+        AssetCatalog.__init__(self, view_server, platform_url, user_id, user_pwd, token)
         CollectionManager.__init__(
-            self, server_name, platform_url, user_id, user_pwd, token
+            self, view_server, platform_url, user_id, user_pwd, token
         )
-        EgeriaMy.__init__(self, server_name, platform_url, user_id, user_pwd, token)
+        EgeriaMy.__init__(self, view_server, platform_url, user_id, user_pwd, token)
 
         GlossaryManager.__init__(
-            self, server_name, platform_url, user_id, user_pwd, token
+            self, view_server, platform_url, user_id, user_pwd, token
         )
 
         ProjectManager.__init__(
-            self, server_name, platform_url, user_id, user_pwd, token
+            self, view_server, platform_url, user_id, user_pwd, token
         )