pyegeria 0.8.4.25__py3-none-any.whl → 0.8.4.27__py3-none-any.whl

commands/cli/__init__.py

@@ -10,4 +10,4 @@ This is an emerging capability based on the **click** package. Feedback welcome!
 
 """
 
-from .ops_config import Config
+from .ops_config import Config

commands/cli/egeria.py

@@ -52,7 +52,6 @@ from commands.ops.monitor_integ_daemon_status import (
 from commands.ops.monitor_platform_status import (
     display_status as p_display_status,
 )
-from commands.ops.monitor_server_list import display_status as display_list
 from commands.ops.monitor_server_status import (
     display_status as s_display_status,
 )
@@ -839,7 +838,7 @@ def show_projects(ctx, search_string):
     "--status",
     type=click.Choice(
         ["OPEN", "IN_PROGRESS", "WAITING", "COMPLETE", "ABANDONED", "None"],
-        case_sensitive="False",
+        case_sensitive=False,
     ),
     help="Enter an optional status filter, default='OPEN'",
     required=False,
@@ -877,7 +876,13 @@ def list_archives(ctx):
     """Display a tree graph of information about an asset"""
     c = ctx.obj
     display_archive_list(
-        c.view_server, c.view_server_url, c.userid, c.password, None, c.jupyter, c.width
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        False,
+        c.jupyter,
+        c.width,
     )
 
 
@@ -964,30 +969,21 @@ def show_server(ctx):
     "--full",
     is_flag=True,
     default=False,
-    help="If True, full server descriptions will be shown",
+    help="If set, full server descriptions will be shown",
 )
 @click.pass_context
 def show_server_status(ctx, full):
     """Display a live status view of Egeria servers for the specified Egeria platform"""
     c = ctx.obj
-    if full:
-        display_list(
-            c.metadata_store,
-            c.metadata_store_url,
-            c.admin_user,
-            c.admin_user_password,
-            c.jupyter,
-            c.width,
-        )
-    else:
-        s_display_status(
-            c.metadata_store,
-            c.metadata_store_url,
-            c.admin_user,
-            c.admin_user_password,
-            c.jupyter,
-            c.width,
-        )
+    s_display_status(
+        full,
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        c.jupyter,
+        c.width,
+    )
 
 
 @show.group("engines")
@@ -1001,12 +997,24 @@ def engine_host(ctx):
 @click.option(
     "--list", is_flag=True, default=False, help="If True, a paged list will be shown"
 )
+@click.option(
+    "--engine-host",
+    default="engine-host",
+    help="Name of the Engine Host to get status for",
+)
 @click.pass_context
-def gov_eng_status(ctx, list):
+def gov_eng_status(ctx, engine_host, list):
     """Display engine-host status information"""
     c = ctx.obj
     display_gov_eng_status(
-        c.engine_host, c.engine_host_url, c.userid, c.password, list, c.jupyter, c.width
+        engine_host,
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        list,
+        c.jupyter,
+        c.width,
     )
 
 
@@ -1122,11 +1130,16 @@ def integration_daemon(ctx):
     default="all",
     help="Name of connector to refresh or 'all' to refresh all",
 )
-def refresh_connectors(ctx, connector):
+@click.option(
+    "--server",
+    default="integration-daemon",
+    help="Name of the integration server to refresh",
+)
+def refresh_connectors(ctx, server, connector):
     """Refresh the specified integration connector or ALL connectors if not specified"""
     c = ctx.obj
     refresh_connector(
-        connector, c.integration_daemon, c.integration_daemon_url, c.userid, c.password
+        connector, server, c.view_server_url, c.view_server, c.userid, c.password
     )
 
 
@@ -1137,11 +1150,16 @@ def refresh_connectors(ctx, connector):
     default="all",
     help="Name of connector to restart or 'all' to restart all",
 )
-def restart_connectors(ctx, connector):
+@click.option(
+    "--server",
+    default="integration-daemon",
+    help="Name of the integration server to refresh",
+)
+def restart_connectors(ctx, server, connector):
     """Restart the specified integration connector or ALL connectors if not specified"""
     c = ctx.obj
     restart_connector(
-        connector, c.integration_daemon, c.integration_daemon_url, c.userid, c.password
+        connector, server, c.view_server_url, c.view_server, c.userid, c.password
     )
 
 
@@ -1161,6 +1179,7 @@ def engine_host(ctx):
 
 engine_host.add_command(start_server)
 engine_host.add_command(stop_server)
+engine_host.add_command(refresh_gov_eng_config)
 
 
 @tell.group("repository")

commands/cli/egeria_ops.py

@@ -34,7 +34,6 @@ from commands.ops.monitor_integ_daemon_status import (
 from commands.ops.monitor_platform_status import (
     display_status as p_display_status,
 )
-from commands.ops.monitor_server_list import display_status as display_list
 from commands.ops.monitor_server_status import (
     display_status as s_display_status,
 )
@@ -120,9 +119,7 @@ from commands.ops.restart_integration_daemon import restart_connector
     envvar="EGERIA_ADMIN_PASSWORD",
     help="Egeria admin password",
 )
-@click.option(
-    "--userid", default="erinoverview", envvar="EGERIA_USER", help="Egeria user"
-)
+@click.option("--userid", default="garygeeke", envvar="EGERIA_USER", help="Egeria user")
 @click.option(
     "--password",
     default="secret",
@@ -233,30 +230,21 @@ def show_server(ctx):
     "--full",
     is_flag=True,
     default=False,
-    help="If True, full server descriptions will be shown",
+    help="If set, full server descriptions will be shown",
 )
 @click.pass_context
 def show_server_status(ctx, full):
     """Display a live status view of Egeria servers for the specified Egeria platform"""
     c = ctx.obj
-    if full:
-        display_list(
-            c.metadata_store,
-            c.metadata_store_url,
-            c.admin_user,
-            c.admin_user_password,
-            c.jupyter,
-            c.width,
-        )
-    else:
-        s_display_status(
-            c.metadata_store,
-            c.metadata_store_url,
-            c.admin_user,
-            c.admin_user_password,
-            c.jupyter,
-            c.width,
-        )
+    s_display_status(
+        full,
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        c.jupyter,
+        c.width,
+    )
 
 
 @show.group("engines")
@@ -267,15 +255,27 @@ def engine_host(ctx):
 
 
 @engine_host.command("status")
+@click.option(
+    "--engine-host",
+    default="engine-host",
+    help="Name of the Engine Host to get status for",
+)
 @click.option(
     "--list", is_flag=True, default=False, help="If True, a paged list will be shown"
 )
 @click.pass_context
-def gov_eng_status(ctx, list):
+def gov_eng_status(ctx, engine_host, list):
     """Display engine-host status information"""
     c = ctx.obj
     display_gov_eng_status(
-        c.engine_host, c.engine_host_url, c.userid, c.password, list, c.jupyter, c.width
+        c.engine_host,
+        c.view_server,
+        c.view_server_url,
+        c.userid,
+        c.password,
+        list,
+        c.jupyter,
+        c.width,
     )
 
 
@@ -386,9 +386,6 @@ def servers(ctx):
 
 servers.add_command(start_server)
 servers.add_command(stop_server)
-servers.add_command(refresh_gov_eng_config)
-
-CONTEXT_SETTINGS = dict(default_map={"runserver": {"port": 5000}})
 
 
 @tell.group("integration-daemon")
@@ -405,11 +402,16 @@ def integration_daemon(ctx):
     default="all",
     help="Name of connector to refresh or 'all' to refresh all",
 )
-def refresh_connectors(ctx, connector):
+@click.option(
+    "--server",
+    default="integration-daemon",
+    help="Name of the integration server to refresh",
+)
+def refresh_connectors(ctx, server, connector):
     """Refresh the specified integration connector or ALL connectors if not specified"""
     c = ctx.obj
     refresh_connector(
-        connector, c.integration_daemon, c.integration_daemon_url, c.userid, c.password
+        connector, server, c.view_server_url, c.view_server, c.userid, c.password
     )
 
 
@@ -420,19 +422,22 @@ def refresh_connectors(ctx, connector):
     default="all",
     help="Name of connector to restart or 'all' to restart all",
 )
-def restart_connectors(ctx, connector):
+@click.option(
+    "--server",
+    default="integration-daemon",
+    help="Name of the integration server to refresh",
+)
+def restart_connectors(ctx, server, connector):
     """Restart the specified integration connector or ALL connectors if not specified"""
     c = ctx.obj
     restart_connector(
-        connector, c.integration_daemon, c.integration_daemon_url, c.userid, c.password
+        connector, server, c.view_server_url, c.view_server, c.userid, c.password
     )
 
 
 integration_daemon.add_command(add_catalog_target)
 integration_daemon.add_command(remove_catalog_target)
 integration_daemon.add_command(update_catalog_target)
-integration_daemon.add_command(start_server)
-integration_daemon.add_command(stop_server)
 
 
 @tell.group("engine-host")

commands/cli/egeria_tech.py

@@ -112,7 +112,7 @@ from commands.tech.list_related_specification import (
     help="Egeria admin password",
 )
 @click.option(
-    "--userid", default="erinoverview", envvar="EGERIA_USER", help="Egeria user"
+    "--userid", default="peterprofile", envvar="EGERIA_USER", help="Egeria user"
 )
 @click.option(
     "--password",

commands/ops/gov_server_actions.py

@@ -125,13 +125,11 @@ def refresh_gov_eng_config(ctx):
 
 @click.command("start")
 @click.pass_context
-@click.option("--server", default=None, help="OMAG Server to start")
+@click.option("--server", default="simple-metadata-store", help="OMAG Server to start")
 def start_server(ctx, server):
     """Start or restart an engine-host from its known configuration"""
     c = ctx.obj
-    if server is None:
-        click.echo(c.parent.info_name)
-        server = "simple-metadata-store"
+
     p_client = EgeriaTech(c.view_server, c.view_server_url, c.userid, c.password)
     token = p_client.create_egeria_bearer_token()
     try:

commands/ops/load_archive.py

@@ -13,50 +13,61 @@ import argparse
 import time
 import click
 from trogon import tui
-from pyegeria import ServerOps, AutomatedCuration
+from pyegeria import AutomatedCuration, EgeriaTech
 from pyegeria._exceptions import (
     InvalidParameterException,
     PropertyServerException,
     UserNotAuthorizedException,
     print_exception_response,
 )
+
 EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
-EGERIA_KAFKA_ENDPOINT = os.environ.get('KAFKA_ENDPOINT', 'localhost:9092')
-EGERIA_PLATFORM_URL = os.environ.get('EGERIA_PLATFORM_URL', 'https://localhost:9443')
-EGERIA_VIEW_SERVER = os.environ.get('VIEW_SERVER', 'view-server')
-EGERIA_VIEW_SERVER_URL = os.environ.get('EGERIA_VIEW_SERVER_URL', 'https://localhost:9443')
-EGERIA_INTEGRATION_DAEMON = os.environ.get('INTEGRATION_DAEMON', 'integration-daemon')
-EGERIA_INTEGRATION_DAEMON_URL = os.environ.get('EGERIA_INTEGRATION_DAEMON_URL', 'https://localhost:9443')
-EGERIA_ADMIN_USER = os.environ.get('ADMIN_USER', 'garygeeke')
-EGERIA_ADMIN_PASSWORD = os.environ.get('ADMIN_PASSWORD', 'secret')
-EGERIA_USER = os.environ.get('EGERIA_USER', 'erinoverview')
-EGERIA_USER_PASSWORD = os.environ.get('EGERIA_USER_PASSWORD', 'secret')
-
-
-@click.command('load-archive')
-@click.option('--file', prompt= "Path on the Metadata Server of the archive file to load",
-              default='content-packs/CocoComboArchive.omarchive',
-              help='Full path on the Metadata Server to the archive file to load')
-@click.option('--server', default = EGERIA_METADATA_STORE, help='Egeria metadata store to load')
-@click.option('--url', default = EGERIA_PLATFORM_URL, help='URL of Egeria platform to connect to')
-@click.option('--userid', default = EGERIA_ADMIN_USER, help='Egeria admin user')
-@click.option('--password', default = EGERIA_ADMIN_PASSWORD, help='Egeria admin password')
-@click.option('--timeout', default = 60, help = 'Number of seconds to wait')
-def load_archive(file, server, url, userid, password, timeout):
-    """Load an Open Metadata Archive"""
+EGERIA_KAFKA_ENDPOINT = os.environ.get("KAFKA_ENDPOINT", "localhost:9092")
+EGERIA_PLATFORM_URL = os.environ.get("EGERIA_PLATFORM_URL", "https://localhost:9443")
+EGERIA_VIEW_SERVER = os.environ.get("VIEW_SERVER", "view-server")
+EGERIA_VIEW_SERVER_URL = os.environ.get(
+    "EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
+)
+EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration-daemon")
+EGERIA_INTEGRATION_DAEMON_URL = os.environ.get(
+    "EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"
+)
+EGERIA_ADMIN_USER = os.environ.get("ADMIN_USER", "garygeeke")
+EGERIA_ADMIN_PASSWORD = os.environ.get("ADMIN_PASSWORD", "secret")
+EGERIA_USER = os.environ.get("EGERIA_USER", "erinoverview")
+EGERIA_USER_PASSWORD = os.environ.get("EGERIA_USER_PASSWORD", "secret")
 
-    try:
 
-        s_client = ServerOps(server, url, userid, password)
+@click.command("load-archive")
+@click.option(
+    "--file",
+    prompt="Path on the Metadata Server of the archive file to load",
+    default="content-packs/CocoComboArchive.omarchive",
+    help="Full path on the Metadata Server to the archive file to load",
+)
+@click.option(
+    "--server", default=EGERIA_METADATA_STORE, help="Egeria metadata store to load"
+)
+@click.option(
+    "--url", default=EGERIA_PLATFORM_URL, help="URL of Egeria platform to connect to"
+)
+@click.option("--userid", default=EGERIA_ADMIN_USER, help="Egeria admin user")
+@click.option("--password", default=EGERIA_ADMIN_PASSWORD, help="Egeria admin password")
+@click.option("--timeout", default=60, help="Number of seconds to wait")
+def load_archive(file, server, view_server, url, userid, password, timeout):
+    """Load an Open Metadata Archive"""
 
-        s_client.add_archive_file(file, server, timeout = timeout)
+    try:
+        s_client = EgeriaTech(view_server, url, userid, password)
+        token = s_client.create_egeria_bearer_token()
+        server_guid = s_client.get_guid_for_name(server)
+        s_client.add_archive_file(file, server_guid, timeout=timeout)
 
         click.echo(f"Loaded archive: {file}")
 
-
     except (InvalidParameterException, PropertyServerException) as e:
         print_exception_response(e)
 
 
 if __name__ == "__main__":
-    load_archive()
+    load_archive()

commands/ops/monitor_gov_eng_status.py

@@ -9,7 +9,6 @@ Unit tests for the Utils helper functions using the Pytest framework.
 A simple status display for Governance Actions
 """
 import argparse
-import json
 import os
 import time
 
@@ -23,7 +22,7 @@ from pyegeria import (
     InvalidParameterException,
     PropertyServerException,
     UserNotAuthorizedException,
-    print_exception_response,
+    EgeriaTech,
 )
 from pyegeria.server_operations import ServerOps
 
@@ -53,7 +52,8 @@ disable_ssl_warnings = True
 
 
 def display_gov_eng_status(
-    server: str,
+    engine_host: str,
+    view_server: str,
     url: str,
     username: str,
     user_pass: str,
@@ -62,8 +62,9 @@ def display_gov_eng_status(
     width: int = EGERIA_WIDTH,
 ):
     console = Console(width=EGERIA_WIDTH)
-    server_name = server
-    s_client = ServerOps(server_name, url, username, user_pass)
+
+    s_client = EgeriaTech(view_server, url, username, user_pass)
+    token = s_client.create_egeria_bearer_token()
 
     def generate_table() -> Table:
         """Make a new table."""
@@ -76,7 +77,7 @@ def display_gov_eng_status(
             caption_style="white on black",
             show_lines=True,
             box=box.ROUNDED,
-            caption=f"Server: '{server_name}' running on {url}",
+            caption=f"Server: '{engine_host}' running on {url}",
             expand=True,
         )
         # table.footer: f"Server {view_server} on Platform {good_platform1_url}"
@@ -86,9 +87,11 @@ def display_gov_eng_status(
         table.add_column("Engine Status")
         table.add_column("Request Types")
 
-        gov_eng_status = s_client.get_governance_engine_summaries()
+        eng_host_guid = s_client.get_guid_for_name(engine_host)
+        gov_eng_status = s_client.get_server_report(eng_host_guid)
+        eng_summaries = gov_eng_status["governanceEngineSummaries"]
         sorted_gov_eng_status = sorted(
-            gov_eng_status, key=lambda k: k.get("governanceEngineName", " ")
+            eng_summaries, key=lambda k: k.get("governanceEngineName", " ")
         )
         for engine in sorted_gov_eng_status:
             gov_eng = engine["governanceEngineName"]
@@ -113,7 +116,7 @@ def display_gov_eng_status(
 
             table.add_row(gov_eng, eng_type, eng_desc, eng_status, eng_req_type_out)
 
-        table.caption = f"Server {server_name} running on {url}"
+        table.caption = f"Server {engine_host} running on {url}"
         return table
 
     try:
@@ -165,19 +168,27 @@ def main_live():
 
 def main_paging():
     parser = argparse.ArgumentParser()
-    parser.add_argument("--server", help="Name of the server to display status for")
-    parser.add_argument("--url", help="URL Platform to connect to")
+    parser.add_argument(
+        "--engine_host", help="Name of the engine host to display status for"
+    )
+    parser.add_argument("--view_server", help="Name of the view server to use")
+    parser.add_argument("--url", help="URL of Platform to connect to")
     parser.add_argument("--userid", help="User Id")
     parser.add_argument("--password", help="User Password")
     args = parser.parse_args()
 
-    server = args.server if args.server is not None else EGERIA_ENGINE_HOST
-    url = args.url if args.url is not None else EGERIA_ENGINE_HOST_URL
+    engine_host = (
+        args.engine_host if args.engine_host is not None else EGERIA_ENGINE_HOST
+    )
+    view_server = (
+        args.view_server if args.view_server is not None else EGERIA_VIEW_SERVER
+    )
+    url = args.url if args.url is not None else EGERIA_VIEW_SERVER_URL
     userid = args.userid if args.userid is not None else EGERIA_USER
     user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
 
     display_gov_eng_status(
-        server=server, url=url, username=userid, user_pass=user_pass, paging=True
+        engine_host, view_server, url, userid, user_pass, paging=True
     )
 
 

commands/ops/monitor_integ_daemon_status.py

@@ -17,7 +17,7 @@ from rich.console import Console
 from rich.live import Live
 from rich.table import Table
 
-from pyegeria import ServerOps, AutomatedCuration
+from pyegeria import EgeriaTech, AutomatedCuration
 from pyegeria._exceptions import (
     InvalidParameterException,
     PropertyServerException,
@@ -36,8 +36,6 @@ EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration-da
 EGERIA_INTEGRATION_DAEMON_URL = os.environ.get(
     "EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"
 )
-EGERIA_ADMIN_USER = os.environ.get("ADMIN_USER", "garygeeke")
-EGERIA_ADMIN_PASSWORD = os.environ.get("ADMIN_PASSWORD", "secret")
 EGERIA_USER = os.environ.get("EGERIA_USER", "erinoverview")
 EGERIA_USER_PASSWORD = os.environ.get("EGERIA_USER_PASSWORD", "secret")
 EGERIA_JUPYTER = bool(os.environ.get("EGERIA_JUPYTER", "False"))
@@ -58,9 +56,9 @@ def display_integration_daemon_status(
     width: int = EGERIA_WIDTH,
     sort: bool = True,
 ):
-    s_client = ServerOps(integ_server, integ_url, user)
-    a_client = AutomatedCuration(view_server, view_url, user, user_pass)
-    token = a_client.create_egeria_bearer_token()
+    s_client = EgeriaTech(view_server, view_url, user, user_pass)
+    token = s_client.create_egeria_bearer_token()
+    server_guid = s_client.get_guid_for_name(integ_server)
 
     def generate_table() -> Table:
         """Make a new table."""
@@ -84,7 +82,7 @@ def display_integration_daemon_status(
         table.add_column("Target Element", min_width=20)
         table.add_column("Exception Message", min_width=10)
 
-        daemon_status = s_client.get_integration_daemon_status()
+        daemon_status = s_client.get_server_report(server_guid)
 
         reports = daemon_status["integrationConnectorReports"]
         if sort is True:
@@ -102,7 +100,7 @@ def display_integration_daemon_status(
             refresh_interval = str(connector.get("minMinutesBetweenRefresh", "---"))
             exception_msg = " "
             if connector_guid != "---":
-                targets = a_client.get_catalog_targets(connector_guid)
+                targets = s_client.get_catalog_targets(connector_guid)
                 tgt_tab = Table()
                 tgt_tab.add_column("Target")
                 tgt_tab.add_column("UniqueName")
@@ -172,7 +170,6 @@ def display_integration_daemon_status(
 
     finally:
         s_client.close_session()
-        a_client.close_session()
 
 
 def main_live():

commands/ops/monitor_platform_status.py

@@ -114,7 +114,7 @@ def display_status(
                             server_status = "UNKNOWN"
                             status_flag = "[bright yellow]"
 
-                        server_list = (
+                        server_list += (
                             f"{status_flag}{server_types[server_type]}: {server_name}\n"
                         )
                         # server_list = server_list + serv

commands/ops/monitor_server_status.py

@@ -3,13 +3,19 @@
 SPDX-License-Identifier: Apache-2.0
 Copyright Contributors to the ODPi Egeria project.
 
-Unit tests for the Utils helper functions using the Pytest framework.
+Display the server status of all registered servers across all platforms.
+
+Note: This implementation is using the platform-report. A more complex platform environment may require
+reimplementing from a server only perspective using get_servers_by_dep_impl_type() to find the guids and
+then get_server_by_guid() to get the status. Less efficient but may be more robust for some environments.
+
 
 
 A simple server status display
 """
 import argparse
 import os
+import sys
 import time
 
 from rich.live import Live
@@ -20,27 +26,39 @@ from pyegeria import (
     PropertyServerException,
     UserNotAuthorizedException,
     print_exception_response,
-    ServerOps
+    RuntimeManager,
 )
 
 EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
-EGERIA_KAFKA_ENDPOINT = os.environ.get('KAFKA_ENDPOINT', 'localhost:9092')
-EGERIA_PLATFORM_URL = os.environ.get('EGERIA_PLATFORM_URL', 'https://localhost:9443')
-EGERIA_VIEW_SERVER = os.environ.get('VIEW_SERVER', 'view-server')
-EGERIA_VIEW_SERVER_URL = os.environ.get('EGERIA_VIEW_SERVER_URL', 'https://localhost:9443')
-EGERIA_INTEGRATION_DAEMON = os.environ.get('INTEGRATION_DAEMON', 'integration-daemon')
-EGERIA_INTEGRATION_DAEMON_URL = os.environ.get('EGERIA_INTEGRATION_DAEMON_URL', 'https://localhost:9443')
-EGERIA_ADMIN_USER = os.environ.get('ADMIN_USER', 'garygeeke')
-EGERIA_ADMIN_PASSWORD = os.environ.get('ADMIN_PASSWORD', 'secret')
-EGERIA_USER = os.environ.get('EGERIA_USER', 'erinoverview')
-EGERIA_USER_PASSWORD = os.environ.get('EGERIA_USER_PASSWORD', 'secret')
-EGERIA_JUPYTER = bool(os.environ.get('EGERIA_JUPYTER', 'False'))
-EGERIA_WIDTH = int(os.environ.get('EGERIA_WIDTH', '200'))
-
-
-def display_status(server: str, url: str, username: str, user_pass: str, jupyter: bool = EGERIA_JUPYTER,
-                   width: int = EGERIA_WIDTH):
-    p_client = ServerOps(server, url, username, user_pass)
+EGERIA_KAFKA_ENDPOINT = os.environ.get("KAFKA_ENDPOINT", "localhost:9092")
+EGERIA_PLATFORM_URL = os.environ.get("EGERIA_PLATFORM_URL", "https://localhost:9443")
+EGERIA_VIEW_SERVER = os.environ.get("VIEW_SERVER", "view-server")
+EGERIA_VIEW_SERVER_URL = os.environ.get(
+    "EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
+)
+EGERIA_INTEGRATION_DAEMON = os.environ.get("INTEGRATION_DAEMON", "integration-daemon")
+EGERIA_INTEGRATION_DAEMON_URL = os.environ.get(
+    "EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"
+)
+EGERIA_ADMIN_USER = os.environ.get("ADMIN_USER", "garygeeke")
+EGERIA_ADMIN_PASSWORD = os.environ.get("ADMIN_PASSWORD", "secret")
+EGERIA_USER = os.environ.get("EGERIA_USER", "erinoverview")
+EGERIA_USER_PASSWORD = os.environ.get("EGERIA_USER_PASSWORD", "secret")
+EGERIA_JUPYTER = bool(os.environ.get("EGERIA_JUPYTER", "False"))
+EGERIA_WIDTH = int(os.environ.get("EGERIA_WIDTH", "200"))
+
+
+def display_status(
+    extended: bool,
+    view_server: str,
+    url: str,
+    username: str,
+    user_pass: str,
+    jupyter: bool = EGERIA_JUPYTER,
+    width: int = EGERIA_WIDTH,
+):
+    p_client = RuntimeManager(view_server, url, username, user_pass)
+    token = p_client.create_egeria_bearer_token()
 
     def generate_table() -> Table:
         """Make a new table."""
@@ -51,27 +69,58 @@ def display_status(server: str, url: str, username: str, user_pass: str, jupyter
             header_style="white on dark_blue",
             title_style="bold white on black",
             caption_style="white on black",
-            caption=f"Server Status for Platform - '{url}'",
+            caption=f"Server Status from Platform - '{url}'",
             # show_lines=True,
         )
 
         table.add_column("Known Server")
         table.add_column("Status")
-
-        known_server_list = p_client.get_known_servers()
-        active_server_list = p_client.get_active_server_list()
-        if len(known_server_list) == 0:
-            return table
-
-        for server in known_server_list:
-            if server in active_server_list:
-                status = "Active"
-            else:
-                status = "Inactive"
-
-            table.add_row(server,
-                          "[red]Inactive" if status == "Inactive" else "[green]Active",
-                          )
+        if extended:
+            table.add_column("Description")
+            table.add_column("Server Type")
+            table.add_column("Last Started")
+
+        platform_list = p_client.get_platforms_by_type()
+        if type(platform_list) is str:
+            print("No OMAG Server Platforms found?")
+            sys.exit(1)
+
+        for platform in platform_list:
+            platform_name = platform["properties"].get("displayName", "---")
+            platform_guid = platform["elementHeader"]["guid"]
+            platform_desc = platform["properties"].get("resourceDescription", "---")
+            p_server_list = ""
+
+            platform_report = p_client.get_platform_report(platform_guid)
+            servers = platform_report.get("omagservers", None)
+            for p_server in servers:
+                server_name = p_server.get("serverName", "--- ")
+                server_type = p_server.get("serverType", "--- ")
+                server_desc = p_server.get("description", "--- ")
+                last_start_time = p_server.get("lastStartTime", "--- ")
+
+                server_status = p_server.get("serverActiveStatus", "UNKNOWN")
+                if server_status in ("RUNNING", "STARTING"):
+                    status = "Active"
+                elif server_status in ("INACTIVE", "STOPPING"):
+                    status = "Inactive"
+                else:
+                    status = "UNKNOWN"
+
+                if extended:
+                    table.add_row(
+                        server_name,
+                        "[red]Inactive" if status == "Inactive" else "[green]Active",
+                        server_desc,
+                        server_type,
+                        last_start_time,
+                    )
+                else:
+                    table.add_row(
+                        server_name,
+                        "[red]Inactive" "" if status == "Inactive" else "[green]Active",
+                        # server_status,
+                    )
         # p_client.close_session()
         return table
 
@@ -81,7 +130,11 @@ def display_status(server: str, url: str, username: str, user_pass: str, jupyter
                 time.sleep(2)
                 live.update(generate_table())
 
-    except (InvalidParameterException, PropertyServerException, UserNotAuthorizedException) as e:
+    except (
+        InvalidParameterException,
+        PropertyServerException,
+        UserNotAuthorizedException,
+    ) as e:
         print_exception_response(e)
     except KeyboardInterrupt:
         pass
@@ -91,18 +144,20 @@ def display_status(server: str, url: str, username: str, user_pass: str, jupyter
 
 def main():
     parser = argparse.ArgumentParser()
+    parser.add_argument("--extended", help="Extended Information?")
     parser.add_argument("--server", help="Name of the server to display status for")
     parser.add_argument("--url", help="URL Platform to connect to")
     parser.add_argument("--userid", help="User Id")
     parser.add_argument("--password", help="User Password")
     args = parser.parse_args()
 
-    server = args.server if args.server is not None else EGERIA_METADATA_STORE
+    extended = args.extended if args.extended is not None else False
+    server = args.server if args.server is not None else EGERIA_VIEW_SERVER
     url = args.url if args.url is not None else EGERIA_PLATFORM_URL
     userid = args.userid if args.userid is not None else EGERIA_ADMIN_USER
     user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
 
-    display_status(server, url, userid, user_pass)
+    display_status(extended, server, url, userid, user_pass)
 
 
 if __name__ == "__main__":

commands/ops/orig_monitor_server_status.py

@@ -0,0 +1,109 @@
+#!/usr/bin/env python3
+"""
+SPDX-License-Identifier: Apache-2.0
+Copyright Contributors to the ODPi Egeria project.
+
+Unit tests for the Utils helper functions using the Pytest framework.
+
+
+A simple server status display
+"""
+import argparse
+import os
+import time
+
+from rich.live import Live
+from rich.table import Table
+
+from pyegeria import (
+    InvalidParameterException,
+    PropertyServerException,
+    UserNotAuthorizedException,
+    print_exception_response,
+    ServerOps
+)
+
+EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
+EGERIA_KAFKA_ENDPOINT = os.environ.get('KAFKA_ENDPOINT', 'localhost:9092')
+EGERIA_PLATFORM_URL = os.environ.get('EGERIA_PLATFORM_URL', 'https://localhost:9443')
+EGERIA_VIEW_SERVER = os.environ.get('VIEW_SERVER', 'view-server')
+EGERIA_VIEW_SERVER_URL = os.environ.get('EGERIA_VIEW_SERVER_URL', 'https://localhost:9443')
+EGERIA_INTEGRATION_DAEMON = os.environ.get('INTEGRATION_DAEMON', 'integration-daemon')
+EGERIA_INTEGRATION_DAEMON_URL = os.environ.get('EGERIA_INTEGRATION_DAEMON_URL', 'https://localhost:9443')
+EGERIA_ADMIN_USER = os.environ.get('ADMIN_USER', 'garygeeke')
+EGERIA_ADMIN_PASSWORD = os.environ.get('ADMIN_PASSWORD', 'secret')
+EGERIA_USER = os.environ.get('EGERIA_USER', 'erinoverview')
+EGERIA_USER_PASSWORD = os.environ.get('EGERIA_USER_PASSWORD', 'secret')
+EGERIA_JUPYTER = bool(os.environ.get('EGERIA_JUPYTER', 'False'))
+EGERIA_WIDTH = int(os.environ.get('EGERIA_WIDTH', '200'))
+
+
+def display_status(server: str, url: str, username: str, user_pass: str, jupyter: bool = EGERIA_JUPYTER,
+                   width: int = EGERIA_WIDTH):
+    p_client = ServerOps(server, url, username, user_pass)
+
+    def generate_table() -> Table:
+        """Make a new table."""
+        table = Table(
+            title=f"Server Status for Platform - {time.asctime()}",
+            style="bold white on black",
+            row_styles=["bold white on black"],
+            header_style="white on dark_blue",
+            title_style="bold white on black",
+            caption_style="white on black",
+            caption=f"Server Status for Platform - '{url}'",
+            # show_lines=True,
+        )
+
+        table.add_column("Known Server")
+        table.add_column("Status")
+
+        known_server_list = p_client.get_known_servers()
+        active_server_list = p_client.get_active_server_list()
+        if len(known_server_list) == 0:
+            return table
+
+        for server in known_server_list:
+            if server in active_server_list:
+                status = "Active"
+            else:
+                status = "Inactive"
+
+            table.add_row(server,
+                          "[red]Inactive" if status == "Inactive" else "[green]Active",
+                          )
+        # p_client.close_session()
+        return table
+
+    try:
+        with Live(generate_table(), refresh_per_second=4, screen=True) as live:
+            while True:
+                time.sleep(2)
+                live.update(generate_table())
+
+    except (InvalidParameterException, PropertyServerException, UserNotAuthorizedException) as e:
+        print_exception_response(e)
+    except KeyboardInterrupt:
+        pass
+    finally:
+        p_client.close_session()
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--server", help="Name of the server to display status for")
+    parser.add_argument("--url", help="URL Platform to connect to")
+    parser.add_argument("--userid", help="User Id")
+    parser.add_argument("--password", help="User Password")
+    args = parser.parse_args()
+
+    server = args.server if args.server is not None else EGERIA_METADATA_STORE
+    url = args.url if args.url is not None else EGERIA_PLATFORM_URL
+    userid = args.userid if args.userid is not None else EGERIA_ADMIN_USER
+    user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
+
+    display_status(server, url, userid, user_pass)
+
+
+if __name__ == "__main__":
+    main()

pyegeria/__init__.py

@@ -34,7 +34,6 @@ from ._exceptions import (
     print_exception_response,
 )
 
-# from .utils import print_response, body_slimmer, wrap_text
 from .utils import print_response, body_slimmer
 from ._client import Client
 from .automated_curation_omvs import AutomatedCuration

pyegeria/runtime_manager_omvs.py

@@ -1763,7 +1763,7 @@ class RuntimeManager(Client):
 
         response = await self._async_make_request("POST", url, body)
 
-        return response.json().get("elements", "No platforms found")
+        return response.json().get("elements", "No servers found")
 
     def get_servers_by_dep_impl_type(
         self,
@@ -1926,7 +1926,7 @@ class RuntimeManager(Client):
 
         response = await self._async_make_request("GET", url)
 
-        return response.json().get("elements", "No server found")
+        return response.json().get("element", "No server found")
 
     def get_server_report(self, server_guid: str = None) -> str | list:
         """Returns details about the running server.

{pyegeria-0.8.4.25.dist-info → pyegeria-0.8.4.27.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyegeria
-Version: 0.8.4.25
+Version: 0.8.4.27
 Summary: A python client for Egeria
 Home-page: https://github.com/odpi/egeria-python
 License: Apache 2.0

{pyegeria-0.8.4.25.dist-info → pyegeria-0.8.4.27.dist-info}/RECORD

@@ -15,12 +15,12 @@ commands/cat/list_relationships.py,sha256=U9f78cOi4HyaacqNaFSMq_7rRxVcEczvwPv468
 commands/cat/list_tech_types.py,sha256=20T4v6L5qeebSsaL1nGkFMDAIsy2W3A3SMm1RcgFoh0,4609
 commands/cat/list_todos.py,sha256=iPxHRyW3X5tiREio4TUOwRPvNPjU0gxm3pVnUI79ir4,6542
 commands/cat/list_user_ids.py,sha256=7JinL7rknPbGusIb8ikXKEaV1vvbuvx_WWtbmlfS_DY,5093
-commands/cli/__init__.py,sha256=6d_R0KZBNnJy9EBz9J2xvGFlx-3j_ZPqPCxKgdvYeDQ,291
-commands/cli/egeria.py,sha256=PrWt07cTZSNqyBrJifMnvCWH0vor4zcydsIznQJqPQM,28302
+commands/cli/__init__.py,sha256=hpTVSMP2gnPRhcAZPdeUEsQ-eaDySlXlk239dNWYmng,292
+commands/cli/egeria.py,sha256=IdGSpIzlLDdektZIjQRIRPgF5F3GKutF6tY9cVBGjEY,28506
 commands/cli/egeria_cat.py,sha256=LWspOYRcdJIIx2n9wvhBhkNnACGDIpFTWfsoVTGeiV0,12957
 commands/cli/egeria_my.py,sha256=9zIpUDLeA_R-0rgCSQfEZTtVmkxPcEAsYcCTn1wQFrE,6181
-commands/cli/egeria_ops.py,sha256=0kIBvxnS4slJzKfxg6KrJ1-UJ4IYHQfN1OPKIQ3ArG8,11230
-commands/cli/egeria_tech.py,sha256=PfEIf8pLgbCiPlUikZss97R78XOue0P3aZG5PswUtQ4,11161
+commands/cli/egeria_ops.py,sha256=XJ5WUj8PIH_DiJkL878Vsq82bSNZBmgElUfuuu5QV_4,11130
+commands/cli/egeria_tech.py,sha256=AbRx_wDP4935zAECOgCY0rL8v8AySWxNvkG9Z_mm-SY,11161
 commands/cli/ops_config.py,sha256=m4AfPjf-fR4EBTx8Dc2mcgrfWwAxb30YGeV-v79bg4U,1450
 commands/my/README.md,sha256=ZheFhj_VoPMhcWjW3pGchHB0vH_A9PklSmrSkzKdrcQ,844
 commands/my/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -33,18 +33,18 @@ commands/my/todo_actions.py,sha256=uihltirrAPtwYNygnNBAVWgfS0W7acoETz1_h3XW_4o,8
 commands/ops/README.md,sha256=PJsSDcvMv6E6og6y-cwvxFX5lhCII0UCwgKiM1T17MQ,1595
 commands/ops/__init__.py,sha256=SCfzF3-aMx8EpqLWmH7JQf13gTmMAtHRbg69oseLvi8,480
 commands/ops/engine_actions.py,sha256=00s_wkzs0zlZ6PyZ0J5J9lHhw4Viyzbeox7b1K1lmyc,4609
-commands/ops/gov_server_actions.py,sha256=tRcAW_TExuRm__gSBcx4SMqVC8LplTutvwNzIGJ_xGU,5714
+commands/ops/gov_server_actions.py,sha256=xF0QWSP7JtxpcA-L8DfbVjtgHgqBocgBN5qIE5Rmm9A,5631
 commands/ops/list_catalog_targets.py,sha256=0FIZqZu7DSh7tnrme6EOhNiVvK8wyvN1iTZKEDuwTmw,6620
-commands/ops/load_archive.py,sha256=duf3wq2ANRBiOj9KTFsw8TseEkJLKdzITAeTCjsMvI0,2453
+commands/ops/load_archive.py,sha256=tpkYQerkXd3ZvazJfD5ADAk-3EGeMEvcgn9EPjdMGn0,2588
 commands/ops/monitor_asset_events.py,sha256=cjdlVqE0XYnoRW3aorNbsVkjByDXefPBnllaZLelGls,3838
-commands/ops/monitor_coco_status.py,sha256=ERz3OJ0TXImNKHGD4gJvgT3pl2gS23ewAdUuYVLUhEE,3299
 commands/ops/monitor_engine_activity.py,sha256=m18OSnRoo5ut0WKKOWNoFGXJW_npjp6hzHK3RUQG8T0,8479
 commands/ops/monitor_engine_activity_c.py,sha256=rSEUD3elhsiYdUhQRn613OM_R4VecFb0uq39MhYhltQ,9371
-commands/ops/monitor_gov_eng_status.py,sha256=_eIN_3J8PZjgZH4D1Pc0Z_kUOd0pVd6dGP7jUgXG5wg,6640
-commands/ops/monitor_integ_daemon_status.py,sha256=u15-tvGveO7_yV7JJmYkxiEDnq5KBk8J4hkw0id_LFA,9224
-commands/ops/monitor_platform_status.py,sha256=hn96QuOjCndSDWl1-DAzk9O8D68YoRP1ALOlVfWVQgo,6400
-commands/ops/monitor_server_list.py,sha256=Uhtn8lv7QVXJBi9DSR3Nelmz8TB0vOsat10nFS6Nu20,4637
-commands/ops/monitor_server_status.py,sha256=A-8hMDfbscdcq-b1OD4wKn0tphumX8WIK-Hz8uPoFkc,3974
+commands/ops/monitor_gov_eng_status.py,sha256=0Hc7Nbfvl-Qulrhm65GTcYSQ10xkIBtr1ZtjCMYKsEk,7031
+commands/ops/monitor_integ_daemon_status.py,sha256=5JR8u-GUeinf6lQGYkn_BN_InF7N2mGFOf5yTrjU3eo,9058
+commands/ops/monitor_platform_status.py,sha256=xmngiuQK9X6X4-stGSITzfMSAdqpswVk-DY7kh8M0P0,6401
+commands/ops/monitor_server_status.py,sha256=eeZY4o_HwrH-csrhHPi95LLGu00j6AYl48A7fDYTG34,6061
+commands/ops/orig_monitor_server_list.py,sha256=Uhtn8lv7QVXJBi9DSR3Nelmz8TB0vOsat10nFS6Nu20,4637
+commands/ops/orig_monitor_server_status.py,sha256=A-8hMDfbscdcq-b1OD4wKn0tphumX8WIK-Hz8uPoFkc,3974
 commands/ops/refresh_integration_daemon.py,sha256=9dZX-AHJ7yILohj005TRIC9tC349RRwwxRmqVLD2ZTE,2991
 commands/ops/restart_integration_daemon.py,sha256=PN48zVDywjNJznmpVWEcBXBD3xhWDw1dMyKLIs9nWzU,2992
 commands/tech/README.md,sha256=nxDnfr3BCiGgW5G1VxWxiwUWJXIe5wreNuUeRyIt_hY,1343
@@ -61,7 +61,7 @@ commands/tech/list_relationship_types.py,sha256=BlVzrPznZXqMVLN2-2vYEVRGeYsiJrqX
 commands/tech/list_tech_templates.py,sha256=RiyA8a4fIL9BGeGf37Bkk471mK5ECkDJMN9QVNReC1M,6192
 commands/tech/list_valid_metadata_values.py,sha256=N3D0_BmREPszgde3uvvYdfzq7DJ46uMOv2t1vtncGsw,6333
 commands/tech/x_list_related_elements.py,sha256=qBsf1619cecaMCTzG0MG22fAT32WNH2Z3CXrjo9z-5Y,5853
-pyegeria/__init__.py,sha256=yXY7BCgGJYoUCpqDYOjuyNf1RRA9xN_ua7ayEORmixE,9458
+pyegeria/__init__.py,sha256=2cq6Nqpq50ZPaFGUA_7tmF-vxlmtpojiBMQCN9I5-9g,9397
 pyegeria/_client.py,sha256=pzndEJKN0tcnT7gQFa0r3pzXm9pK4zJKANZOXO79aOs,25949
 pyegeria/_deprecated_gov_engine.py,sha256=dWNcwVsE5__dF2u4QiIyQrssozzzOjBbLld8MdpmVCQ,17264
 pyegeria/_exceptions.py,sha256=NJ7vAhmvusK1ENvY2MMrBB6A6TgpYjzS9QJxFH56b8c,18470
@@ -87,13 +87,13 @@ pyegeria/my_profile_omvs.py,sha256=eDnDK8LQIg7yrmiG8x20xMw-Yu6xuL0yXRm0vSc4T8k,4
 pyegeria/platform_services.py,sha256=hlbbG1iGuMj7JhLkz60V9xaG4m0pheYvs0bhbjF64rE,41624
 pyegeria/project_manager_omvs.py,sha256=OCdJKECI0sTZWgXcQ5TcupK5JPxHJG78-kHXyflDu1k,74521
 pyegeria/registered_info.py,sha256=3PbmqKusFX5m9KYVwbT69PIN1oSL4PhZDbbU_an7dvE,6356
-pyegeria/runtime_manager_omvs.py,sha256=zGrm7XAwRsRYNgG1a7huM1jVroGGuhAeF2qi_K1YOU4,61922
+pyegeria/runtime_manager_omvs.py,sha256=WmTmQQA8zMbW5KNGikqbSH0blbiTF4ejoCeQaBMWkxI,61919
 pyegeria/server_operations.py,sha256=ciH890hYT85YQ6OpByn4w7s3a7TtvWZpIG5rkRqbcI0,16766
 pyegeria/utils.py,sha256=1h6bwveadd6GpbnGLTmqPBmBk68QvxdjGTI9RfbrgKY,5415
 pyegeria/valid_metadata_omvs.py,sha256=6Hc4g9BOS8w1ILfTG3_A1tfIX3HLtpgZZvcC-z9GePU,36185
 pyegeria/x_action_author_omvs.py,sha256=za472slZ5tN9Pkd-ukyHS5Sn6MlKkJyIlbLlU3bL_Go,6451
-pyegeria-0.8.4.25.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pyegeria-0.8.4.25.dist-info/METADATA,sha256=oLkdOsN67ebuQ2T-2BiUQdub6hNNlNJlZId8YT94K2E,2820
-pyegeria-0.8.4.25.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pyegeria-0.8.4.25.dist-info/entry_points.txt,sha256=CkFcA_eJ_pXLSlpZ7AAPDiNVHyFuW0tDHc_y9LTlLx8,3344
-pyegeria-0.8.4.25.dist-info/RECORD,,
+pyegeria-0.8.4.27.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pyegeria-0.8.4.27.dist-info/METADATA,sha256=T4Zz2fGbTfb-77dNelgy639d-HzrA-0tBArt5HEcJqM,2820
+pyegeria-0.8.4.27.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pyegeria-0.8.4.27.dist-info/entry_points.txt,sha256=R8sNzclWZN542SufuVlx9HDia23PlSVnJioUkzCWg4I,3349
+pyegeria-0.8.4.27.dist-info/RECORD,,

{pyegeria-0.8.4.25.dist-info → pyegeria-0.8.4.27.dist-info}/entry_points.txt

@@ -50,7 +50,7 @@ monitor_integ_daemon_status=commands.ops.monitor_integ_daemon_status:main_live
 monitor_my_todos=commands.my.monitor_my_todos:main
 monitor_open_todos=commands.my.monitor_open_todos:main
 monitor_platform_status=commands.ops.monitor_platform_status:main
-monitor_server_list=commands.ops.monitor_server_list:main
+monitor_server_list=commands.ops.orig_monitor_server_list:main
 monitor_server_status=commands.ops.monitor_server_status:main
 reassign_todo=commands.my.todo_actions:reassign_todo
 refresh_integration_daemon=commands.ops.refresh_integration_daemon:main

commands/ops/monitor_coco_status.py

@@ -1,103 +0,0 @@
-#!/usr/bin/python3
-"""
-SPDX-License-Identifier: Apache-2.0
-Copyright Contributors to the ODPi Egeria project.
-
-Unit tests for the Utils helper functions using the Pytest framework.
-
-
-A simple server status display for the Coco Pharmaceuticals Configuration
-"""
-
-import argparse
-import time
-
-from rich import box
-from rich import print
-from rich.layout import Layout
-from rich.live import Live
-from rich.panel import Panel
-from rich.table import Table
-
-from pyegeria._exceptions import (
-    InvalidParameterException,
-    PropertyServerException,
-    UserNotAuthorizedException,
-    print_exception_response,
-)
-from pyegeria.server_operations import ServerOps
-
-disable_ssl_warnings = True
-
-
-def display_status(server: str, url: str, username: str):
-    layout = Layout()
-
-    p_client1 = ServerOps("Core Catalog", "https://localhost:9443", username)
-    p_client2 = ServerOps('Datalake Catalog', "https://localhost:9444", username)
-    p_client3 = ServerOps('DevCatalog', "https://localhost:9445", username)
-
-    def generate_table(p_client) -> Table:
-        """Make a new table."""
-        table = Table(
-            title=f"Server Status for {p_client.server_name}- {time.asctime()}",
-            # style = "black on grey66",
-            header_style="white on dark_blue",
-            caption=f"Server Status for Platform - '{p_client.platform_url}'",
-            # show_lines=True,
-        )
-
-        table.add_column("Known Server")
-        table.add_column("Status")
-        known_server_list = p_client.get_known_servers()
-        active_server_list = p_client.get_active_server_list()
-        if type(known_server_list) is str:
-            return table
-
-        for server in known_server_list:
-            if server in active_server_list:
-                status = "Active"
-            else:
-                status = "Inactive"
-
-            table.add_row(server,
-                          "[red]Inactive" if status == "Inactive" else "[green]Active",
-                          )
-        return table
-
-    try:
-        layout.split_row(
-            Layout(Panel(generate_table(p_client1), box.ROUNDED)),
-            Layout(Panel(generate_table(p_client2), box.ROUNDED)),
-            Layout(Panel(generate_table(p_client3), box.ROUNDED))
-        )
-        with Live(layout, refresh_per_second=4, screen=True) as live:
-            while True:
-                time.sleep(2)
-                live.update(layout)
-
-    except (InvalidParameterException, PropertyServerException, UserNotAuthorizedException) as e:
-        print_exception_response(e)
-    except KeyboardInterrupt:
-        pass
-
-    finally:
-        p_client1.close_session()
-        p_client2.close_session()
-        p_client3.close_session()
-
-def main():
-    parser = argparse.ArgumentParser()
-    parser.add_argument("--server", help="Name of the server to display status for")
-    parser.add_argument("--url", help="URL Platform to connect to")
-    parser.add_argument("--userid", help="User Id")
-    args = parser.parse_args()
-
-    server = args.server if args.server is not None else "active-metadata-store"
-    url = args.url if args.url is not None else "https://localhost:9443"
-    userid = args.userid if args.userid is not None else 'garygeeke'
-
-    display_status(server, url, userid)
-
-if __name__ == "__main__":
-    main()