From 14719eace0093639a6b43abf03f8655210025752 Mon Sep 17 00:00:00 2001
From: James Falcon <james.falcon@canonical.com>
Date: Mon, 16 Oct 2023 09:40:10 -0500
Subject: [PATCH] Revert "ds-identify/CloudStack: $DS_MAYBE if vm running on
 vmware/xen (#4281)"

This reverts commit 7949bb3de352dc40c62c38a0534722b24b7eed22
but keeps the CLA signature.

Fixes GH-4501
LP: #2039453
---
 tests/unittests/test_ds_identify.py | 5 -----
 tools/ds-identify                   | 3 ---
 2 files changed, 8 deletions(-)

diff --git a/tests/unittests/test_ds_identify.py b/tests/unittests/test_ds_identify.py
index 6dbdd6845e1..80813fcd632 100644
--- a/tests/unittests/test_ds_identify.py
+++ b/tests/unittests/test_ds_identify.py
@@ -1488,7 +1488,6 @@ def _print_run_output(rc, out, err, cfg, files):
     },
     "IBMCloud-metadata": {
         "ds": "IBMCloud",
-        "policy_dmi": POLICY_FOUND_ONLY,
         "mocks": [
             MOCK_VIRT_IS_XEN,
             {"name": "is_ibm_provisioning", "ret": shell_false},
@@ -1555,7 +1554,6 @@ def _print_run_output(rc, out, err, cfg, files):
     },
     "IBMCloud-nodisks": {
         "ds": "IBMCloud",
-        "policy_dmi": POLICY_FOUND_ONLY,
         "mocks": [
             MOCK_VIRT_IS_XEN,
             {"name": "is_ibm_provisioning", "ret": shell_false},
@@ -1642,7 +1640,6 @@ def _print_run_output(rc, out, err, cfg, files):
     },
     "VMware-NoValidTransports": {
         "ds": "VMware",
-        "policy_dmi": POLICY_FOUND_ONLY,
         "mocks": [
             MOCK_VIRT_IS_VMWARE,
         ],
@@ -1665,7 +1662,6 @@ def _print_run_output(rc, out, err, cfg, files):
     },
     "VMware-EnvVar-NoData": {
         "ds": "VMware",
-        "policy_dmi": POLICY_FOUND_ONLY,
         "mocks": [
             {
                 "name": "vmware_has_envvar_vmx_guestinfo",
@@ -1775,7 +1771,6 @@ def _print_run_output(rc, out, err, cfg, files):
     },
     "VMware-GuestInfo-NoData": {
         "ds": "VMware",
-        "policy_dmi": POLICY_FOUND_ONLY,
         "mocks": [
             {
                 "name": "vmware_has_rpctool",
diff --git a/tools/ds-identify b/tools/ds-identify
index d7254c3434a..e5120ac4271 100755
--- a/tools/ds-identify
+++ b/tools/ds-identify
@@ -739,9 +739,6 @@ probe_floppy() {
 dscheck_CloudStack() {
     is_container && return ${DS_NOT_FOUND}
     dmi_product_name_matches "CloudStack*" && return $DS_FOUND
-    if [ "$DI_VIRT" = "vmware" ] || [ "$DI_VIRT" = "xen" ]; then
-        return $DS_MAYBE
-    fi
     return $DS_NOT_FOUND
 }