Jorwoods/quota tiers allow null (#1015)

* Allow setting site user_quota to None if tiered licenses exist

Author: jorwoods

tableauserverclient/models/site_item.py

@@ -1,3 +1,4 @@
+from multiprocessing.sharedctypes import Value
 import warnings
 import xml.etree.ElementTree as ET
 
@@ -226,8 +227,14 @@ def user_quota(self) -> Optional[int]:
 
     @user_quota.setter
     def user_quota(self, value: Optional[int]) -> None:
-        if any((self.tier_creator_capacity, self.tier_explorer_capacity, self.tier_viewer_capacity)):
-            raise ValueError("User quota conflicts with setting tiered license levels. Set those to None first.")
+        if value is not None and any(
+            (self.tier_creator_capacity, self.tier_explorer_capacity, self.tier_viewer_capacity)
+        ):
+            raise ValueError(
+                "User quota conflicts with setting tiered license levels. "
+                "Use replace_license_tiers_with_user_quota to set those to None, "
+                "and set user_quota to the desired value."
+            )
         self._user_quota = value
 
     @property
@@ -561,6 +568,12 @@ def auto_suspend_refresh_enabled(self) -> bool:
     def auto_suspend_refresh_enabled(self, value: bool):
         self._auto_suspend_refresh_enabled = value
 
+    def replace_license_tiers_with_user_quota(self, value: int) -> None:
+        self.tier_creator_capacity = None
+        self.tier_explorer_capacity = None
+        self.tier_viewer_capacity = None
+        self.user_quota = value
+
     def _parse_common_tags(self, site_xml, ns):
         if not isinstance(site_xml, ET.Element):
             site_xml = fromstring(site_xml).find(".//t:site", namespaces=ns)
@@ -747,7 +760,11 @@ def _set_values(
         if revision_history_enabled is not None:
             self._revision_history_enabled = revision_history_enabled
         if user_quota:
-            self.user_quota = user_quota
+            try:
+                self.user_quota = user_quota
+            except ValueError:
+                warnings.warn("Tiered license level is set. Setting user_quota to None.")
+                self.user_quota = None
         if storage_quota:
             self.storage_quota = storage_quota
         if revision_limit:

test/test_site.py

@@ -139,6 +139,9 @@ def test_update(self) -> None:
                 time_zone="America/Los_Angeles",
                 auto_suspend_refresh_enabled=True,
                 auto_suspend_refresh_inactivity_window=55,
+                tier_creator_capacity=5,
+                tier_explorer_capacity=5,
+                tier_viewer_capacity=5,
             )
             single_site._id = "6b7179ba-b82b-4f0f-91ed-812074ac5da6"
             single_site = self.server.sites.update(single_site)
@@ -151,7 +154,10 @@ def test_update(self) -> None:
         self.assertEqual(True, single_site.revision_history_enabled)
         self.assertEqual(13, single_site.revision_limit)
         self.assertEqual(True, single_site.disable_subscriptions)
-        self.assertEqual(15, single_site.user_quota)
+        self.assertEqual(None, single_site.user_quota)
+        self.assertEqual(5, single_site.tier_creator_capacity)
+        self.assertEqual(5, single_site.tier_explorer_capacity)
+        self.assertEqual(5, single_site.tier_viewer_capacity)
         self.assertEqual("disable", single_site.data_acceleration_mode)
         self.assertEqual(True, single_site.flows_enabled)
         self.assertEqual(True, single_site.cataloging_enabled)
@@ -179,6 +185,23 @@ def test_update_missing_id(self) -> None:
         single_site = TSC.SiteItem("test", "test")
         self.assertRaises(TSC.MissingRequiredFieldError, self.server.sites.update, single_site)
 
+    def test_null_site_quota(self) -> None:
+        test_site = TSC.SiteItem("testname", "testcontenturl", tier_explorer_capacity=1, user_quota=None)
+        assert test_site.tier_explorer_capacity == 1
+        with self.assertRaises(ValueError):
+            test_site.user_quota = 1
+        test_site.tier_explorer_capacity = None
+        test_site.user_quota = 1
+
+    def test_replace_license_tiers_with_user_quota(self) -> None:
+        test_site = TSC.SiteItem("testname", "testcontenturl", tier_explorer_capacity=1, user_quota=None)
+        assert test_site.tier_explorer_capacity == 1
+        with self.assertRaises(ValueError):
+            test_site.user_quota = 1
+        test_site.replace_license_tiers_with_user_quota(1)
+        self.assertEqual(1, test_site.user_quota)
+        self.assertIsNone(test_site.tier_explorer_capacity)
+
     def test_create(self) -> None:
         with open(CREATE_XML, "rb") as f:
             response_xml = f.read().decode("utf-8")