pyegeria 0.8.4.19__tar.gz → 0.8.4.21__tar.gz

{pyegeria-0.8.4.19 → pyegeria-0.8.4.21}/PKG-INFO

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

{pyegeria-0.8.4.19 → pyegeria-0.8.4.21}/commands/cli/egeria_ops.py

@@ -126,7 +126,7 @@ from commands.ops.restart_integration_daemon import restart_connector
 @click.option(
     "--password",
     default="secret",
-    envvar="EGERIA_PASSWORD",
+    envvar="EGERIA_USER_PASSWORD",
     help="Egeria user password",
 )
 @click.option("--timeout", default=60, help="Number of seconds to wait")
@@ -377,8 +377,14 @@ def tell(ctx):
     pass
 
 
-tell.add_command(start_server)
-tell.add_command(stop_server)
+@tell.group("servers")
+@click.pass_context
+def servers(ctx):
+    """Perform actions on OMAG Servers"""
+
+
+servers.add_command(start_server)
+servers.add_command(stop_server)
 
 
 @tell.group("integration-daemon")

pyegeria-0.8.4.21/commands/ops/engine_actions.py

@@ -0,0 +1,136 @@
+"""
+SPDX-License-Identifier: Apache-2.0
+Copyright Contributors to the ODPi Egeria project.
+
+
+
+Execute engine actions.
+
+"""
+import os
+
+import click
+
+from commands.ops.monitor_engine_activity import EGERIA_ENGINE_HOST
+
+# from ops_config import Config, pass_config
+from pyegeria import EgeriaTech
+from pyegeria._exceptions import (
+    InvalidParameterException,
+    PropertyServerException,
+    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_USER = os.environ.get("EGERIA_USER", "garygeeke")
+# EGERIA_USER_PASSWORD = os.environ.get("EGERIA_USER_PASSWORD", "secret")
+
+
+@click.command("stop")
+@click.option("--server", help="OMAG Server to stop")
+# @click.option(
+#     "--view-server", default=EGERIA_VIEW_SERVER, help="View Server to communicate with"
+# )
+# @click.option(
+#     "--url", default=EGERIA_VIEW_SERVER_URL, help="URL of Egeria platform to connect to"
+# )
+# @click.option("--userid", default="garygeeke", envvar="EGERIA_USER", help="Egeria user")
+# @click.option(
+#     "--password",
+#     default="secret",
+#     envvar="EGERIA_PASSWORD",
+#     help="Egeria user password",
+# )
+@click.pass_context
+def stop_server(ctx, server):
+    """Stop an engine-host daemon"""
+    c = ctx.obj
+    p_client = EgeriaTech(c.view_server, c.view_server_url, c.userid, c.password)
+    token = p_client.create_egeria_bearer_token()
+    try:
+        server_guid = p_client.get_guid_for_name(server)
+
+        p_client.shutdown_server(server_guid)
+        click.echo(f"Stopped server {server}")
+    except (InvalidParameterException, PropertyServerException) as e:
+        print_exception_response(e)
+    finally:
+        p_client.close_session()
+
+
+@click.command("start")
+@click.option("--server", help="OMAG Server to start")
+# @click.option(
+#     "--view-server", default=EGERIA_VIEW_SERVER, help="View Server to communicate with"
+# )
+# @click.option(
+#     "--url", default=EGERIA_VIEW_SERVER_URL, help="URL of Egeria platform to connect to"
+# )
+# @click.option("--userid", default="garygeeke", envvar="EGERIA_USER", help="Egeria user")
+# @click.option(
+#     "--password",
+#     default="secret",
+#     envvar="EGERIA_USER_PASSWORD",
+#     help="Egeria user password",
+# )
+def start_server(ctx, server):
+    """Start or restart an engine-host from its known configuration"""
+    c = ctx.obj
+    p_client = EgeriaTech(c.view_server, c.view_server_url, c.userid, c.password)
+    token = p_client.create_egeria_bearer_token()
+    try:
+        server_guid = p_client.get_element_guid_by_unique_name(server, "name")
+        p_client.activate_server_with_stored_config(server_guid)
+
+        click.echo(f"Started server {server}")
+
+    except (InvalidParameterException, PropertyServerException) as e:
+        print_exception_response(e)
+    finally:
+        p_client.close_session()
+
+
+@click.command("refresh-gov-eng-config")
+@click.pass_context
+# @click.option(
+#     "--engine-host", default=EGERIA_ENGINE_HOST, help="Engine Host to refresh"
+# )
+# @click.option(
+#     "--view-server", default=EGERIA_VIEW_SERVER, help="View Server to communicate with"
+# )
+# @click.option(
+#     "--url", default=EGERIA_VIEW_SERVER_URL, help="URL of Egeria platform to connect to"
+# )
+# @click.option("--userid", default="garygeeke", envvar="EGERIA_USER", help="Egeria user")
+# @click.option(
+#     "--password",
+#     default="secret",
+#     envvar="EGERIA_PASSWORD",
+#     help="Egeria user password",
+# )
+def refresh_gov_eng_config(ctx):
+    """Start or restart an engine-host from its known configuration"""
+    c = ctx.obj
+    p_client = EgeriaTech(c.view_server, c.view_server_url, c.userid, c.password)
+    token = p_client.create_egeria_bearer_token()
+    try:
+        engine_host_guid = p_client.get_guid_for_name(c.engine_host)
+        p_client.refresh_gov_eng_config(engine_host_guid)
+
+        click.echo(f"Refreshed server {c.engine_host}")
+
+    except (InvalidParameterException, PropertyServerException) as e:
+        print_exception_response(e)
+    finally:
+        p_client.close_session()

{pyegeria-0.8.4.19 → pyegeria-0.8.4.21}/pyegeria/runtime_manager_omvs.py

@@ -1037,7 +1037,7 @@ class RuntimeManager(Client):
 
         """
 
-        url = f"{self.cur_command_root}/omag-server/{server_guid}"
+        url = f"{self.cur_command_root}/omag-servers/{server_guid}"
 
         await self._async_make_request("DELETE", url)
 
@@ -1145,7 +1145,7 @@ class RuntimeManager(Client):
 
         """
 
-        url = f"{self.cur_command_root}/omag-server/{server_guid}/instance"
+        url = f"{self.cur_command_root}/omag-servers/{server_guid}/instance"
 
         await self._async_make_request("DELETE", url)
 
@@ -1952,56 +1952,6 @@ class RuntimeManager(Client):
         response = loop.run_until_complete(self._async_get_server_report(server_guid))
         return response
 
-    #
-    #   Activate
-    #
-
-    async def _async_activate_with_stored_config(self, server_guid: str) -> None:
-        """Activate the Open Metadata and Governance (OMAG) server using the configuration document stored for this
-            server. Async Version
-
-        Parameters
-        ----------
-        server_guid: str
-            Identity of the server to activate.
-
-        Returns
-        -------
-        None
-
-
-        Raises
-        ------
-        InvalidParameterException
-        PropertyServerException
-        UserNotAuthorizedException
-
-        """
-        pass
-
-    def activate_with_stored_config(self, server_guid: str) -> None:
-        """Activate the Open Metadata and Governance (OMAG) server using the configuration document stored for this
-            server.
-
-        Parameters
-        ----------
-        server_guid: str
-            Identity of the server to activate.
-
-        Returns
-        -------
-        None
-
-
-        Raises
-        ------
-        InvalidParameterException
-        PropertyServerException
-        UserNotAuthorizedException
-
-        """
-        pass
-
 
 if __name__ == "__main__":
     print("Main-Runtime Manager")

{pyegeria-0.8.4.19 → pyegeria-0.8.4.21}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyegeria"
-version = "0.8.4.19"
+version = "0.8.4.21"
 license = 'Apache 2.0'
 authors = ["Dan Wolfson <dan.wolfson@pdr-associates.com>"]
 readme = "README.md"

pyegeria-0.8.4.19/commands/ops/engine_actions.py

@@ -1,131 +0,0 @@
-"""
-SPDX-License-Identifier: Apache-2.0
-Copyright Contributors to the ODPi Egeria project.
-
-
-
-Execute engine actions.
-
-"""
-import os
-
-import click
-
-from commands.ops.monitor_engine_activity import EGERIA_ENGINE_HOST
-
-# from ops_config import Config, pass_config
-from pyegeria import EgeriaTech
-from pyegeria._exceptions import (
-    InvalidParameterException,
-    PropertyServerException,
-    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_USER = os.environ.get("EGERIA_USER", "garygeeke")
-EGERIA_USER_PASSWORD = os.environ.get("EGERIA_USER_PASSWORD", "secret")
-
-
-@click.command("stop")
-@click.option("--server", help="OMAG Server to stop")
-@click.option(
-    "--view-server", default=EGERIA_VIEW_SERVER, help="View Server to communicate with"
-)
-@click.option(
-    "--url", default=EGERIA_VIEW_SERVER_URL, help="URL of Egeria platform to connect to"
-)
-@click.option("--userid", default="garygeeke", envvar="EGERIA_USER", help="Egeria user")
-@click.option(
-    "--password",
-    default="secret",
-    envvar="EGERIA_PASSWORD",
-    help="Egeria user password",
-)
-def stop_server(view_server, server, url, userid, password):
-    """Stop an engine-host daemon"""
-    p_client = EgeriaTech(view_server, url, userid, password)
-    token = p_client.create_egeria_bearer_token()
-    try:
-        server_guid = p_client.get_guid_for_name(server)
-
-        p_client.shutdown_server(server_guid)
-        click.echo(f"Stopped server {server}")
-    except (InvalidParameterException, PropertyServerException) as e:
-        print_exception_response(e)
-    finally:
-        p_client.close_session()
-
-
-@click.command("start")
-@click.option("--server", help="OMAG Server to start")
-@click.option(
-    "--view-server", default=EGERIA_VIEW_SERVER, help="View Server to communicate with"
-)
-@click.option(
-    "--url", default=EGERIA_VIEW_SERVER_URL, help="URL of Egeria platform to connect to"
-)
-@click.option("--userid", default="garygeeke", envvar="EGERIA_USER", help="Egeria user")
-@click.option(
-    "--password",
-    default="secret",
-    envvar="EGERIA_PASSWORD",
-    help="Egeria user password",
-)
-def start_server(view_server, server, url, userid, password):
-    """Start or restart an engine-host from its known configuration"""
-    p_client = EgeriaTech(view_server, url, userid, password)
-    token = p_client.create_egeria_bearer_token()
-    try:
-        server_guid = p_client.get_guid_for_name(server)
-        p_client.activate_server_with_stored_config(server_guid)
-
-        click.echo(f"Started server {server}")
-
-    except (InvalidParameterException, PropertyServerException) as e:
-        print_exception_response(e)
-    finally:
-        p_client.close_session()
-
-
-@click.command("refresh-gov-eng-config")
-@click.option(
-    "--engine-host", default=EGERIA_ENGINE_HOST, help="Engine Host to refresh"
-)
-@click.option(
-    "--view-server", default=EGERIA_VIEW_SERVER, help="View Server to communicate with"
-)
-@click.option(
-    "--url", default=EGERIA_VIEW_SERVER_URL, help="URL of Egeria platform to connect to"
-)
-@click.option("--userid", default="garygeeke", envvar="EGERIA_USER", help="Egeria user")
-@click.option(
-    "--password",
-    default="secret",
-    envvar="EGERIA_PASSWORD",
-    help="Egeria user password",
-)
-def refresh_gov_eng_config(engine_host, view_server, url, userid, password):
-    """Start or restart an engine-host from its known configuration"""
-    p_client = EgeriaTech(view_server, url, userid, password)
-    token = p_client.create_egeria_bearer_token()
-    try:
-        engine_host_guid = p_client.get_guid_for_name(engine_host)
-        p_client.refresh_gov_eng_config(engine_host_guid)
-
-        click.echo(f"Refreshed server {engine_host}")
-
-    except (InvalidParameterException, PropertyServerException) as e:
-        print_exception_response(e)
-    finally:
-        p_client.close_session()