Add list of allowed classifications in description for Maintenance Configuration (#8381)

* Add list of allowed classifications in description for Maintenance Configuration

* Update HISTORY.rst

* Update setup.py and tests

---------

Co-authored-by: Sethuram S <[email protected]>

Author: SethuramS

src/maintenance/HISTORY.rst

@@ -2,6 +2,10 @@
 
 Release History
 ===============
+1.7.0b2
+++++++
+* Added list of allowed classifications in description for Maintenance Configuration
+
 1.7.0b1
 ++++++
 * Changed incorrect parameter name

src/maintenance/azext_maintenance/aaz/latest/maintenance/configuration/_create.py

@@ -22,9 +22,9 @@ class Create(AAZCommand):
     """
 
     _aaz_info = {
-        "version": "2023-04-01",
+        "version": "2023-10-01-preview",
         "resources": [
-            ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.maintenance/maintenanceconfigurations/{}", "2023-04-01"],
+            ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.maintenance/maintenanceconfigurations/{}", "2023-10-01-preview"],
         ]
     }
 
@@ -96,7 +96,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
         install_patches_linux_parameters.classifications_to_include_list = AAZListArg(
             options=["classifications-to-include-list"],
             singular_options=["classifications-to-include"],
-            help="Classification category of patches to be patched",
+            help="Classification category of patches to be patched. Allowed values are 'Critical', 'Security', and 'Other'.",
         )
         install_patches_linux_parameters.package_name_masks_to_exclude_list = AAZListArg(
             options=["package-name-masks-to-exclude-list"],
@@ -122,7 +122,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
         install_patches_windows_parameters.classifications_to_include_list = AAZListArg(
             options=["classifications-to-include-list"],
             singular_options=["classifications-to-include"],
-            help="Classification category of patches to be patched",
+            help="Classification category of patches to be patched. Allowed values are 'Critical', 'Security', 'UpdateRollup', 'FeaturePack', 'ServicePack', 'Definition', 'Tools', and 'Updates'.",
         )
         install_patches_windows_parameters.exclude_kbs_requiring_reboot = AAZBoolArg(
             options=["exclude-kbs-requiring-reboot"],
@@ -272,7 +272,7 @@ def url_parameters(self):
         def query_parameters(self):
             parameters = {
                 **self.serialize_query_param(
-                    "api-version", "2023-04-01",
+                    "api-version", "2023-10-01-preview",
                     required=True,
                 ),
             }

src/maintenance/azext_maintenance/aaz/latest/maintenance/configuration/_update.py

@@ -22,9 +22,9 @@ class Update(AAZCommand):
     """
 
     _aaz_info = {
-        "version": "2023-04-01",
+        "version": "2023-10-01-preview",
         "resources": [
-            ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.maintenance/maintenanceconfigurations/{}", "2023-04-01"],
+            ["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.maintenance/maintenanceconfigurations/{}", "2023-10-01-preview"],
         ]
     }
 
@@ -97,7 +97,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
         install_patches_linux_parameters.classifications_to_include_list = AAZListArg(
             options=["classifications-to-include-list"],
             singular_options=["classifications-to-include"],
-            help="Classification category of patches to be patched",
+            help="Classification category of patches to be patched. Allowed values are 'Critical', 'Security', and 'Other'.",
         )
         install_patches_linux_parameters.package_name_masks_to_exclude_list = AAZListArg(
             options=["package-name-masks-to-exclude-list"],
@@ -123,7 +123,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
         install_patches_windows_parameters.classifications_to_include_list = AAZListArg(
             options=["classifications-to-include-list"],
             singular_options=["classifications-to-include"],
-            help="Classification category of patches to be patched",
+            help="Classification category of patches to be patched. Allowed values are 'Critical', 'Security', 'UpdateRollup', 'FeaturePack', 'ServicePack', 'Definition', 'Tools', and 'Updates'.",
         )
         install_patches_windows_parameters.exclude_kbs_requiring_reboot = AAZBoolArg(
             options=["exclude-kbs-requiring-reboot"],
@@ -273,7 +273,7 @@ def url_parameters(self):
         def query_parameters(self):
             parameters = {
                 **self.serialize_query_param(
-                    "api-version", "2023-04-01",
+                    "api-version", "2023-10-01-preview",
                     required=True,
                 ),
             }

src/maintenance/azext_maintenance/azext_metadata.json

@@ -1,4 +1,4 @@
 {
     "azext.isPreview": true,
-    "azext.minCliCoreVersion": "2.61.0"
+    "azext.minCliCoreVersion": "2.67.0"
 }

src/maintenance/azext_maintenance/tests/latest/recordings/test_maintenance_Scenario.yaml

@@ -283,8 +283,9 @@ def step_assignment_list_parent(test):
 
 
 def step__publicmaintenanceconfigurations_get_publicmaintenanceconfigurations_getforresource(test):
-   test.cmd('az maintenance public-configuration show ''--resource-name "sql3"',
-          checks=[])
+    test.cmd('az maintenance public-configuration show '
+            '--resource-name "{publicMaintenanceConfiguration}"',
+            checks=[])
 
 
 def step__publicmaintenanceconfigurations_get_publicmaintenanceconfigurations_list(test):
@@ -323,7 +324,7 @@ def step__maintenanceconfigurations_delete_maintenanceconfigurations_deleteforre
 def step__maintenanceconfigurations_delete_publicmaintenanceconfigurations_delete(test):
     test.cmd('az maintenance configuration delete '
              '--resource-group "{rg}" '
-             '--resource-name "sqlcli" '
+             '--resource-name "{publicMaintenanceConfiguration}" '
              '--yes ',
              checks=[])
 
@@ -340,8 +341,8 @@ def step__maintenanceconfigurations_put_publicmaintenanceconfigurations_createor
              '--namespace "Microsoft.Maintenance" '
              '--visibility "Public" '
              '--resource-group "{rg}" '
-             '--resource-name "sqlcli" '
-             '--extension-properties publicMaintenanceConfigurationId=sqlcli isAvailable=true',
+             '--resource-name "{publicMaintenanceConfiguration}" '
+             '--extension-properties publicMaintenanceConfigurationId={publicMaintenanceConfiguration} isAvailable=true',
              checks=[])
 
 
@@ -540,9 +541,9 @@ def call_scenario(test):
     step__configurationassignments_get_configurationassignments_show(test)
 
     # public maintenance config
-    step__publicmaintenanceconfigurations_get_publicmaintenanceconfigurations_getforresource(test)
     step__publicmaintenanceconfigurations_get_publicmaintenanceconfigurations_list(test)
     step__maintenanceconfigurations_put_publicmaintenanceconfigurations_createorupdateforresource(test)
+    step__publicmaintenanceconfigurations_get_publicmaintenanceconfigurations_getforresource(test)
     step__maintenanceconfigurations_delete_publicmaintenanceconfigurations_delete(test)
 
     # pending updates for vmss
@@ -609,7 +610,8 @@ def __init__(self, *args, **kwargs):
             'myMaintenanceConfiguration2': 'configuration2',
             'myConfigurationAssignment': 'workervmPolicy2',
             'myConfigurationAssignment2': 'workervmConfiguration2',
-            'HSProbeSettings': '{"protocol": "https", "port": "80", "requestPath": "/"}'
+            'HSProbeSettings': '{"protocol": "https", "port": "80", "requestPath": "/"}',
+            'publicMaintenanceConfiguration': 'sqlcli'
         })
 
     @AllowLargeResponse()

src/maintenance/azext_maintenance/tests/latest/test_maintenance_scenario.py

@@ -10,7 +10,7 @@
 from setuptools import setup, find_packages
 
 # HISTORY.rst entry.
-VERSION = '1.7.0b1'
+VERSION = '1.7.0b2'
 try:
     from azext_maintenance.manual.version import VERSION
 except ImportError: