Merge pull request #7124 from Akasurde/awx_7052

vmware_vm_inventory: Replace guest.guestId with config.guestId

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul

awx/main/models/inventory.py

@@ -2275,7 +2275,7 @@ class vmware(PluginFileInjector):
             "customValue",  # optional
             "datastore",
             "effectiveRole",
-            "guestHeartbeatStatus",  # optonal
+            "guestHeartbeatStatus",  # optional
             "layout",  # optional
             "layoutEx",  # optional
             "name",
@@ -2287,7 +2287,6 @@ class vmware(PluginFileInjector):
             "resourcePool",
             "rootSnapshot",
             "snapshot",  # optional
-            "tag",
             "triggeredAlarmState",
             "value"
         ]
@@ -2356,7 +2355,7 @@ class vmware(PluginFileInjector):
                 })
         else:
             # default groups from script
-            for entry in ('guest.guestId', '"templates" if config.template else "guests"'):
+            for entry in ('config.guestId', '"templates" if config.template else "guests"'):
                 ret['keyed_groups'].append({
                     'prefix': '', 'separator': '',
                     'key': entry

awx/main/tests/data/inventory/plugins/vmware/files/vmware_vm_inventory.yml

@@ -43,7 +43,6 @@ properties:
 - resourcePool
 - rootSnapshot
 - snapshot
-- tag
 - triggeredAlarmState
 - value
 - capability