Adding new license type for az sql vm (#11570)

* Adding DR license examples Adding DR license examples * Update test_sqlvm_update_license_and_sku.yaml Adding test for DR * Update test_vm_vmss_update_ultra_ssd_enabled.yaml Undone changes for recording of vm_vmss * Update test_vm_vmss_update_ultra_ssd_enabled.yaml * Update HISTORY.rst
Azure · Dec 29, 2019 · 9c9d83c · 9c9d83c
1 parent 206efd0
commit 9c9d83c
Show file tree

Hide file tree

Showing 11 changed files with 1,043 additions and 504 deletions.
diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst
@@ -147,6 +147,11 @@ Release History
 
 * Added "--read-scale" and "--read-replicas" parameters to sql db create and update commands, to support read scale management.
 
+**SQL VM**
+
+* New package upgrade 0.5.
+* Add new --license-type supporting Disaster Recovery Benefit (DR).
+
 **Storage**
 
 * GA Release Large File Shares property for storage account create and update command
@@ -174,8 +179,8 @@ Release History
 **AppConfig**
 
 * Add support for using ":" for `as az appconfig kv import` separator
-* Fix issue for listing key values with multiple labels including null label. 
-* Update management plane sdk, azure-mgmt-appconfiguration, to version 0.3.0. 
+* Fix issue for listing key values with multiple labels including null label.
+* Update management plane sdk, azure-mgmt-appconfiguration, to version 0.3.0.
 
 **AppService**
 

diff --git a/src/azure-cli/azure/cli/command_modules/sqlvm/_help.py b/src/azure-cli/azure/cli/command_modules/sqlvm/_help.py
@@ -31,6 +31,9 @@
   - name: Create a SQL virtual machine with AHUB billing tag.
     text: >
         az sql vm create -n sqlvm -g myresourcegroup -l eastus --license-type AHUB
+  - name: Create a SQL virtual machine with DR billing tag.
+    text: >
+        az sql vm create -n sqlvm -g myresourcegroup -l eastus --license-type DR
   - name: Create a SQL virtual machine with specific sku type and license type.
     text: >
         az sql vm create -n sqlvm -g myresourcegroup -l eastus --image-sku Enterprise --license-type AHUB
@@ -143,4 +146,7 @@
   - name: Update a SQL virtual machine billing tag to AHUB.
     text: >
         az sql vm update -n sqlvm -g myresourcegroup --license-type AHUB
+  - name: Update a SQL virtual machine billing tag to DR.
+    text: >
+        az sql vm update -n sqlvm -g myresourcegroup --license-type DR
 """
diff --git a/.../cli/command_modules/sqlvm/tests/latest/recordings/test_sqlvm_update_license_and_sku.yaml b/.../cli/command_modules/sqlvm/tests/latest/recordings/test_sqlvm_update_license_and_sku.yaml
diff --git a/src/azure-cli/azure/cli/command_modules/sqlvm/tests/latest/test_sqlvm_commands.py b/src/azure-cli/azure/cli/command_modules/sqlvm/tests/latest/test_sqlvm_commands.py
@@ -394,6 +394,32 @@ def test_sqlvm_update_license_and_sku(self, resource_group, resource_group_locat
                      JMESPathCheck('sqlServerLicenseType', 'AHUB')
                  ])
 
+        # test license change for DR only.
+        self.cmd('sql vm update -n {} -g {} --license-type {}'
+                 .format(sqlvm1, resource_group, 'DR'),
+                 checks=[
+                     JMESPathCheck('name', sqlvm1),
+                     JMESPathCheck('location', resource_group_location),
+                     JMESPathCheck('provisioningState', "Succeeded"),
+                     JMESPathCheck('sqlImageSku', 'Enterprise'),
+                     JMESPathCheck('sqlServerLicenseType', 'DR')
+                 ])
+
+        # delete sqlvm
+        self.cmd('sql vm delete -n {} -g {} --yes'
+                 .format(sqlvm1, resource_group),
+                 checks=NoneCheck())
+
+        # test create sqlvm with sql license type DR.
+        self.cmd('sql vm create -n {} -g {} -l {} --license-type {}'
+                 .format(sqlvm1, resource_group, resource_group_location, 'DR'),
+                 checks=[
+                     JMESPathCheck('name', sqlvm1),
+                     JMESPathCheck('location', resource_group_location),
+                     JMESPathCheck('provisioningState', "Succeeded"),
+                     JMESPathCheck('sqlServerLicenseType', 'DR'),
+                 ])
+
 
 class SqlVmGroupScenarioTest(ScenarioTest):
     @ResourceGroupPreparer()

diff --git a/src/azure-cli/requirements.py2.Darwin.txt b/src/azure-cli/requirements.py2.Darwin.txt
@@ -74,7 +74,7 @@ azure-mgmt-servicebus==0.6.0
 azure-mgmt-servicefabric==0.2.0
 azure-mgmt-signalr==0.3.0
 azure-mgmt-sql==0.15.0
-azure-mgmt-sqlvirtualmachine==0.4.0
+azure-mgmt-sqlvirtualmachine==0.5.0
 azure-mgmt-storage==5.0.0
 azure-mgmt-trafficmanager==0.51.0
 azure-mgmt-web==0.42.0

diff --git a/src/azure-cli/requirements.py2.Linux.txt b/src/azure-cli/requirements.py2.Linux.txt
@@ -74,7 +74,7 @@ azure-mgmt-servicebus==0.6.0
 azure-mgmt-servicefabric==0.2.0
 azure-mgmt-signalr==0.3.0
 azure-mgmt-sql==0.15.0
-azure-mgmt-sqlvirtualmachine==0.4.0
+azure-mgmt-sqlvirtualmachine==0.5.0
 azure-mgmt-storage==5.0.0
 azure-mgmt-trafficmanager==0.51.0
 azure-mgmt-web==0.42.0

diff --git a/src/azure-cli/requirements.py2.windows.txt b/src/azure-cli/requirements.py2.windows.txt
@@ -73,7 +73,7 @@ azure-mgmt-servicebus==0.6.0
 azure-mgmt-servicefabric==0.2.0
 azure-mgmt-signalr==0.3.0
 azure-mgmt-sql==0.15.0
-azure-mgmt-sqlvirtualmachine==0.4.0
+azure-mgmt-sqlvirtualmachine==0.5.0
 azure-mgmt-storage==5.0.0
 azure-mgmt-trafficmanager==0.51.0
 azure-mgmt-web==0.42.0

diff --git a/src/azure-cli/requirements.py3.Darwin.txt b/src/azure-cli/requirements.py3.Darwin.txt
@@ -74,7 +74,7 @@ azure-mgmt-servicebus==0.6.0
 azure-mgmt-servicefabric==0.2.0
 azure-mgmt-signalr==0.3.0
 azure-mgmt-sql==0.15.0
-azure-mgmt-sqlvirtualmachine==0.4.0
+azure-mgmt-sqlvirtualmachine==0.5.0
 azure-mgmt-storage==5.0.0
 azure-mgmt-trafficmanager==0.51.0
 azure-mgmt-web==0.42.0

diff --git a/src/azure-cli/requirements.py3.Linux.txt b/src/azure-cli/requirements.py3.Linux.txt
@@ -74,7 +74,7 @@ azure-mgmt-servicebus==0.6.0
 azure-mgmt-servicefabric==0.2.0
 azure-mgmt-signalr==0.3.0
 azure-mgmt-sql==0.15.0
-azure-mgmt-sqlvirtualmachine==0.4.0
+azure-mgmt-sqlvirtualmachine==0.5.0
 azure-mgmt-storage==5.0.0
 azure-mgmt-trafficmanager==0.51.0
 azure-mgmt-web==0.42.0

diff --git a/src/azure-cli/requirements.py3.windows.txt b/src/azure-cli/requirements.py3.windows.txt
@@ -73,7 +73,7 @@ azure-mgmt-servicebus==0.6.0
 azure-mgmt-servicefabric==0.2.0
 azure-mgmt-signalr==0.3.0
 azure-mgmt-sql==0.15.0
-azure-mgmt-sqlvirtualmachine==0.4.0
+azure-mgmt-sqlvirtualmachine==0.5.0
 azure-mgmt-storage==5.0.0
 azure-mgmt-trafficmanager==0.51.0
 azure-mgmt-web==0.42.0

diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py
@@ -121,7 +121,7 @@
     'azure-mgmt-servicefabric~=0.2.0',
     'azure-mgmt-signalr~=0.3.0',
     'azure-mgmt-sql~=0.15.0',
-    'azure-mgmt-sqlvirtualmachine~=0.4.0',
+    'azure-mgmt-sqlvirtualmachine~=0.5.0',
     'azure-mgmt-storage~=5.0.0',
     'azure-mgmt-trafficmanager~=0.51.0',
     'azure-mgmt-web~=0.42.0',