Update the error message to list the autoscaling configs.

Update test suite accordingly.
googleapis · Feb 24, 2022 · a13ca4b · a13ca4b
1 parent 7b3e3bf
commit a13ca4b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/google/cloud/bigtable/cluster.py b/google/cloud/bigtable/cluster.py
@@ -263,13 +263,13 @@ def _validate_scaling_config(self):
             and not self.cpu_utilization_percent
         ):
             raise ValueError(
-                "Must specify either serve_nodes or all of the autoscaling configurations."
+                "Must specify either serve_nodes or all of the autoscaling configurations (min_serve_nodes, max_serve_nodes, and cpu_utilization_percent)."
             )
         if self.serve_nodes and (
             self.max_serve_nodes or self.min_serve_nodes or self.cpu_utilization_percent
         ):
             raise ValueError(
-                "Cannot specify both serve_nodes and autoscaling configurations."
+                "Cannot specify both serve_nodes and autoscaling configurations (min_serve_nodes, max_serve_nodes, and cpu_utilization_percent)."
             )
         if (
             (
@@ -286,7 +286,7 @@ def _validate_scaling_config(self):
             )
         ):
             raise ValueError(
-                "All of autoscaling configurations must be specified at the same time."
+                "All of autoscaling configurations must be specified at the same time (min_serve_nodes, max_serve_nodes, and cpu_utilization_percent)."
             )
 
     def __eq__(self, other):

diff --git a/tests/unit/test_cluster.py b/tests/unit/test_cluster.py
@@ -737,7 +737,7 @@ def test_cluster_update_w_both_manual_and_autoscaling():
         cluster.update()
         assert (
             str(excinfo.value)
-            == "Cannot specify both serve_nodes and autoscaling configurations."
+            == "Cannot specify both serve_nodes and autoscaling configurations (min_serve_nodes, max_serve_nodes, and cpu_utilization_percent)."
         )
 
 
@@ -893,7 +893,7 @@ def test_create_cluster_with_both_manual_and_autoscaling():
         cluster.create()
     assert (
         str(excinfo.value)
-        == "Cannot specify both serve_nodes and autoscaling configurations."
+        == "Cannot specify both serve_nodes and autoscaling configurations (min_serve_nodes, max_serve_nodes, and cpu_utilization_percent)."
     )
 
 
@@ -934,7 +934,7 @@ def test_create_cluster_with_partial_autoscaling_config():
             cluster.create()
             assert (
                 str(excinfo.value)
-                == "All of autoscaling configurations must be specified at the same time."
+                == "All of autoscaling configurations must be specified at the same time (min_serve_nodes, max_serve_nodes, and cpu_utilization_percent)."
             )
 
 
@@ -958,7 +958,7 @@ def test_create_cluster_with_no_scaling_config():
         cluster.create()
         assert (
             str(excinfo.value)
-            == "Must specify either serve_nodes or all of the autoscaling configurations."
+            == "Must specify either serve_nodes or all of the autoscaling configurations  (min_serve_nodes, max_serve_nodes, and cpu_utilization_percent)."
         )