Merging upstream version 9.4.0+dfsg.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 8 insertions, 1 deletions

diff --git a/ansible_collections/netapp/azure/plugins/module_utils/azure_rm_netapp_common.py b/ansible_collections/netapp/azure/plugins/module_utils/azure_rm_netapp_common.py
index 716e4fb95..166327088 100644
--- a/ansible_collections/netapp/azure/plugins/module_utils/azure_rm_netapp_common.py
+++ b/ansible_collections/netapp/azure/plugins/module_utils/azure_rm_netapp_common.py
@@ -14,7 +14,7 @@ import sys
 
 HAS_AZURE_COLLECTION = True
 NEW_STYLE = None
-COLLECTION_VERSION = "21.10.0"
+COLLECTION_VERSION = "21.10.1"
 IMPORT_ERRORS = []
 SDK_VERSION = "0.0.0"
 
@@ -26,6 +26,11 @@ else:
     except ImportError as exc:
         IMPORT_ERRORS.append(str(exc))
         HAS_AZURE_COLLECTION = False
+
+        class AzureRMModuleBase:
+            def __init__(self, derived_arg_spec, required_if=None, supports_check_mode=False, supports_tags=True, **kwargs):
+                raise ImportError(IMPORT_ERRORS)
+
     except SyntaxError as exc:
         # importing Azure collection fails with python 2.6
         if sys.version_info < (2, 8):
@@ -40,6 +45,8 @@ try:
     NEW_STYLE = True
 except ImportError as exc:
     IMPORT_ERRORS.append(str(exc))
+
+if NEW_STYLE is None:
     try:
         from azure.mgmt.netapp import AzureNetAppFilesManagementClient      # 0.10.0 or older
         NEW_STYLE = False