Briliat features added

Up command:
 - Possibility to add nodes to existing cluster
   Syntax: . up [existing cluster name] [amount of nodes to add]

Info, list, up commands:
  - dynamic columns width which depends on actual content

Quota:
 - detailed usage statistics per user

conf:
 - updated cache mechanics

 And various small fixes and improvements

Author: Simca

src/openstack_cli/commands/conf/reset_cache.py

@@ -20,5 +20,7 @@
 
 
 def __init__(conf: Configuration):
-  conf.invalidate_cache()
+  for cache_item in conf.list_cache_ext:
+    print(f"Invalidate cache extention '{cache_item}'...")
+    conf.get_cache_ext(cache_item).invalidate_all()
   print("Cached data flushed")

src/openstack_cli/commands/images.py

@@ -21,24 +21,27 @@
 
 
 __module__ = CommandMetaInfo("images", item_help="Display available VM Images")
-__args__ = __module__.arg_builder\
+__args__ = __module__.arg_builder \
+  .add_default_argument("search_pattern", str, "Search query", default="")\
   .add_argument("all", bool, "Display all available images", default=False)\
   .add_argument("snapshots", bool, "Display only snapshots", default=False)\
-  .add_default_argument("search_pattern", str, "Search query", default="")
+  .add_argument("own", bool, "Display only own items", default=False)
 
 
-def __init__(conf: Configuration, search_pattern: str, snapshots: bool, all: bool):
+
+def __init__(conf: Configuration, search_pattern: str, snapshots: bool, all: bool, own: bool):
   ostack = OpenStack(conf)
   if snapshots:
-    show_snap(ostack, search_pattern)
+    show_snap(conf, ostack, search_pattern, own)
   elif all:
-    show_all(ostack, search_pattern)
+    show_all(conf, ostack, search_pattern, own)
   else:
-    show_normal(ostack, search_pattern)
+    show_normal(conf, ostack, search_pattern, own)
 
 
-def show_snap(ostack: OpenStack, search_pattern: str):
+def show_snap(conf: Configuration, ostack: OpenStack, search_pattern: str, own: bool):
   images = ostack.images
+  user_id = conf.user_id
 
   table = TableOutput(
     TableColumn("Id", 36),
@@ -51,6 +54,9 @@ def show_snap(ostack: OpenStack, search_pattern: str):
   table.print_header()
 
   for image in images:
+    if own and image.user_id != user_id:
+      continue
+
     if not image.image_type:
       continue
 
@@ -66,7 +72,7 @@ def show_snap(ostack: OpenStack, search_pattern: str):
     )
 
 
-def show_all(ostack: OpenStack, search_pattern: str):
+def show_all(conf: Configuration, ostack: OpenStack, search_pattern: str, own: bool):
   images = ostack.images
 
   table = TableOutput(
@@ -95,7 +101,7 @@ def show_all(ostack: OpenStack, search_pattern: str):
     )
 
 
-def show_normal(ostack: OpenStack, search_pattern: str):
+def show_normal(conf: Configuration, ostack: OpenStack, search_pattern: str, own: bool):
   images = ostack.os_images
 
   table = TableOutput(

src/openstack_cli/commands/info.py

@@ -13,24 +13,32 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from enum import Enum
+from typing import Dict, List
 
 from openstack_cli.modules.apputils.terminal import TableOutput, TableColumn
 
+from openstack_cli.modules.openstack.objects import ServerPowerState, OpenStackVMInfo
 from openstack_cli.modules.apputils.terminal.colors import Colors, Symbols
 from openstack_cli.core.config import Configuration
 from openstack_cli.modules.apputils.discovery import CommandMetaInfo
 from openstack_cli.modules.openstack import OpenStack
+from openstack_cli.modules.utils import ValueHolder
 
 
 __module__ = CommandMetaInfo("info", "Shows the detailed information about requested VMs")
 __args__ = __module__.arg_builder\
   .add_default_argument("search_pattern", str, "Search query", default="") \
   .add_argument("own", bool, "Display only owned by user items", default=False)
 
-from openstack_cli.modules.openstack.objects import ServerPowerState
 
+class WidthConst(Enum):
+  max_fqdn_len = 0
+  max_key_len = 1
+  max_net_len = 2
 
-def __init__(conf: Configuration, search_pattern: str, debug: bool, own: bool):
+
+def print_cluster(servers: Dict[str, List[OpenStackVMInfo]], vh: ValueHolder = None, ostack: OpenStack = None):
   __run_ico = Symbols.PLAY.green()
   __pause_ico = Symbols.PAUSE.yellow()
   __stop_ico = Symbols.STOP.red()
@@ -39,20 +47,19 @@ def __init__(conf: Configuration, search_pattern: str, debug: bool, own: bool):
     ServerPowerState.paused: __pause_ico
   }
 
-  ostack = OpenStack(conf, debug=debug)
-  clusters = ostack.get_server_by_cluster(search_pattern=search_pattern, sort=True, only_owned=own)
-  max_fqdn_len = ostack.servers.max_host_len + ostack.servers.max_domain_len + 5
+  if vh is None:
+    vh = ValueHolder(3, [50, 30, 15])
 
   to = TableOutput(
     TableColumn("", 1, inv_ch=Colors.GREEN.wrap_len()),
-    TableColumn("Host name", max_fqdn_len),
+    TableColumn("Host name", vh.get(WidthConst.max_fqdn_len)),
     TableColumn("Host IP", 16),
-    TableColumn("SSH Key", 30),
-    TableColumn("Network name", length=15)
+    TableColumn("SSH Key", vh.get(WidthConst.max_key_len)),
+    TableColumn("Network name", length=vh.get(WidthConst.max_net_len))
   )
 
   to.print_header()
-  for cluster_name, servers in clusters.items():
+  for cluster_name, servers in servers.items():
     servers = sorted(servers, key=lambda x: x.fqdn)
     for server in servers:
       to.print_row(
@@ -62,3 +69,19 @@ def __init__(conf: Configuration, search_pattern: str, debug: bool, own: bool):
         server.key_name,
         server.net_name
       )
+
+def __init__(conf: Configuration, search_pattern: str, debug: bool, own: bool):
+  vh: ValueHolder = ValueHolder(3)
+  def __fake_filter(s: OpenStackVMInfo):
+    vh.set_if_bigger(WidthConst.max_fqdn_len, len(s.fqdn))
+    vh.set_if_bigger(WidthConst.max_key_len, len(s.key_name))
+    vh.set_if_bigger(WidthConst.max_net_len, len(s.net_name))
+    return False
+
+  ostack = OpenStack(conf, debug=debug)
+  clusters = ostack.get_server_by_cluster(search_pattern=search_pattern, sort=True, only_owned=own,
+                                          filter_func=__fake_filter)
+
+  print_cluster(clusters, vh, ostack)
+
+

src/openstack_cli/commands/list.py

@@ -14,14 +14,15 @@
 # limitations under the License.
 
 from datetime import datetime
+from enum import Enum
 from typing import List, Dict
 
 from openstack_cli.modules.apputils.terminal import TableOutput, TableColumn
-
 from openstack_cli.modules.apputils.terminal.colors import Colors, Symbols
-from openstack_cli.core.config import Configuration
 from openstack_cli.modules.apputils.discovery import CommandMetaInfo
 
+from openstack_cli.core.config import Configuration
+from openstack_cli.modules.utils import ValueHolder
 from openstack_cli.modules.openstack import OpenStack
 from openstack_cli.modules.openstack.objects import ServerPowerState, OpenStackVMInfo
 
@@ -30,6 +31,10 @@
   .add_default_argument("search_pattern", str, "Search query", default="")\
   .add_argument("own", bool, "Display only owned by user items", default=False)
 
+class WidthConst(Enum):
+  max_cluster_name = 0
+  max_vm_type_len = 1
+
 
 def get_lifetime(timestamp: datetime):
   now = datetime.utcnow()
@@ -46,16 +51,19 @@ def get_lifetime(timestamp: datetime):
   return f"{int(hours)}h {int(minutes)}m" if days == 0 else f"{days} day(s)"
 
 
-def print_cluster(servers: Dict[str, List[OpenStackVMInfo]]):
+def print_cluster(servers: Dict[str, List[OpenStackVMInfo]], vh: ValueHolder = None):
   __run_ico = Symbols.PLAY.color(Colors.GREEN)
   __pause_ico = Symbols.PAUSE.color(Colors.BRIGHT_YELLOW)
   __stop_ico = Symbols.STOP.color(Colors.RED)
 
+  if vh is None:
+    vh = ValueHolder(2, [40, 20])
+
   to = TableOutput(
-    TableColumn("Cluster Name", 40),
+    TableColumn("Cluster Name", vh.get(WidthConst.max_cluster_name)),
     TableColumn("", 5),
     TableColumn("Nodes state", 20, inv_ch=Colors.GREEN.wrap_len() * 3),
-    TableColumn("VmType", 20),
+    TableColumn("VmType", vh.get(WidthConst.max_vm_type_len)),
     TableColumn("Lifetime", 10)
   )
 
@@ -78,11 +86,19 @@ def print_cluster(servers: Dict[str, List[OpenStackVMInfo]]):
 
 def __init__(conf: Configuration, search_pattern: str, own: bool):
   ostack = OpenStack(conf)
-  clusters = ostack.get_server_by_cluster(search_pattern=search_pattern, sort=True, only_owned=own)
+
+  vh = ValueHolder(2)
+  def __fake_filter(s: OpenStackVMInfo):
+    vh.set_if_bigger(WidthConst.max_cluster_name, len(s.cluster_name))
+    vh.set_if_bigger(WidthConst.max_vm_type_len, len(s.flavor.name))
+    return False
+
+  clusters = ostack.get_server_by_cluster(search_pattern=search_pattern, sort=True, only_owned=own,
+                                          filter_func=__fake_filter)
 
   if search_pattern and len(clusters) == 0:
     print(f"Query '{search_pattern}' returned no match")
     return
 
-  print_cluster(clusters)
+  print_cluster(clusters, vh)
 

src/openstack_cli/commands/quota.py

@@ -13,15 +13,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from typing import Dict
+
 from openstack_cli.modules.apputils.terminal import TableOutput, TableColumn, TableColumnPosition
 
 from openstack_cli.modules.apputils.terminal.colors import Colors
 from openstack_cli.core.config import Configuration
 from openstack_cli.modules.apputils.discovery import CommandMetaInfo
-from openstack_cli.modules.openstack import OpenStack
-
+from openstack_cli.modules.openstack import OpenStack, OpenStackQuotas, OpenStackQuotaType, OpenStackVMInfo
 
 __module__ = CommandMetaInfo("quota", item_help="Show the allowed resource limits for the project")
+__args__ = __module__.arg_builder\
+  .add_argument("details", bool, "Show detailed resource consumption", default=False)\
+  .add_argument("show_clusters", bool, "Show user instances on details page", alias="show-clusters", default=False)
 
 
 def get_percents(current: float, fmax: float):
@@ -40,8 +44,88 @@ def get_progressbar(percents, color=""):
   else:
     return f"[{'#' * f}{' '* nf}]"
 
-
-def __init__(conf: Configuration):
+def _show_details(conf: Configuration, ostack: OpenStack, quotas: OpenStackQuotas, show_clusters: bool):
+   project_cpu_max, project_cpu_current = quotas.get_quota(OpenStackQuotaType.CPU_CORES)
+   project_mem_max, project_mem_current = quotas.get_quota(OpenStackQuotaType.RAM_MB)
+   project_instances_max, project_instances_current = quotas.get_quota(OpenStackQuotaType.INSTANCES)
+
+   servers = ostack.servers
+
+   resources = {}
+
+   for server in ostack.servers.items:
+     if server.owner_id not in resources:
+       resources[server.owner_id] = {
+         "clusters": {},
+         OpenStackQuotaType.CPU_CORES: 0,
+         OpenStackQuotaType.RAM_MB: 0,
+         OpenStackQuotaType.INSTANCES: 0
+       }
+
+     record = resources[server.owner_id]
+
+     record[OpenStackQuotaType.CPU_CORES] += server.flavor.vcpus
+     record[OpenStackQuotaType.INSTANCES] += 1
+     record[OpenStackQuotaType.RAM_MB] += server.flavor.raw.ram
+     if server.cluster_name not in record["clusters"]:
+       record["clusters"][server.cluster_name] = 0
+
+     record["clusters"][server.cluster_name] += 1
+
+     resources[server.owner_id] = record
+
+   padding = " " * 5
+   print("Per-User statistic: ")
+
+   user_sum_instances: int = 0
+   user_sum_cpu: int = 0
+   user_sum_mem: int = 0
+   for user_id, record in resources.items():
+     user_name = ostack.users.get_user(user_id)
+     print(f"User id: {user_name if user_name else 'unknown'} ({user_id})")
+     user_instances = record[OpenStackQuotaType.INSTANCES]
+     user_mem = record[OpenStackQuotaType.RAM_MB]
+     user_cpu = record[OpenStackQuotaType.CPU_CORES]
+
+     print(f"{padding}Instances: {user_instances:<8} ({get_percents(user_instances, project_instances_max):0.2f}% from prj.cap.)")
+     print(f"{padding}CPU      : {user_cpu:<8} ({get_percents(user_cpu, project_cpu_max):0.2f}% from prj.cap.)")
+     print(f"{padding}MEM (GB) : {user_mem/1024:<8.2f} ({get_percents(user_mem, project_mem_max):0.2f}% from prj.cap.)")
+     if show_clusters:
+       _clusters = record["clusters"]  # {'cluster name': nodes amount}
+       _clusters = [f"{k} (hosts: {v})" for k, v in _clusters.items()]
+
+       title = "Clusters :"
+       _padding = " " * len(title)
+       _title_displayed: bool = False
+       for cluster in _clusters:
+         if _title_displayed:
+           print(f"{padding}{_padding} {cluster}")
+           continue
+
+         print(f"{padding}{title} {cluster}")
+         _title_displayed = True
+     print()
+
+     user_sum_cpu += user_cpu
+     user_sum_mem += user_mem
+     user_sum_instances += user_instances
+
+   print("--------------------")
+   print("Summary:")
+   print(f"{padding}∑ Inst.  : {user_sum_instances:<9} "
+         f"({get_percents(user_sum_instances, project_instances_max):0.2f}% calc./"
+         f"{get_percents(project_instances_current, project_instances_max):0.2f}% act.)")
+
+   print(f"{padding}∑ CPU    : {user_sum_cpu:<9} "
+         f"({get_percents(user_sum_cpu, project_cpu_max):0.2f}% calc./"
+         f"{get_percents(project_cpu_current, project_cpu_max):0.2f}% act.)")
+   print(f"{padding}∑ MEM(GB): {user_sum_mem/1024:<9.2f} "
+         f"({get_percents(user_sum_mem, project_mem_max):0.2f}% calc./"
+         f"{get_percents(project_mem_current, project_mem_max):0.2f}% act.)")
+   print()
+
+
+def __init__(conf: Configuration, details: bool, show_clusters: bool):
   stack = OpenStack(conf)
   limits = stack.quotas
 
@@ -72,3 +156,7 @@ def __init__(conf: Configuration):
 
   print()
   print("* Used/Avl.    - raw metric")
+
+  if details:
+    print("Calculating per-user statistic....")
+    _show_details(conf, stack, limits, show_clusters)

src/openstack_cli/commands/snap/__init__.py

@@ -0,0 +1,23 @@
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+from openstack_cli.core.config import Configuration
+from openstack_cli.modules.apputils.discovery import CommandMetaInfo, NotImplementedCommandException
+
+__module__ = CommandMetaInfo("snap", item_help="Manage OpenStack Snapshoots", default_sub_command="list")
+
+
+def __init__(conf: Configuration):
+  raise NotImplementedCommandException()