From cd974b0ec1e8bb6eaaf3d98e84a944fdd3824c78 Mon Sep 17 00:00:00 2001
From: Sayan Naskar <nascarsayan@gmail.com>
Date: Tue, 2 Jul 2024 06:55:56 +0530
Subject: [PATCH] [connectedvmware] Search for BIOS IDs with both Big Endian
 and Middle Endian (#7763)

* Search for BIOS IDs with both Little Endian and Big Endian format

* Message nit
---
 src/connectedvmware/HISTORY.rst                     | 4 ++++
 src/connectedvmware/azext_connectedvmware/custom.py | 9 ++++++---
 src/connectedvmware/setup.py                        | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/connectedvmware/HISTORY.rst b/src/connectedvmware/HISTORY.rst
index 1e8d22d6a97..08ec10d4de4 100644
--- a/src/connectedvmware/HISTORY.rst
+++ b/src/connectedvmware/HISTORY.rst
@@ -2,6 +2,10 @@
 
 Release History
 ===============
+1.1.1
+++++++
+* `create-from-machines` : Search for BIOS IDs with both Little Endian and Middle Endian format.
+
 1.1.0
 ++++++
 * Prompt credentials if not provided for Guest Agent.
diff --git a/src/connectedvmware/azext_connectedvmware/custom.py b/src/connectedvmware/azext_connectedvmware/custom.py
index 705fab1c55f..969f3324de9 100644
--- a/src/connectedvmware/azext_connectedvmware/custom.py
+++ b/src/connectedvmware/azext_connectedvmware/custom.py
@@ -842,7 +842,10 @@ def create_from_machines(
     substring(u, 11, 2), substring(u, 9, 2), '-',
     substring(u, 16, 2), substring(u, 14, 2), '-',
     substring(u, 19))
-| project machineId=id, name, resourceGroup, vmUuidRev, kind
+| extend vmUuid=pack_array(u, vmUuidRev)
+| mv-expand vmUuid
+| extend vmUuid=tostring(vmUuid)
+| project machineId=id, name, resourceGroup, vmUuid, kind
 | join kind=inner (
 ConnectedVMwareVsphereResources
 | where type =~ 'Microsoft.ConnectedVMwareVsphere/VCenters/InventoryItems'
@@ -852,8 +855,8 @@ def create_from_machines(
 | extend biosId = tolower(tostring(p['smbiosUuid']))
 | extend managedResourceId=tolower(tostring(p['managedResourceId']))
 | project inventoryId=id, biosId, managedResourceId
-) on $left.vmUuidRev == $right.biosId
-| project-away vmUuidRev
+) on $left.vmUuid == $right.biosId
+| project-away vmUuid
 """
     query = " ".join(query.splitlines())
 
diff --git a/src/connectedvmware/setup.py b/src/connectedvmware/setup.py
index eb200698987..338ef3e6452 100644
--- a/src/connectedvmware/setup.py
+++ b/src/connectedvmware/setup.py
@@ -19,7 +19,7 @@
 # TODO: Confirm this is the right version number you want and it matches your
 # HISTORY.rst entry.
 
-VERSION = '1.1.0'
+VERSION = '1.1.1'
 
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers