X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fscripts%2Fosm.py;fp=osmclient%2Fscripts%2Fosm.py;h=12f0576ca771e6125088be5ef461ae6569bb31bf;hb=961145b6c1ab65c8cc5953aae008781e285c1461;hp=4af0dad5f3bd3624823e73b67ca89f97cd6d3914;hpb=8fdbc7b94c475febecf9896d9ea1e715f82c3daa;p=osm%2Fosmclient.git

diff --git a/osmclient/scripts/osm.py b/osmclient/scripts/osm.py
index 4af0dad..12f0576 100755
--- a/osmclient/scripts/osm.py
+++ b/osmclient/scripts/osm.py
@@ -31,6 +31,7 @@ import textwrap
 import pkg_resources
 import logging
 from datetime import datetime
+from typing import Any, Dict
 
 
 def wrap_text(text, width):
@@ -3070,6 +3071,7 @@ def pdu_delete(ctx, name, force):
     help="do not return the control immediately, but keep it "
     "until the operation is completed, or timeout",
 )
+@click.option("--vca", default=None, help="VCA to be used in this VIM account")
 @click.pass_context
 def vim_create(
     ctx,
@@ -3084,6 +3086,7 @@ def vim_create(
     sdn_controller,
     sdn_port_mapping,
     wait,
+    vca,
 ):
     """creates a new VIM account"""
     logger.debug("")
@@ -3100,6 +3103,8 @@ def vim_create(
     vim["vim-type"] = account_type
     vim["description"] = description
     vim["config"] = config
+    if vca:
+        vim["vca"] = vca
     if sdn_controller or sdn_port_mapping:
         ctx.obj.vim.create(name, vim, sdn_controller, sdn_port_mapping, wait=wait)
     else:
@@ -3995,6 +4000,273 @@ def k8scluster_show(ctx, name, literal):
     #     exit(1)
 
 
+###########################
+# VCA operations
+###########################
+
+
+@cli_osm.command(name="vca-add", short_help="adds a VCA (Juju controller) to OSM")
+@click.argument("name")
+@click.option(
+    "--endpoints",
+    prompt=True,
+    help="Comma-separated list of IP or hostnames of the Juju controller",
+)
+@click.option("--user", prompt=True, help="Username with admin priviledges")
+@click.option("--secret", prompt=True, help="Password of the specified username")
+@click.option("--cacert", prompt=True, help="CA certificate")
+@click.option(
+    "--lxd-cloud",
+    prompt=True,
+    help="Name of the cloud that will be used for LXD containers (LXD proxy charms)",
+)
+@click.option(
+    "--lxd-credentials",
+    prompt=True,
+    help="Name of the cloud credentialsto be used for the LXD cloud",
+)
+@click.option(
+    "--k8s-cloud",
+    prompt=True,
+    help="Name of the cloud that will be used for K8s containers (K8s proxy charms)",
+)
+@click.option(
+    "--k8s-credentials",
+    prompt=True,
+    help="Name of the cloud credentialsto be used for the K8s cloud",
+)
+@click.option(
+    "--model-config",
+    default={},
+    help="Configuration options for the models",
+)
+@click.option("--description", default=None, help="human readable description")
+@click.pass_context
+def vca_add(
+    ctx,
+    name,
+    endpoints,
+    user,
+    secret,
+    cacert,
+    lxd_cloud,
+    lxd_credentials,
+    k8s_cloud,
+    k8s_credentials,
+    model_config,
+    description,
+):
+    """adds a VCA to OSM
+
+    NAME: name of the VCA
+    """
+    check_client_version(ctx.obj, ctx.command.name)
+    vca = {}
+    vca["name"] = name
+    vca["endpoints"] = endpoints.split(",")
+    vca["user"] = user
+    vca["secret"] = secret
+    vca["cacert"] = cacert
+    vca["lxd-cloud"] = lxd_cloud
+    vca["lxd-credentials"] = lxd_credentials
+    vca["k8s-cloud"] = k8s_cloud
+    vca["k8s-credentials"] = k8s_credentials
+    if description:
+        vca["description"] = description
+    if model_config:
+        model_config = load(model_config)
+        vca["model-config"] = model_config
+    ctx.obj.vca.create(name, vca)
+
+
+def load(data: Any):
+    if os.path.isfile(data):
+        return load_file(data)
+    else:
+        try:
+            return json.loads(data)
+        except ValueError as e:
+            raise ClientException(e)
+
+
+def load_file(file_path: str) -> Dict:
+    content = None
+    with open(file_path, "r") as f:
+        content = f.read()
+    try:
+        return yaml.safe_load(content)
+    except yaml.scanner.ScannerError:
+        pass
+    try:
+        return json.loads(content)
+    except ValueError:
+        pass
+    raise ClientException(f"{file_path} must be a valid yaml or json file")
+
+
+@cli_osm.command(name="vca-update", short_help="updates a K8s cluster")
+@click.argument("name")
+@click.option(
+    "--endpoints", help="Comma-separated list of IP or hostnames of the Juju controller"
+)
+@click.option("--user", help="Username with admin priviledges")
+@click.option("--secret", help="Password of the specified username")
+@click.option("--cacert", help="CA certificate")
+@click.option(
+    "--lxd-cloud",
+    help="Name of the cloud that will be used for LXD containers (LXD proxy charms)",
+)
+@click.option(
+    "--lxd-credentials",
+    help="Name of the cloud credentialsto be used for the LXD cloud",
+)
+@click.option(
+    "--k8s-cloud",
+    help="Name of the cloud that will be used for K8s containers (K8s proxy charms)",
+)
+@click.option(
+    "--k8s-credentials",
+    help="Name of the cloud credentialsto be used for the K8s cloud",
+)
+@click.option(
+    "--model-config",
+    help="Configuration options for the models",
+)
+@click.option("--description", default=None, help="human readable description")
+@click.pass_context
+def vca_update(
+    ctx,
+    name,
+    endpoints,
+    user,
+    secret,
+    cacert,
+    lxd_cloud,
+    lxd_credentials,
+    k8s_cloud,
+    k8s_credentials,
+    model_config,
+    description,
+):
+    """updates a K8s cluster
+
+    NAME: name or ID of the K8s cluster
+    """
+    check_client_version(ctx.obj, ctx.command.name)
+    vca = {}
+    vca["name"] = name
+    if endpoints:
+        vca["endpoints"] = endpoints.split(",")
+    if user:
+        vca["user"] = user
+    if secret:
+        vca["secret"] = secret
+    if cacert:
+        vca["cacert"] = cacert
+    if lxd_cloud:
+        vca["lxd-cloud"] = lxd_cloud
+    if lxd_credentials:
+        vca["lxd-credentials"] = lxd_credentials
+    if k8s_cloud:
+        vca["k8s-cloud"] = k8s_cloud
+    if k8s_credentials:
+        vca["k8s-credentials"] = k8s_credentials
+    if description:
+        vca["description"] = description
+    if model_config:
+        model_config = load(model_config)
+        vca["model-config"] = model_config
+    ctx.obj.vca.update(name, vca)
+
+
+@cli_osm.command(name="vca-delete", short_help="deletes a K8s cluster")
+@click.argument("name")
+@click.option(
+    "--force", is_flag=True, help="forces the deletion from the DB (not recommended)"
+)
+@click.pass_context
+def vca_delete(ctx, name, force):
+    """deletes a K8s cluster
+
+    NAME: name or ID of the K8s cluster to be deleted
+    """
+    check_client_version(ctx.obj, ctx.command.name)
+    ctx.obj.vca.delete(name, force=force)
+
+
+@cli_osm.command(name="vca-list")
+@click.option(
+    "--filter",
+    default=None,
+    multiple=True,
+    help="restricts the list to the VCAs matching the filter",
+)
+@click.option("--literal", is_flag=True, help="print literally, no pretty table")
+@click.option("--long", is_flag=True, help="get more details")
+@click.pass_context
+def vca_list(ctx, filter, literal, long):
+    """list VCAs"""
+    check_client_version(ctx.obj, ctx.command.name)
+    if filter:
+        filter = "&".join(filter)
+    resp = ctx.obj.vca.list(filter)
+    if literal:
+        print(yaml.safe_dump(resp, indent=4, default_flow_style=False))
+        return
+    if long:
+        table = PrettyTable(
+            ["Name", "Id", "Project", "Operational State", "Detailed Status"]
+        )
+        project_list = ctx.obj.project.list()
+    else:
+        table = PrettyTable(["Name", "Id", "Operational State"])
+    for vca in resp:
+        logger.debug("VCA details: {}".format(yaml.safe_dump(vca)))
+        if long:
+            project_id, project_name = get_project(project_list, vca)
+            detailed_status = vca.get("_admin", {}).get("detailed-status", "-")
+            table.add_row(
+                [
+                    vca["name"],
+                    vca["_id"],
+                    project_name,
+                    vca.get("_admin", {}).get("operationalState", "-"),
+                    wrap_text(text=detailed_status, width=40),
+                ]
+            )
+        else:
+            table.add_row(
+                [
+                    vca["name"],
+                    vca["_id"],
+                    vca.get("_admin", {}).get("operationalState", "-"),
+                ]
+            )
+    table.align = "l"
+    print(table)
+
+
+@cli_osm.command(name="vca-show", short_help="shows the details of a K8s cluster")
+@click.argument("name")
+@click.option("--literal", is_flag=True, help="print literally, no pretty table")
+@click.pass_context
+def vca_show(ctx, name, literal):
+    """shows the details of a K8s cluster
+
+    NAME: name or ID of the K8s cluster
+    """
+    # try:
+    resp = ctx.obj.vca.get(name)
+    if literal:
+        print(yaml.safe_dump(resp, indent=4, default_flow_style=False))
+        return
+    table = PrettyTable(["key", "attribute"])
+    for k, v in list(resp.items()):
+        table.add_row([k, wrap_text(text=json.dumps(v, indent=2), width=100)])
+    table.align = "l"
+    print(table)
+
+
 ###########################
 # Repo operations
 ###########################