KeyPair creation failed during first configuration

Author: Simca

src/openstack_cli/commands/conf/keys/create.py

@@ -16,7 +16,7 @@
 from openstack_cli.core.output import StatusOutput
 from openstack_cli.modules.apputils.terminal import Console
 from openstack_cli.modules.openstack import OpenStack
-from openstack_cli.modules.openstack.api_objects import VMKeyPairItemBuilder
+from openstack_cli.modules.openstack.api_objects import VMKeyPairItemBuilder, VMNewKeyPairItemBuilder
 from openstack_cli.core.config import Configuration
 from openstack_cli.modules.apputils.discovery import CommandMetaInfo
 
@@ -42,31 +42,8 @@ def _create_key(conf:Configuration, ostack:OpenStack, keyBuilder: VMKeyPairItemB
 
 
 def __init__(conf: Configuration, name: str):
-  from cryptography.hazmat.primitives import serialization as crypto_serialization
-  from cryptography.hazmat.primitives.asymmetric import rsa
-  from cryptography.hazmat.backends import default_backend as crypto_default_backend
-
   ostack = OpenStack(conf)
-
-  key = rsa.generate_private_key(
-    backend=crypto_default_backend(),
-    public_exponent=65537,
-    key_size=2048
-  )
-  private_key = key.private_bytes(
-    crypto_serialization.Encoding.PEM,
-    crypto_serialization.PrivateFormat.TraditionalOpenSSL,  # PKCS8 is not supported best by paramiko
-    crypto_serialization.NoEncryption())
-  public_key = key.public_key().public_bytes(
-    crypto_serialization.Encoding.OpenSSH,
-    crypto_serialization.PublicFormat.OpenSSH
-  )
-
-  keyBuilder = VMKeyPairItemBuilder() \
-    .set_name(name) \
-    .set_private_key(private_key) \
-    .set_public_key(public_key)
-
+  keyBuilder = VMNewKeyPairItemBuilder().set_name(name)
   _create_key(conf, ostack, keyBuilder)
 
 

src/openstack_cli/commands/scripts/list.py

@@ -20,7 +20,7 @@
 
 __module__ = CommandMetaInfo("list", item_help="List available scripts")
 __args__ = __module__.arg_builder\
-  .add_default_argument("name", str, "dadad")\
+  .add_default_argument("name", str, "", default="")\
   .add_argument("test", str, "", default="dda")
 
 

src/openstack_cli/commands/snap/__init__.py

@@ -16,10 +16,14 @@
 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", exec_with_child=True)
+__module__ = CommandMetaInfo(
+  "snap",
+  item_help="Manage OpenStack Snapshoots",
+  default_sub_command="list",
+  exec_with_child=True
+)
 
 
-def __init__(conf: Configuration):
+def __init__(conf: Configuration, **kwargs):
   print("====Wait for version 1.3=====")
   raise NotImplementedCommandException()

src/openstack_cli/core/updates/upgrade_catalog_11.py

@@ -20,6 +20,7 @@
 from openstack_cli.core.output import Console, StatusOutput
 from openstack_cli.modules.apputils.config.upgrades import UpgradeCatalog, upgrade
 from openstack_cli.modules.openstack import OpenStack, AuthRequestType
+from openstack_cli.modules.openstack.api_objects import VMNewKeyPairItemBuilder
 from openstack_cli.modules.openstack.objects import VMProject
 
 
@@ -107,7 +108,7 @@ def __call__(self, *args, **kwargs):
 
     if not _is_cfg_key and not _is_srv_key:
       print(f"Creating new '{_default_keypair_name}' keypair..")
-      _create_key(conf, osvm, _default_keypair_name)
+      _create_key(conf, osvm, VMNewKeyPairItemBuilder().set_name(_default_keypair_name))
       print(f"Key '{_default_keypair_name}' could be exported using command 'conf keys export {_default_keypair_name}'")
 
     if not _is_cfg_key and _is_srv_key:

src/openstack_cli/modules/openstack/api_objects.py

@@ -575,6 +575,37 @@ def build(self):
     return self.__key
 
 
+class VMNewKeyPairItemBuilder(VMKeyPairItemBuilder):
+  def __init__(self):
+    super(VMNewKeyPairItemBuilder, self).__init__()
+
+    from cryptography.hazmat.primitives import serialization as crypto_serialization
+    from cryptography.hazmat.primitives.asymmetric import rsa
+    from cryptography.hazmat.backends import default_backend as crypto_default_backend
+
+    key = rsa.generate_private_key(
+      backend=crypto_default_backend(),
+      public_exponent=65537,
+      key_size=2048
+    )
+    private_key = key.private_bytes(
+      crypto_serialization.Encoding.PEM,
+      crypto_serialization.PrivateFormat.TraditionalOpenSSL,  # PKCS8 is not supported best by paramiko
+      crypto_serialization.NoEncryption())
+    public_key = key.public_key().public_bytes(
+      crypto_serialization.Encoding.OpenSSH,
+      crypto_serialization.PublicFormat.OpenSSH
+    )
+    super(VMNewKeyPairItemBuilder, self).set_private_key(private_key)
+    super(VMNewKeyPairItemBuilder, self).set_public_key(public_key)
+
+  def set_public_key(self, key: str or bytes):
+    raise NotImplementedError("Use VMKeyPairItemBuilder instead")
+
+  def set_private_key(self, key: str or bytes):
+    raise NotImplementedError("Use VMKeyPairItemBuilder instead")
+
+
 class VMKeypairItem(SerializableObject):
   keypair: VMKeypairItemValue = None