First alpha

Author: Simca

src/openstack_cli/__init__.py

@@ -14,4 +14,4 @@
 # limitations under the License.
 
 __app_name__ = "openstack-cli"
-__app_version__ = "1.0.dev0"
+__app_version__ = "1.0"

src/openstack_cli/commands/list.py

@@ -65,6 +65,7 @@ def print_cluster(servers: Dict[str, List[OpenStackVMInfo]]):
 
 
 def __init__(conf: Configuration, search_pattern: str):
+  ostack = OpenStack(conf)
   clusters = ostack.get_server_by_cluster(search_pattern=search_pattern, sort=True)
 
   if search_pattern and len(clusters) == 0:

src/openstack_cli/commands/up.py

@@ -65,7 +65,7 @@ def __work_unit(x: OpenStackVMInfo) -> bool:
         img_flavor = fl
         break
 
-  _default_key = ostack.get_keypairs()[0]
+  _default_key = ostack.get_keypairs()[0] if ostack.get_keypairs() else None
   _key = _default_key if not key else ostack.get_keypair(name, _default_key)
   _pass = conf.default_vm_password if not password else password
 
@@ -125,6 +125,6 @@ def __work_unit_waiter(x: OpenStackVMInfo) -> bool:
       users = line.split("@users@:")[1].strip().split(" ")
       to.print_row("User accounts", ",".join(users))
 
-  to.print_row("Used key", _key.name)
+  to.print_row("Used key", _key.name if _key else "Not used")
   to.print_row("Used password", _pass)
 

src/openstack_cli/core/__init__.py

@@ -24,17 +24,22 @@ def main_entry():
   is_debug: bool = "debug" in commands.discovery.kwargs_name
   if is_debug:
     os.putenv("API_DEBUG", "True")
-
-  # currently hack to avoid key generating on reset command
-  if commands.discovery.command_name == "conf" and commands.discovery.command_arguments[:1] == "reset":
-    pass
-  else:
-    conf.initialize()
-
-  commands.discovery.start_application(kwargs={
-    "conf": conf,
-    "debug": is_debug
-  })
+  try:
+    # currently hack to avoid key generating on reset command
+    if commands.discovery.command_name == "conf" and commands.discovery.command_arguments[:1] == "reset":
+      pass
+    else:
+      conf.initialize()
+
+    commands.discovery.start_application(kwargs={
+      "conf": conf,
+      "debug": is_debug
+    })
+  except Exception as e:
+    if is_debug:
+      raise e
+    else:
+      print(f"Error: {str(e)}")
 
 
 if __name__ == "__main__":

src/openstack_cli/modules/config/__init__.py

@@ -279,19 +279,44 @@ def __initial_configuration(self):
 
     from openstack_cli.modules.openstack import OpenStack
 
-    self.os_address = self.__ask_text_question("OpenStack address: ")
-    self.os_login = self.__ask_text_question("OpenStack login: ")
-    self.os_password = self.__ask_text_question("OpenStack password", encrypted=True)
+    self.os_address = self.__ask_text_question("OpenStack identity api address: ")
+    self.os_login = self.__ask_text_question("OpenStack username: ")
+    self.os_password = self.__ask_text_question("OpenStack password: ", encrypted=True)
 
+    print("Trying connect to the API...")
     osvm = OpenStack(self)
+    if osvm.has_errors:
+      from openstack_cli.core.output import StatusOutput
+      so = StatusOutput()
+      so.check_issues(osvm.last_errors)
+      self.reset()
+      raise RuntimeError("Unable to continue")
 
     self.__test_encrypted_property = "test"
 
-    _p = getpass("Default VM password: ")
+    from openstack_cli.commands.networks import print_networks
+
+    print("Please select default network for the VM (could be changed via 'conf network' command):")
+    _net = print_networks(ostack=osvm, select=True)
+    if not _net:
+      raise RuntimeError("Network is not selected")
+    self.default_network = _net
+
+    _p = self.__ask_text_question("Default VM password: ", encrypted=True)
     if not _p:  # ToDo: add more strict check
       _p = "qwerty"
     self.default_vm_password = _p
 
+    from openstack_cli.commands.conf import _keys_create
+    _default_keypair_name = "default"
+    _existing_key = osvm.get_keypair(_default_keypair_name)
+    if _existing_key:
+      print(f"Keypair with name '{_default_keypair_name}' already exist, need to be removed")
+      osvm.delete_keypair(_default_keypair_name)
+
+    _keys_create(self, osvm, _default_keypair_name)
+    print(f"Key '{_default_keypair_name}' could be exported using command 'conf keys export {_default_keypair_name}'")
+
     self.is_conf_initialized = True
     print("Tool configuration is done, thanks!")
 

src/openstack_cli/modules/config/base.py

@@ -42,7 +42,7 @@ def __init__(self):
       self.__system: str = sys.platform
 
       from openstack_cli import __app_name__ as app_name, __app_version__ as app_version
-      self.__config_dir: str = self.__user_data_dir(appname=app_name, version=app_version)
+      self.__config_dir: str = self.__user_data_dir(appname=app_name, version=None)
 
       if self.__config_dir and not os.path.exists(self.__config_dir):
         os.makedirs(self.__config_dir, exist_ok=True)

src/openstack_cli/modules/config/storage.py

@@ -123,6 +123,8 @@ def reset(self):
     if os.path.exists(self.configuration_file_path):
       os.remove(self.configuration_file_path)
 
+    self._db_connection = sqlite3.connect(self.configuration_file_path, check_same_thread=False)
+
   def create_key(self, persist: bool, master_password: str):
     if persist and master_password is None:
       print("Notice: With no password set would be generated default PC-depended encryption key")