Merge branch 'Azure:dev' into dev

Author: rahuls-microsoft

src/azure-cli-core/azure/cli/core/commands/__init__.py

@@ -1214,7 +1214,7 @@ def _is_paged(obj):
 
 def _is_poller(obj):
     # Since loading msrest is expensive, we avoid it until we have to
-    if obj.__class__.__name__ in ['AzureOperationPoller', 'LROPoller', 'AAZLROPoller']:
+    if obj.__class__.__name__ in ['LROPoller', 'AAZLROPoller']:
         return isinstance(obj, poller_classes())
     return False
 

src/azure-cli-core/azure/cli/core/util.py

@@ -675,11 +675,10 @@ def should_disable_connection_verify():
 
 
 def poller_classes():
-    from msrestazure.azure_operation import AzureOperationPoller
     from msrest.polling.poller import LROPoller
     from azure.core.polling import LROPoller as AzureCoreLROPoller
     from azure.cli.core.aaz._poller import AAZLROPoller
-    return (AzureOperationPoller, LROPoller, AzureCoreLROPoller, AAZLROPoller)
+    return (LROPoller, AzureCoreLROPoller, AAZLROPoller)
 
 
 def augment_no_wait_handler_args(no_wait_enabled, handler, handler_args):

src/azure-cli-testsdk/azure/cli/testsdk/patches.py

@@ -85,10 +85,7 @@ def _shortcut_long_run_operation(*args, **kwargs):  # pylint: disable=unused-arg
         return
 
     mock_in_unit_test(unit_test,
-                      'msrestazure.azure_operation.AzureOperationPoller._delay',
-                      _shortcut_long_run_operation)
-    mock_in_unit_test(unit_test,
-                      'msrestazure.polling.arm_polling.ARMPolling._delay',
+                      'azure.mgmt.core.polling.arm_polling.ARMPolling._delay',
                       _shortcut_long_run_operation)
     mock_in_unit_test(unit_test,
                       'azure.cli.core.commands.LongRunningOperation._delay',

src/azure-cli-testsdk/azure/cli/testsdk/scenario_tests/base.py

@@ -153,9 +153,6 @@ def setUp(self):
 
     def tearDown(self):
         os.environ = self.original_env
-        # Autorest.Python 2.x
-        assert not [t for t in threading.enumerate() if t.name.startswith("AzureOperationPoller")], \
-            "You need to call 'result' or 'wait' on all AzureOperationPoller you have created"
         # Autorest.Python 3.x
         assert not [t for t in threading.enumerate() if t.name.startswith("LROPoller")], \
             "You need to call 'result' or 'wait' on all LROPoller you have created"

src/azure-cli-testsdk/azure/cli/testsdk/scenario_tests/patches.py

@@ -18,7 +18,7 @@ def _shortcut_long_run_operation(*args, **kwargs):  # pylint: disable=unused-arg
         return
 
     mock_in_unit_test(unit_test,
-                      'msrestazure.azure_operation.AzureOperationPoller._delay',
+                      'azure.mgmt.core.polling.arm_polling.ARMPolling._delay',
                       _shortcut_long_run_operation)
 
 

src/azure-cli/azure/cli/command_modules/acs/custom.py

@@ -1152,8 +1152,7 @@ def aks_enable_addons(cmd, client, resource_group_name, name, addons,
                               rotation_poll_interval=rotation_poll_interval,
                               no_wait=no_wait,)
 
-    enable_monitoring = CONST_MONITORING_ADDON_NAME in instance.addon_profiles \
-        and instance.addon_profiles[CONST_MONITORING_ADDON_NAME].enabled
+    enable_monitoring = is_monitoring_addon_enabled(addons, instance)
     ingress_appgw_addon_enabled = CONST_INGRESS_APPGW_ADDON_NAME in instance.addon_profiles \
         and instance.addon_profiles[CONST_INGRESS_APPGW_ADDON_NAME].enabled
 
@@ -3254,3 +3253,23 @@ def _aks_approuting_update(
         return None
 
     return aks_update_decorator.update_mc(mc)
+
+
+def is_monitoring_addon_enabled(addons, instance):
+    monitoring_addon_enabled = False
+    is_monitoring_addon = False
+    try:
+        addon_args = addons.split(',')
+        for addon_arg in addon_args:
+            if addon_arg in ADDONS:
+                addon = ADDONS[addon_arg]
+                if addon == CONST_MONITORING_ADDON_NAME:
+                    is_monitoring_addon = True
+                    break
+
+        addon_profiles = instance.addon_profiles or {}
+        monitoring_addon_enabled = is_monitoring_addon and CONST_MONITORING_ADDON_NAME in addon_profiles and addon_profiles[
+            CONST_MONITORING_ADDON_NAME].enabled
+    except Exception as ex:  # pylint: disable=broad-except
+        logger.debug("failed to check monitoring addon enabled: %s", ex)
+    return monitoring_addon_enabled

src/azure-cli/azure/cli/command_modules/acs/tests/latest/test_aks_commands.py

@@ -107,7 +107,7 @@ def _get_lts_versions(self, location):
         ).get_output_in_json()
         sorted_lts_versions = sorted(lts_versions, key=version_to_tuple, reverse=False)
         return sorted_lts_versions
-    
+
     def _get_newer_non_lts_version(self, location, version):
         """Return the nearest newer non-lts version of the specified version."""
         supported_versions = self.cmd(
@@ -8144,6 +8144,13 @@ def test_aks_create_with_monitoring_aad_auth_msi_with_datacollectionsettings(sel
         aks_name = self.create_random_name('cliakstest', 16)
         self.create_new_cluster_with_monitoring_aad_auth(resource_group, resource_group_location, aks_name, user_assigned_identity=False, syslog_enabled=False, data_collection_settings=get_test_data_file_path('datacollectionsettings.json'))
 
+    @live_only()
+    @AllowLargeResponse()
+    @AKSCustomResourceGroupPreparer(random_name_length=17, name_prefix='clitest', location='westus2')
+    def test_aks_create_with_monitoring_aad_auth_msi_with_datacollectionsettings_and_otheraddon(self, resource_group, resource_group_location,):
+        aks_name = self.create_random_name('cliakstest', 16)
+        self.create_new_cluster_with_monitoring_aad_auth(resource_group, resource_group_location, aks_name, user_assigned_identity=False, syslog_enabled=False, data_collection_settings=get_test_data_file_path('datacollectionsettings.json'), use_ampls=False, highlogscale_mode_enabled=True, enableOtherAddon=True)
+
     @live_only()
     @AllowLargeResponse()
     @AKSCustomResourceGroupPreparer(random_name_length=17, name_prefix='clitest', location='westus2')
@@ -8176,7 +8183,7 @@ def test_aks_create_with_private_cluster_with_monitoring_aad_auth_msi_with_ampls
 
 
 
-    def create_new_cluster_with_monitoring_aad_auth(self, resource_group, resource_group_location, aks_name, user_assigned_identity=False, syslog_enabled=False, data_collection_settings=None, use_ampls=False, highlogscale_mode_enabled=False):
+    def create_new_cluster_with_monitoring_aad_auth(self, resource_group, resource_group_location, aks_name, user_assigned_identity=False, syslog_enabled=False, data_collection_settings=None, use_ampls=False, highlogscale_mode_enabled=False, enableOtherAddon=False):
         self.kwargs.update({
             'resource_group': resource_group,
             'name': aks_name,
@@ -8208,6 +8215,10 @@ def create_new_cluster_with_monitoring_aad_auth(self, resource_group, resource_g
         create_cmd += f'--ampls-resource-id {ampls_resource_id} ' if use_ampls else ''
         create_cmd += f'--enable-high-log-scale-mode ' if highlogscale_mode_enabled else ''
 
+        if enableOtherAddon:
+            # enable other addon such azure-policy to verify the monitoring addon and DCRs etc.. remainins intact.
+            self.cmd(f'aks enable-addons -a azure-policy -g={resource_group} -n={aks_name}')
+
         response = self.cmd(create_cmd, checks=[
             self.check('addonProfiles.omsagent.enabled', True),
             self.check('addonProfiles.omsagent.config.useAADAuth', 'true')
@@ -10555,7 +10566,7 @@ def test_aks_upgrade_with_tier_switch(self, resource_group, resource_group_locat
         upgrade_version = self._get_newer_non_lts_version(resource_group_location, create_version)
         if upgrade_version is None:
             self.skipTest('No newer non-LTS versions found in the location')
-            
+
         self.kwargs.update({
             'resource_group': resource_group,
             'name': aks_name,

src/azure-cli/azure/cli/command_modules/resource/custom.py

@@ -4522,7 +4522,9 @@ def invoke_action(self, action, request_body):
         """
         Formats Url if none provided and sends the POST request with the url and request-body.
         """
-        from msrestazure.azure_operation import AzureOperationPoller
+
+        from azure.core.polling import LROPoller
+        from azure.mgmt.core.polling.arm_polling import ARMPolling
 
         query_parameters = {}
         serialize = self.rcf.resources._serialize  # pylint: disable=protected-access
@@ -4564,28 +4566,14 @@ def invoke_action(self, action, request_body):
         body_content_kwargs = {}
         body_content_kwargs['content'] = json.loads(request_body) if request_body else None
 
-        # Construct and send request
-        def long_running_send():
-            request = client.post(url, query_parameters, header_parameters, **body_content_kwargs)
-            pipeline_response = client._pipeline.run(request, stream=False)
-            return pipeline_response.http_response.internal_response
-
-        def get_long_running_status(status_link, headers=None):
-            request = client.get(status_link, query_parameters, header_parameters)
-            if headers:
-                request.headers.update(headers)
-            pipeline_response = client._pipeline.run(request, stream=False)
-            return pipeline_response.http_response.internal_response
-
-        def get_long_running_output(response):
-            from azure.core.exceptions import HttpResponseError
-            if response.status_code not in [200, 202, 204]:
-                exp = HttpResponseError(response)
-                exp.request_id = response.headers.get('x-ms-request-id')
-                raise exp
-            return response.text
-
-        return AzureOperationPoller(long_running_send, get_long_running_output, get_long_running_status)
+        def deserialization_cb(pipeline_response):
+            return json.loads(pipeline_response.http_response.text())
+
+        request = client.post(url, query_parameters, header_parameters, **body_content_kwargs)
+        pipeline_response = client._pipeline.run(request, stream=False)
+
+        return LROPoller(client=client, initial_response=pipeline_response, deserialization_callback=deserialization_cb,
+                         polling_method=ARMPolling())
 
     @staticmethod
     def resolve_api_version(rcf, resource_provider_namespace, parent_resource_path, resource_type,