Use default extension with identity instead of Cassandra specific (#69)

Author: jonathan-innis

src/k8s-extension/azext_k8s_extension/custom.py

@@ -17,7 +17,7 @@
 
 from .partner_extensions.ContainerInsights import ContainerInsights
 from .partner_extensions.AzureDefender import AzureDefender
-from .partner_extensions.Cassandra import Cassandra
+from .partner_extensions.DefaultExtensionWithIdentity import DefaultExtensionWithIdentity
 from .partner_extensions.AzureMLKubernetes import AzureMLKubernetes
 from .partner_extensions.OpenServiceMesh import OpenServiceMesh
 from .partner_extensions.DefaultExtension import DefaultExtension
@@ -35,7 +35,7 @@ def ExtensionFactory(extension_name):
         'microsoft.azuredefender.kubernetes': AzureDefender,
         'microsoft.openservicemesh': OpenServiceMesh,
         'microsoft.azureml.kubernetes': AzureMLKubernetes,
-        'cassandradatacentersoperator': Cassandra,
+        'cassandradatacentersoperator': DefaultExtensionWithIdentity,
     }
 
     # Return the extension if we find it in the map, else return the default

src/k8s-extension/azext_k8s_extension/partner_extensions/Cassandra.py renamed to src/k8s-extension/azext_k8s_extension/partner_extensions/DefaultExtensionWithIdentity.py

@@ -1,60 +1,60 @@
-# --------------------------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for license information.
-# --------------------------------------------------------------------------------------------
-
-# pylint: disable=unused-argument
-
-from ..vendored_sdks.models import ExtensionInstance
-from ..vendored_sdks.models import ExtensionInstanceUpdate
-from ..vendored_sdks.models import ScopeCluster
-from ..vendored_sdks.models import ScopeNamespace
-from ..vendored_sdks.models import Scope
-
-from .PartnerExtensionModel import PartnerExtensionModel
-
-
-class Cassandra(PartnerExtensionModel):
-    def Create(self, cmd, client, resource_group_name, cluster_name, name, cluster_type, extension_type,
-               scope, auto_upgrade_minor_version, release_train, version, target_namespace,
-               release_namespace, configuration_settings, configuration_protected_settings,
-               configuration_settings_file, configuration_protected_settings_file):
-
-        """Default validations & defaults for Create
-           Must create and return a valid 'ExtensionInstance' object.
-
-        """
-        ext_scope = None
-        if scope is not None:
-            if scope.lower() == 'cluster':
-                scope_cluster = ScopeCluster(release_namespace=release_namespace)
-                ext_scope = Scope(cluster=scope_cluster, namespace=None)
-            elif scope.lower() == 'namespace':
-                scope_namespace = ScopeNamespace(target_namespace=target_namespace)
-                ext_scope = Scope(namespace=scope_namespace, cluster=None)
-
-        create_identity = True
-        extension_instance = ExtensionInstance(
-            extension_type=extension_type,
-            auto_upgrade_minor_version=auto_upgrade_minor_version,
-            release_train=release_train,
-            version=version,
-            scope=ext_scope,
-            configuration_settings=configuration_settings,
-            configuration_protected_settings=configuration_protected_settings,
-        )
-        return extension_instance, name, create_identity
-
-    def Update(self, extension, auto_upgrade_minor_version, release_train, version):
-        """Default validations & defaults for Update
-           Must create and return a valid 'ExtensionInstanceUpdate' object.
-
-        """
-        return ExtensionInstanceUpdate(
-            auto_upgrade_minor_version=auto_upgrade_minor_version,
-            release_train=release_train,
-            version=version
-        )
-
-    def Delete(self, client, resource_group_name, cluster_name, name, cluster_type):
-        pass
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# --------------------------------------------------------------------------------------------
+
+# pylint: disable=unused-argument
+
+from ..vendored_sdks.models import ExtensionInstance
+from ..vendored_sdks.models import ExtensionInstanceUpdate
+from ..vendored_sdks.models import ScopeCluster
+from ..vendored_sdks.models import ScopeNamespace
+from ..vendored_sdks.models import Scope
+
+from .PartnerExtensionModel import PartnerExtensionModel
+
+
+class DefaultExtensionWithIdentity(PartnerExtensionModel):
+    def Create(self, cmd, client, resource_group_name, cluster_name, name, cluster_type, extension_type,
+               scope, auto_upgrade_minor_version, release_train, version, target_namespace,
+               release_namespace, configuration_settings, configuration_protected_settings,
+               configuration_settings_file, configuration_protected_settings_file):
+
+        """Default validations & defaults for Create
+           Must create and return a valid 'ExtensionInstance' object.
+
+        """
+        ext_scope = None
+        if scope is not None:
+            if scope.lower() == 'cluster':
+                scope_cluster = ScopeCluster(release_namespace=release_namespace)
+                ext_scope = Scope(cluster=scope_cluster, namespace=None)
+            elif scope.lower() == 'namespace':
+                scope_namespace = ScopeNamespace(target_namespace=target_namespace)
+                ext_scope = Scope(namespace=scope_namespace, cluster=None)
+
+        create_identity = True
+        extension_instance = ExtensionInstance(
+            extension_type=extension_type,
+            auto_upgrade_minor_version=auto_upgrade_minor_version,
+            release_train=release_train,
+            version=version,
+            scope=ext_scope,
+            configuration_settings=configuration_settings,
+            configuration_protected_settings=configuration_protected_settings,
+        )
+        return extension_instance, name, create_identity
+
+    def Update(self, extension, auto_upgrade_minor_version, release_train, version):
+        """Default validations & defaults for Update
+           Must create and return a valid 'ExtensionInstanceUpdate' object.
+
+        """
+        return ExtensionInstanceUpdate(
+            auto_upgrade_minor_version=auto_upgrade_minor_version,
+            release_train=release_train,
+            version=version
+        )
+
+    def Delete(self, client, resource_group_name, cluster_name, name, cluster_type):
+        pass