[Cosmos] Fixing replace throughput method (Azure#26363)

* Update _base.py

* Update test_auto_scale.py

* fixing tests

* Update test_auto_scale.py

* Update test_auto_scale.py

* create db if not exists

* Update test_auto_scale.py

Co-authored-by: simorenoh <[email protected]>

Author: JericHunter

sdk/cosmos/azure-cosmos/azure/cosmos/_base.py

@@ -731,10 +731,9 @@ def _deserialize_throughput(throughput: list) -> Any:
 
 
 def _replace_throughput(throughput: Union[int, ThroughputProperties], new_throughput_properties: list):
-    max_throughput = throughput.auto_scale_max_throughput
-    increment_percent = throughput.auto_scale_increment_percent
-
     try:
+        max_throughput = throughput.auto_scale_max_throughput
+        increment_percent = throughput.auto_scale_increment_percent
         if max_throughput is not None:
             new_throughput_properties['content']['offerAutopilotSettings'][
                 'maxThroughput'] = max_throughput

sdk/cosmos/azure-cosmos/test/test_auto_scale.py

@@ -45,11 +45,11 @@ def setUpClass(cls):
 
         cls.client = cosmos_client.CosmosClient(cls.host, cls.masterKey, consistency_level="Session",
                                                 connection_policy=cls.connectionPolicy)
-        cls.created_database = cls.client.create_database(test_config._test_config.TEST_DATABASE_ID)
+        cls.created_database = cls.client.create_database_if_not_exists(test_config._test_config.TEST_DATABASE_ID)
 
     def test_auto_scale(self):
         created_container = self.created_database.create_container(
-            id='container_with_auto_scale_settings',
+            id='auto_scale',
             partition_key=PartitionKey(path="/id"),
             offer_throughput=ThroughputProperties(auto_scale_max_throughput=7000, auto_scale_increment_percent=0)
 
@@ -74,7 +74,7 @@ def test_auto_scale(self):
     def test_create_container_if_not_exist(self):
         # Testing auto_scale_settings for the create_container_if_not_exists method
         created_container = self.created_database.create_container_if_not_exists(
-            id='container_with_auto_scale_settings',
+            id='auto_scale_2',
             partition_key=PartitionKey(path="/id"),
             offer_throughput=ThroughputProperties(auto_scale_max_throughput=1000, auto_scale_increment_percent=3)
         )
@@ -86,9 +86,11 @@ def test_create_container_if_not_exist(self):
         self.assertEqual(
             created_container_properties.auto_scale_increment_percent, 3)
 
+        self.created_database.delete_container(created_container.id)
+
     def test_create_database(self):
         # Testing auto_scale_settings for the create_database method
-        created_database = self.client.create_database("db1", offer_throughput=ThroughputProperties(
+        created_database = self.client.create_database("db_auto_scale", offer_throughput=ThroughputProperties(
             auto_scale_max_throughput=5000,
             auto_scale_increment_percent=0))
         created_db_properties = created_database.get_throughput()
@@ -99,13 +101,14 @@ def test_create_database(self):
         self.assertEqual(
             created_db_properties.auto_scale_increment_percent, 0)
 
-        self.client.delete_database("db1")
+        self.client.delete_database("db_auto_scale")
 
     def test_create_database_if_not_exists(self):
         # Testing auto_scale_settings for the create_database_if_not_exists method
-        created_database = self.client.create_database_if_not_exists("db2", offer_throughput=ThroughputProperties(
-            auto_scale_max_throughput=9000,
-            auto_scale_increment_percent=11))
+        created_database = self.client.create_database_if_not_exists("db_auto_scale_2",
+                                                                     offer_throughput=ThroughputProperties(
+                                                                         auto_scale_max_throughput=9000,
+                                                                         auto_scale_increment_percent=11))
         created_db_properties = created_database.get_throughput()
         # Testing the input value of the max_throughput
         self.assertNotEqual(
@@ -114,7 +117,7 @@ def test_create_database_if_not_exists(self):
         self.assertEqual(
             created_db_properties.auto_scale_increment_percent, 11)
 
-        self.client.delete_database("db2")
+        self.client.delete_database("db_auto_scale_2")
 
     def test_replace_throughput(self):
         created_container = self.created_database.create_container(
@@ -132,4 +135,4 @@ def test_replace_throughput(self):
         self.assertEqual(
             created_container_properties.auto_scale_increment_percent, 20)
 
-        self.client.delete_database(test_config._test_config.TEST_DATABASE_ID)
+        self.created_database.delete_container(created_container.id)

sdk/cosmos/azure-cosmos/test/test_auto_scale_async.py

@@ -45,7 +45,7 @@ async def setUpClass(cls):
 
         cls.client = CosmosClient(cls.host, cls.masterKey, consistency_level="Session",
                                   connection_policy=cls.connectionPolicy)
-        cls.created_database = await cls.client.create_database(test_config._test_config.TEST_DATABASE_ID)
+        cls.created_database = await cls.client.create_database_if_not_exists(test_config._test_config.TEST_DATABASE_ID)
 
     async def test_auto_scale(self):
         created_container = await self.created_database.create_container(
@@ -97,7 +97,6 @@ async def test_create_container_if_not_exist(self):
             created_container_properties.auto_scale_increment_percent, 3)
 
         await self.created_database.delete_container(created_container)
-        await self.client.delete_database(test_config._test_config.TEST_DATABASE_ID)
 
     async def test_create_database(self):
         # Testing auto_scale_settings for the create_database method
@@ -144,3 +143,5 @@ async def test_replace_throughput(self):
             created_container_properties.auto_scale_max_throughput, 7000)
         self.assertEqual(
             created_container_properties.auto_scale_increment_percent, 20)
+
+        await self.client.delete_database(test_config._test_config.TEST_DATABASE_ID)