MB-65480 Use new isColumnar field from /pools endpoint

Since MB-65393 has been completed, we should use the new isColumnar
field from the /pools endpoint to decide whether the cluster is a
Columnar one instead of inferring from the implementationVersion.

Change-Id: I50b3b345aa2232703dbfe5656d3988ddf924bce2
Reviewed-on: https://review.couchbase.org/c/couchbase-cli/+/225258
Tested-by: Build Bot <[email protected]>
Reviewed-by: Lubo Marinski <[email protected]>

Author: safianalicb

cluster_manager.py

@@ -263,11 +263,15 @@ def is_cluster_initialized(self):
         return False, errors
 
     def is_enterprise_columnar(self):
+        """
+        Returns a tuple of (isEnterprise, isColumnar, errors)
+        """
         data, errors = self.pools()
         if errors:
             return None, None, errors
-        # use data["isColumnar"] once MB-65393 is completed
-        return data["isEnterprise"], data["implementationVersion"].endswith("-columnar"), None
+
+        # If isColumnar isn't present, then it must be a <8.0 non-Columnar cluster (MB-65393)
+        return data["isEnterprise"], data.get("isColumnar", False), None
 
     def get_hostnames_for_service(self, service_name):
         """ Gets all hostnames that run a service

test/mock_server.py

@@ -290,7 +290,7 @@ def get_pools(rest_params=None, server_args=None, path="", endpoint_match=None):
                                            'lhttpc': '1.3.0', 'sasl': '2.3.4'}, 'implementationVersion': version,
                      'isAdminCreds': is_admin, 'isROAdminCreds': False}
 
-    response_no_init = {'uuid': [], 'settings': [], 'pools': [], 'isEnterprise': enterprise,
+    response_no_init = {'uuid': [], 'settings': [], 'pools': [], 'isEnterprise': enterprise, 'isColumnar': columnar,
                         'componentsVersion': {'kernel': '5.4.3.2', 'ale': version, 'ssl': '8.2.6.2', 'os_mon': '2.4.4',
                                               'stdlib': '3.4.5', 'inets': '6.5.2.4', 'public_key': '1.5.2',
                                               'ns_server': version, 'crypto': '4.2.2.2', 'asn1': '5.0.5.1',

test/test_cluster_manager.py

@@ -249,3 +249,54 @@ def test_is_cluster_initialized(self):
                 server.shutdown()
 
                 self.assertEqual(res, test["expected_res"])
+
+    def test_is_enterprise_columnar(self):
+        tests = {
+            "Enterprise_Columnar": {
+                "pools_response": (200, {
+                    "isEnterprise": True,
+                    "isColumnar": True
+                }),
+                "expected": (True, True, None)
+            },
+            "Enterprise_NonColumnar": {
+                "pools_response": (200, {
+                    "isEnterprise": True,
+                    "isColumnar": False
+                }),
+                "expected": (True, False, None)
+            },
+            "Enterprise_MissingColumnarField": {
+                "pools_response": (200, {
+                    "isEnterprise": True
+                    # isColumnar field is missing, should default to False
+                }),
+                "expected": (True, False, None)
+            },
+            "NonEnterprise_MissingColumnarField": {
+                "pools_response": (200, {
+                    "isEnterprise": False
+                    # isColumnar field is missing, should default to False
+                }),
+                "expected": (False, False, None)
+            },
+            "Error": {
+                "pools_response": (400, {"_": "error"}),
+                "expected": (None, None, [{"_": "error"}])
+            }
+        }
+
+        for name, test in tests.items():
+            with self.subTest(name=name):
+                server = MockRESTServer('127.0.0.1', 6789)
+                server.args["override-pools"] = test["pools_response"]
+                server.run()
+
+                cluster_manager = ClusterManager("http://127.0.0.1:6789", "Administrator", "asdasd")
+                is_enterprise, is_columnar, errors = cluster_manager.is_enterprise_columnar()
+
+                server.shutdown()
+
+                self.assertEqual(is_enterprise, test["expected"][0], "is_enterprise value does not match expected")
+                self.assertEqual(is_columnar, test["expected"][1], "is_columnar value does not match expected")
+                self.assertEqual(errors, test["expected"][2], "errors value does not match expected")