Fleet contract updated

Author: pjohari-ms

src/cosmosdb-preview/azext_cosmosdb_preview/_params.py

@@ -201,12 +201,12 @@
 
 FLEETSPACE_PROPERTIES_EXAMPLE = """--body "{
     \\"properties\\": {
+        \\"serviceTier\\": \\"GeneralPurpose\\",
+        \\"dataRegions\\": [\\"West US 2\\"],
         \\"throughputPoolConfiguration\\": {
             \\"minThroughput\\": 100000,
-            \\"maxThroughput\\": 300000,
-            \\"serviceTier\\": \\"GeneralPurpose\\",
-            \\"dataRegions\\": [\\"West US 2\\"]
-        },
+            \\"maxThroughput\\": 300000
+        }
     }
 }"
 """
@@ -854,10 +854,10 @@ def load_arguments(self, _):
         c.argument('fleetspace_name', options_list=['--fleetspace-name', '-n'], help='Name of the Fleetspace resource.', required=True)
 
     with self.argument_context('cosmosdb fleetspace create') as c:
-        c.argument('fleetspace_body', options_list=['--body', '-b'], validator=validate_fleetspace_body, completer=FilesCompleter(), help="Fleetspace body with properties.throughputPoolConfiguration (fields: minThroughput, maxThroughput, serviceTier, dataRegions). You can enter it as a string or as a file, e.g., --body @fleetspace.json or " + FLEETSPACE_PROPERTIES_EXAMPLE)
+        c.argument('fleetspace_body', options_list=['--body', '-b'], validator=validate_fleetspace_body, completer=FilesCompleter(), help="Fleetspace body with properties.serviceTier (required), properties.dataRegions (required), and properties.throughputPoolConfiguration (fields: minThroughput, maxThroughput). You can enter it as a string or as a file, e.g., --body @fleetspace.json or " + FLEETSPACE_PROPERTIES_EXAMPLE)
 
     with self.argument_context('cosmosdb fleetspace update') as c:
-        c.argument('fleetspace_body', options_list=['--body', '-b'], validator=validate_fleetspace_body, completer=FilesCompleter(), help="Fleetspace body with properties.throughputPoolConfiguration (fields: minThroughput, maxThroughput, serviceTier, dataRegions). You can enter it as a string or as a file, e.g., --body @fleetspace.json or " + FLEETSPACE_PROPERTIES_EXAMPLE)
+        c.argument('fleetspace_body', options_list=['--body', '-b'], validator=validate_fleetspace_body, completer=FilesCompleter(), help="Fleetspace body with properties.serviceTier (optional), properties.dataRegions (optional), and properties.throughputPoolConfiguration (fields: minThroughput, maxThroughput). You can enter it as a string or as a file, e.g., --body @fleetspace.json or " + FLEETSPACE_PROPERTIES_EXAMPLE)
 
     # Cosmos DB Fleetspace account
     with self.argument_context('cosmosdb fleetspace account') as c:

src/cosmosdb-preview/azext_cosmosdb_preview/_validators.py

@@ -452,7 +452,8 @@ def validate_fleetspace_body(cmd, ns):
         if not isinstance(tp_config, dict):
             raise InvalidArgumentValueError('Missing or invalid "throughputPoolConfiguration" in properties.')
 
-        for field in ['minThroughput', 'maxThroughput', 'serviceTier', 'dataRegions']:
+        # Check for minThroughput and maxThroughput in throughputPoolConfiguration
+        for field in ['minThroughput', 'maxThroughput']:
             if field not in tp_config:
                 raise InvalidArgumentValueError(f'Missing "{field}" in throughputPoolConfiguration.')
 
@@ -462,11 +463,14 @@ def validate_fleetspace_body(cmd, ns):
         if not isinstance(tp_config['maxThroughput'], int) or tp_config['maxThroughput'] <= 0:
             raise InvalidArgumentValueError('"maxThroughput" must be a positive integer.')
 
-        if not isinstance(tp_config['serviceTier'], str):
-            raise InvalidArgumentValueError('"serviceTier" must be a string.')
+        # Check for serviceTier and dataRegions at base properties level
+        if 'serviceTier' in props:
+            if not isinstance(props['serviceTier'], str):
+                raise InvalidArgumentValueError('"serviceTier" must be a string.')
 
-        if not isinstance(tp_config['dataRegions'], list) or not all(isinstance(r, str) for r in tp_config['dataRegions']):
-            raise InvalidArgumentValueError('"dataRegions" must be a list of strings.')
+        if 'dataRegions' in props:
+            if not isinstance(props['dataRegions'], list) or not all(isinstance(r, str) for r in props['dataRegions']):
+                raise InvalidArgumentValueError('"dataRegions" must be a list of strings.')
 
         ns.fleetspace_body = body
 

src/cosmosdb-preview/azext_cosmosdb_preview/custom.py

@@ -3305,23 +3305,33 @@ def cli_cosmosdb_fleetspace_create(client,
 
     """Creates an Azure Cosmos DB Fleetspace."""
 
+    # Extract service_tier and data_regions from base level (mandatory for create)
+    service_tier = fleetspace_body['properties'].get('serviceTier')
+    data_regions = fleetspace_body['properties'].get('dataRegions')
+    
+    if not service_tier:
+        raise CLIError('Missing required field "serviceTier" in properties.')
+    
+    if not data_regions:
+        raise CLIError('Missing required field "dataRegions" in properties.')
+
     throughput_pool_config = FleetspacePropertiesThroughputPoolConfiguration(
         min_throughput=fleetspace_body['properties']['throughputPoolConfiguration']['minThroughput'],
-        max_throughput=fleetspace_body['properties']['throughputPoolConfiguration']['maxThroughput'],
-        service_tier=fleetspace_body['properties']['throughputPoolConfiguration']['serviceTier'],
-        data_regions=fleetspace_body['properties']['throughputPoolConfiguration']['dataRegions']
+        max_throughput=fleetspace_body['properties']['throughputPoolConfiguration']['maxThroughput']
     )
 
-    fleetspace_body = FleetspaceResource(
+    fleetspace_resource = FleetspaceResource(
         fleetspace_api_kind="NoSQL",
-        throughput_pool_configuration=throughput_pool_config
+        throughput_pool_configuration=throughput_pool_config,
+        service_tier=service_tier,
+        data_regions=data_regions
     )
 
     return client.begin_create(
         resource_group_name=resource_group_name,
         fleet_name=fleet_name,
         fleetspace_name=fleetspace_name,
-        body=fleetspace_body
+        body=fleetspace_resource
     )
 
 
@@ -3333,22 +3343,27 @@ def cli_cosmosdb_fleetspace_update(client,
 
     """Updates an existing Azure Cosmos DB Fleetspace."""
 
+    # Extract service_tier and data_regions from base level (optional for update)
+    service_tier = fleetspace_body['properties'].get('serviceTier')
+    data_regions = fleetspace_body['properties'].get('dataRegions')
+
     throughput_pool_config = FleetspacePropertiesThroughputPoolConfiguration(
         min_throughput=fleetspace_body['properties']['throughputPoolConfiguration']['minThroughput'],
-        max_throughput=fleetspace_body['properties']['throughputPoolConfiguration']['maxThroughput'],
-        service_tier=fleetspace_body['properties']['throughputPoolConfiguration']['serviceTier']
+        max_throughput=fleetspace_body['properties']['throughputPoolConfiguration']['maxThroughput']
     )
 
-    fleetspace_body = FleetspaceResource(
+    fleetspace_resource = FleetspaceResource(
         fleetspace_api_kind="NoSQL",
-        throughput_pool_configuration=throughput_pool_config
+        throughput_pool_configuration=throughput_pool_config,
+        service_tier=service_tier,
+        data_regions=data_regions
     )
 
     return client.begin_update(
         resource_group_name=resource_group_name,
         fleet_name=fleet_name,
         fleetspace_name=fleetspace_name,
-        body=fleetspace_body
+        body=fleetspace_resource
     )
 
 

src/cosmosdb-preview/azext_cosmosdb_preview/tests/latest/test_cosmosdb_fleet_fleetspace_fleetspaceAccount_scenario.py

@@ -14,30 +14,31 @@ class CosmosdbFleetScenarioTest(ScenarioTest):
     @ResourceGroupPreparer(name_prefix='cli_test_cosmosdb_fleet', location='westus2')
     def test_cosmosdb_fleet_fleetspace_fleetspaceAccount(self, resource_group):
         # Names
-        fleet_name = 'fleetTest'
-        fleet_analytics_name = 'fleetAnalyticsTest'
-        fleetspace_name = 'fleetspaceTest'
+        fleet_name = self.create_random_name('fleet', 15)
+        fleet_analytics_name = self.create_random_name('fa', 10)
+        fleetspace_name = self.create_random_name('fs', 10)
         account_name = self.create_random_name('acct', 15)
+        storage_account_name = account_name + 'st'
 
         # JSON
         fleetspace_body = self._write_temp_json({
             "properties": {
+                "serviceTier": "GeneralPurpose",
+                "dataRegions": ["West US 2"],
                 "throughputPoolConfiguration": {
                     "minThroughput": 100000,
-                    "maxThroughput": 400000,
-                    "serviceTier": "GeneralPurpose",
-                    "dataRegions": ["West US 2",]
+                    "maxThroughput": 400000
                 }
             }
         })
 
         fleetspace_update_body = self._write_temp_json({
             "properties": {
+                "serviceTier": "GeneralPurpose",
+                "dataRegions": ["West US 2"],
                 "throughputPoolConfiguration": {
                     "minThroughput": 200000,
-                    "maxThroughput": 600000,
-                    "serviceTier": "GeneralPurpose",
-                    "dataRegions": ["West US 2"]
+                    "maxThroughput": 600000
                 }
             }
         })
@@ -51,52 +52,59 @@ def test_cosmosdb_fleet_fleetspace_fleetspaceAccount(self, resource_group):
             }
         })
 
+        # Feature being updated with a different contract. Will be enabled in the future.
+        '''
         fleet_analytics_body = self._write_temp_json({
             "properties": {
                 "storageLocationType": "StorageAccount",
-                "storageLocationUri": f"/subscriptions/{self.get_subscription_id()}/resourceGroups/{resource_group}/providers/Microsoft.Storage/storageAccounts/myStorageAccount",
+                "storageLocationUri": f"/subscriptions/{self.get_subscription_id()}/resourceGroups/{resource_group}/providers/Microsoft.Storage/storageAccounts/{storage_account_name}",
             }
         })
+        '''
 
         self.kwargs.update({
             'rg': resource_group,
             'acct': account_name,
+            'storage': storage_account_name,
             'fleet': fleet_name,
-            'fanalytics': fleet_analytics_name,
-            'fanalyticsbody': fleet_analytics_body,
             'fsp': fleetspace_name,
             'fspacct': account_name,
             'fspbody': fleetspace_body,
             'fspupdate': fleetspace_update_body,
             'fspacctbody': fleetspace_account_body
         })
 
-        # Create Cosmos DB account dynamically
-        self.cmd('az cosmosdb create -g {rg} -n {acct} --locations regionName=westus2 failoverPriority=0 isZoneRedundant=False')
-
         # Fleet
         self.cmd('az cosmosdb fleet create -g {rg} -n {fleet} -l westus2')
         self.cmd('az cosmosdb fleet show -g {rg} -n {fleet}')
         self.cmd('az cosmosdb fleet list -g {rg}')
+        
+        # Create Storage Account for Fleet Analytics
+        self.cmd('az storage account create -g {rg} -n {storage} --sku Standard_LRS --location westus2')
 
+        # Feature being updated with a different contract. Will be enabled in the future.
+        '''
         # Fleet Analytics
         self.cmd('az cosmosdb fleet analytics create -g {rg} --fleet-name {fleet} -n {fanalytics} --body @{fanalyticsbody}')
         self.cmd('az cosmosdb fleet analytics show -g {rg} --fleet-name {fleet} -n {fanalytics}')
         self.cmd('az cosmosdb fleet analytics list -g {rg} --fleet-name {fleet}')
-
+        '''
         # Fleetspace
         self.cmd('az cosmosdb fleetspace create -g {rg} --fleet-name {fleet} -n {fsp} --body @{fspbody}')
         self.cmd('az cosmosdb fleetspace update -g {rg} --fleet-name {fleet} -n {fsp} --body @{fspupdate}')
         self.cmd('az cosmosdb fleetspace show -g {rg} --fleet-name {fleet} -n {fsp}')
         self.cmd('az cosmosdb fleetspace list -g {rg} --fleet-name {fleet}')
 
+        # Create Cosmos DB account dynamically
+        self.cmd('az cosmosdb create -g {rg} -n {acct} --locations regionName=westus2 failoverPriority=0 isZoneRedundant=False')
+
         # Fleetspace Account
         self.cmd('az cosmosdb fleetspace account create -g {rg} --fleet-name {fleet} --fleetspace-name {fsp} --fleetspace-account-name {fspacct} --body @{fspacctbody}')
         self.cmd('az cosmosdb fleetspace account show -g {rg} --fleet-name {fleet} --fleetspace-name {fsp} --fleetspace-account-name {fspacct}')
         self.cmd('az cosmosdb fleetspace account list -g {rg} --fleet-name {fleet} --fleetspace-name {fsp}')
 
         # Deletes
-        self.cmd('az cosmosdb fleet analytics delete -g {rg} --fleet-name {fleet} -n {fanalytics} --yes')
+        # self.cmd('az cosmosdb fleet analytics delete -g {rg} --fleet-name {fleet} -n {fanalytics} --yes')
         self.cmd('az cosmosdb fleetspace account delete -g {rg} --fleet-name {fleet} --fleetspace-name {fsp} --fleetspace-account-name {fspacct} --yes')
         self.cmd('az cosmosdb fleetspace delete -g {rg} --fleet-name {fleet} -n {fsp} --yes')
         self.cmd('az cosmosdb fleet delete -g {rg} -n {fleet} --yes')