Fix param name fix for disk override (#6998)

Azure · Nov 21, 2023 · 7ebe379 · 7ebe379
1 parent c326520
commit 7ebe379
Show file tree

Hide file tree

Showing 6 changed files with 774 additions and 538 deletions.
diff --git a/src/connectedvmware/HISTORY.rst b/src/connectedvmware/HISTORY.rst
@@ -2,6 +2,12 @@
 
 Release History
 ===============
+0.2.3
+++++++
+* Fix docs and help for vm creation from template with disk override.
+* Convert any HCRP machine with empty kind to VMWare / AVS kind, while enabling vm from inventory.
+* Reprompt fix for password for vcenter connect.
+
 0.2.2
 ++++++
 * GA release: Using stable API version for all operations.

diff --git a/src/connectedvmware/azext_connectedvmware/_params.py b/src/connectedvmware/azext_connectedvmware/_params.py
@@ -173,8 +173,8 @@ def load_arguments(self, _):
             action=VmDiskAddAction,
             nargs='+',
             help="Disk overrides for the vm. "
-            "Usage: --disk name=<> disk_size=<> disk_mode=<> controller_key=<> "
-            "device-key=<> unit_number=<>.",
+            "Usage: --disk name=<> disk-size=<> disk-mode=<> controller-key=<> "
+            "device-key=<> unit-number=<>.",
         )
 
     with self.argument_context('connectedvmware vm update') as c:

diff --git a/src/connectedvmware/azext_connectedvmware/custom.py b/src/connectedvmware/azext_connectedvmware/custom.py
@@ -160,6 +160,7 @@ def connect_vcenter(
             creds['password'] = pwinput('Please provide vcenter password: ')
             if not creds['password']:
                 print('Parameter is required, please try again')
+                continue
             passwdConfim = pwinput('Please confirm vcenter password: ')
             if creds['password'] != passwdConfim:
                 print('Passwords do not match, please try again')
@@ -981,19 +982,23 @@ def create_vm(
     machine = None
     try:
         machine = machine_client.get(resource_group_name, resource_name)
+        machine_kind = None
         if f"{machine.kind}".lower() != f"{vcenter.kind}".lower():
-            raise InvalidArgumentValueError(
-                "The existing Machine resource is not of the same kind as the vCenter. " +
-                f"Machine kind: '{machine.kind}', vCenter kind: '{vcenter.kind}'"
-            )
+            if machine.kind:
+                raise InvalidArgumentValueError(
+                    "The existing Machine resource is not of the same kind as the vCenter. " +
+                    f"Machine kind: '{machine.kind}', vCenter kind: '{vcenter.kind}'"
+                )
+            machine_kind = vcenter.kind
         if location is not None and machine.location != location:
             raise InvalidArgumentValueError(
                 "The location of the existing Machine cannot be updated. " +
                 "Either specify the existing location or keep the location unspecified. " +
                 f"Existing location: {machine.location}, Provided location: {location}"
             )
-        if tags is not None:
+        if any(x is not None for x in [machine_kind, tags]):
             m = MachineUpdate(
+                kind=machine_kind,
                 tags=tags,
             )
             machine = machine_client.update(resource_group_name, resource_name, m)