[MIGRATE] Fix edge case errors for get-discovered-server command

src/migrate/HISTORY.rst

@@ -3,6 +3,10 @@
 Release History
 ===============
 
+3.0.0b3
++++++++++++++++
+* Fix edge case bugs with az migrate get-discovered-server.
+
 3.0.0b2
 +++++++++++++++
 * Added replication list, get and start migration commands.

src/migrate/azext_migrate/custom.py

@@ -23,6 +23,7 @@ def get_discovered_server(cmd,
     from azext_migrate.helpers._utils import APIVersion
     from azext_migrate.helpers._server import (
         validate_get_discovered_server_params,
+        extract_machine_name_from_id,
         build_base_uri,
         fetch_all_servers,
         filter_servers_by_display_name,
@@ -33,6 +34,10 @@ def get_discovered_server(cmd,
     validate_get_discovered_server_params(
         project_name, resource_group, source_machine_type)
 
+    # Extract machine name if a full resource ID was provided for --name
+    if name:
+        name = extract_machine_name_from_id(name)
+
     # Use current subscription if not provided
     if not subscription_id:
         from azure.cli.core.commands.client_factory import \
@@ -50,8 +55,8 @@ def get_discovered_server(cmd,
 
     # Prepare query parameters
     query_params = [f"api-version={api_version}"]
-    if not appliance_name and display_name:
-        query_params.append(f"$filter=displayName eq '{display_name}'")
+    # Note: Azure Migrate API does not support OData $filter for machines endpoint
+    # We'll apply client-side filtering after fetching all results
 
     # Construct the full URI
     request_uri = (
@@ -64,8 +69,8 @@ def get_discovered_server(cmd,
         values = fetch_all_servers(cmd, request_uri, send_get_request)
 
         # Apply client-side filtering for display_name when using site
-        # endpoints
-        if appliance_name and display_name:
+        # endpoints or when using the migrateprojects endpoint
+        if display_name:
             values = filter_servers_by_display_name(values, display_name)
 
         # Format and display the discovered servers information

src/migrate/azext_migrate/helpers/_server.py

@@ -19,6 +19,30 @@ def validate_get_discovered_server_params(project_name,
         raise CLIError("source_machine_type is not 'VMware' or 'HyperV'.")
 
 
+def extract_machine_name_from_id(name_or_id):
+    """
+    Extract the machine name from a full resource ID or return the name as-is.
+
+    Handles formats like:
+    - Full ID: /subscriptions/.../Machines/5939691e-5505-4016-b4cd-4fa2d862a975
+    - Simple name: 5939691e-5505-4016-b4cd-4fa2d862a975
+    """
+    if not name_or_id:
+        return None
+
+    # If it looks like a full resource ID, extract the machine name
+    if name_or_id.startswith('/subscriptions/') or name_or_id.startswith('/Subscriptions/'):
+        parts = name_or_id.rstrip('/').split('/')
+        # The machine name should be the last part after "machines" or "Machines"
+        for i, part in enumerate(parts):
+            if part.lower() == 'machines' and i + 1 < len(parts):
+                return parts[i + 1]
+        # If we can't find machines, return the last segment
+        return parts[-1] if parts else name_or_id
+
+    return name_or_id
+
+
 def build_base_uri(subscription_id, resource_group_name, project_name,
                    appliance_name, name, source_machine_type):
     """Build the base URI for the API request."""
@@ -66,23 +90,40 @@ def fetch_all_servers(cmd, request_uri, send_get_request):
     """Fetch all servers including paginated results."""
     response = send_get_request(cmd, request_uri)
     data = response.json()
-    values = data.get('value', [])
-
-    while data.get('nextLink'):
-        response = send_get_request(cmd, data.get('nextLink'))
-        data = response.json()
-        values += data.get('value', [])
-
-    return values
+
+    # Handle single item response (when fetching by name/ID)
+    # Single items have 'id' and 'properties' at root level, not 'value'
+    if 'value' in data:
+        values = data.get('value', [])
+        while data.get('nextLink'):
+            response = send_get_request(cmd, data.get('nextLink'))
+            data = response.json()
+            values += data.get('value', [])
+        return values
+    elif 'id' in data and 'properties' in data:
+        # Single machine response - wrap in list
+        return [data]
+    else:
+        return []
 
 
 def filter_servers_by_display_name(servers, display_name):
-    """Filter servers by display name."""
+    """Filter servers by display name or machine name."""
     filtered = []
     for server in servers:
         properties = server.get('properties', {})
+
+        # Check properties.displayName first
         if properties.get('displayName', '') == display_name:
             filtered.append(server)
+            continue
+
+        # Also check discoveryData[0].machineName
+        discovery_data = properties.get('discoveryData', [])
+        if discovery_data:
+            machine_name = discovery_data[0].get('machineName', '')
+            if machine_name == display_name:
+                filtered.append(server)
     return filtered
 
 
@@ -93,16 +134,16 @@ def extract_server_info(server, index):
 
     # Default values
     machine_name = "N/A"
-    machine_id = "N/A"
+    machine_id = server.get('id', 'N/A')
     ip_addresses_str = 'N/A'
     os_name = "N/A"
     boot_type = "N/A"
     os_disk_id = "N/A"
 
     if discovery_data:
+        # Format from Microsoft.Migrate/migrateprojects/machines
         latest_discovery = discovery_data[0]
         machine_name = latest_discovery.get('machineName', 'N/A')
-        machine_id = server.get('id', 'N/A')
         ip_addresses = latest_discovery.get('ipAddresses', [])
         ip_addresses_str = ', '.join(ip_addresses) if ip_addresses else 'N/A'
         os_name = latest_discovery.get('osName', 'N/A')
@@ -114,6 +155,35 @@ def extract_server_info(server, index):
         disk_details = json.loads(disk_details_json)
         if disk_details:
             os_disk_id = disk_details[0].get("InstanceId", "N/A")
+    else:
+        # Format from Microsoft.OffAzure/VMwareSites/machines or HyperVSites/machines
+        machine_name = properties.get('displayName', 'N/A')
+
+        # Try to get IP addresses from different locations
+        network_adapters = properties.get('networkAdapters', [])
+        if network_adapters:
+            all_ips = []
+            for adapter in network_adapters:
+                ips = adapter.get('ipAddressList', [])
+                all_ips.extend(ips)
+            ip_addresses_str = ', '.join(all_ips) if all_ips else 'N/A'
+
+        # Get OS info from guestOSDetails or operatingSystemDetails
+        guest_os = properties.get('guestOSDetails', {})
+        if guest_os:
+            os_name = guest_os.get('osName', 'N/A')
+        else:
+            os_details = properties.get('operatingSystemDetails', {})
+            os_name = os_details.get('osName', os_details.get('osType', 'N/A'))
+
+        # Get firmware/boot type
+        firmware = properties.get('firmware', 'N/A')
+        boot_type = firmware.lower() if firmware and firmware != 'N/A' else 'N/A'
+
+        # Get disk info
+        disks = properties.get('disks', [])
+        if disks:
+            os_disk_id = disks[0].get('uuid', disks[0].get('diskId', 'N/A'))
 
     return {
         'index': index,

src/migrate/azext_migrate/helpers/replication/list/_execute_list.py

@@ -211,11 +211,13 @@ def _format_protected_item(item):
     # Add custom properties if available
     if custom_properties:
         formatted_item['instanceType'] = custom_properties.get('instanceType', 'N/A')
-        formatted_item['sourceMachineName'] = custom_properties.get('sourceMachineName', 'N/A')
         formatted_item['targetVmName'] = custom_properties.get('targetVmName', 'N/A')
         formatted_item['targetResourceGroupId'] = custom_properties.get('targetResourceGroupId', 'N/A')
         formatted_item['customLocationRegion'] = custom_properties.get('customLocationRegion', 'N/A')
 
+        # Use sourceVmName from API response (the actual VM display name)
+        formatted_item['sourceMachineName'] = custom_properties.get('sourceVmName', 'N/A')
+
     return formatted_item
 
 

src/migrate/setup.py

@@ -7,7 +7,7 @@
 
 from setuptools import setup, find_packages
 
-VERSION = "3.0.0b2"
+VERSION = "3.0.0b3"
 
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',