[AutoPR containerservices/resource-manager] [WIP] - Container Service - Add OpenShift support

azure-mgmt-containerservice/MANIFEST.in

@@ -1,2 +1 @@
 include *.rst
-include azure_bdist_wheel.py

azure-mgmt-containerservice/azure/__init__.py

@@ -1 +1 @@
-__import__('pkg_resources').declare_namespace(__name__)
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)

azure-mgmt-containerservice/azure/mgmt/__init__.py

@@ -1 +1 @@
-__import__('pkg_resources').declare_namespace(__name__)
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)

azure-mgmt-containerservice/azure/mgmt/containerservice/container_service_client.py

@@ -13,6 +13,7 @@
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 from .version import VERSION
+from .operations.open_shift_managed_clusters_operations import OpenShiftManagedClustersOperations
 from .operations.container_services_operations import ContainerServicesOperations
 from .operations.operations import Operations
 from .operations.managed_clusters_operations import ManagedClustersOperations
@@ -59,6 +60,8 @@ class ContainerServiceClient(SDKClient):
     :ivar config: Configuration for client.
     :vartype config: ContainerServiceClientConfiguration
 
+    :ivar open_shift_managed_clusters: OpenShiftManagedClusters operations
+    :vartype open_shift_managed_clusters: azure.mgmt.containerservice.operations.OpenShiftManagedClustersOperations
     :ivar container_services: ContainerServices operations
     :vartype container_services: azure.mgmt.containerservice.operations.ContainerServicesOperations
     :ivar operations: Operations operations
@@ -86,6 +89,8 @@ def __init__(
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 
+        self.open_shift_managed_clusters = OpenShiftManagedClustersOperations(
+            self._client, self.config, self._serialize, self._deserialize)
         self.container_services = ContainerServicesOperations(
             self._client, self.config, self._serialize, self._deserialize)
         self.operations = Operations(

azure-mgmt-containerservice/azure/mgmt/containerservice/models/__init__.py

@@ -11,6 +11,17 @@
 
 try:
     from .resource_py3 import Resource
+    from .purchase_plan_py3 import PurchasePlan
+    from .open_shift_router_profile_py3 import OpenShiftRouterProfile
+    from .network_profile_py3 import NetworkProfile
+    from .open_shift_managed_cluster_master_pool_profile_py3 import OpenShiftManagedClusterMasterPoolProfile
+    from .open_shift_managed_cluster_agent_pool_profile_py3 import OpenShiftManagedClusterAgentPoolProfile
+    from .open_shift_managed_cluster_base_identity_provider_py3 import OpenShiftManagedClusterBaseIdentityProvider
+    from .open_shift_managed_cluster_identity_provider_py3 import OpenShiftManagedClusterIdentityProvider
+    from .open_shift_managed_cluster_auth_profile_py3 import OpenShiftManagedClusterAuthProfile
+    from .open_shift_managed_cluster_py3 import OpenShiftManagedCluster
+    from .open_shift_managed_cluster_aad_identity_provider_py3 import OpenShiftManagedClusterAADIdentityProvider
+    from .tags_object_py3 import TagsObject
     from .container_service_custom_profile_py3 import ContainerServiceCustomProfile
     from .key_vault_secret_ref_py3 import KeyVaultSecretRef
     from .container_service_service_principal_profile_py3 import ContainerServiceServicePrincipalProfile
@@ -25,7 +36,6 @@
     from .container_service_diagnostics_profile_py3 import ContainerServiceDiagnosticsProfile
     from .container_service_py3 import ContainerService
     from .operation_value_py3 import OperationValue
-    from .tags_object_py3 import TagsObject
     from .managed_cluster_service_principal_profile_py3 import ManagedClusterServicePrincipalProfile
     from .managed_cluster_agent_pool_profile_py3 import ManagedClusterAgentPoolProfile
     from .container_service_network_profile_py3 import ContainerServiceNetworkProfile
@@ -42,6 +52,17 @@
     from .orchestrator_version_profile_list_result_py3 import OrchestratorVersionProfileListResult
 except (SyntaxError, ImportError):
     from .resource import Resource
+    from .purchase_plan import PurchasePlan
+    from .open_shift_router_profile import OpenShiftRouterProfile
+    from .network_profile import NetworkProfile
+    from .open_shift_managed_cluster_master_pool_profile import OpenShiftManagedClusterMasterPoolProfile
+    from .open_shift_managed_cluster_agent_pool_profile import OpenShiftManagedClusterAgentPoolProfile
+    from .open_shift_managed_cluster_base_identity_provider import OpenShiftManagedClusterBaseIdentityProvider
+    from .open_shift_managed_cluster_identity_provider import OpenShiftManagedClusterIdentityProvider
+    from .open_shift_managed_cluster_auth_profile import OpenShiftManagedClusterAuthProfile
+    from .open_shift_managed_cluster import OpenShiftManagedCluster
+    from .open_shift_managed_cluster_aad_identity_provider import OpenShiftManagedClusterAADIdentityProvider
+    from .tags_object import TagsObject
     from .container_service_custom_profile import ContainerServiceCustomProfile
     from .key_vault_secret_ref import KeyVaultSecretRef
     from .container_service_service_principal_profile import ContainerServiceServicePrincipalProfile
@@ -56,7 +77,6 @@
     from .container_service_diagnostics_profile import ContainerServiceDiagnosticsProfile
     from .container_service import ContainerService
     from .operation_value import OperationValue
-    from .tags_object import TagsObject
     from .managed_cluster_service_principal_profile import ManagedClusterServicePrincipalProfile
     from .managed_cluster_agent_pool_profile import ManagedClusterAgentPoolProfile
     from .container_service_network_profile import ContainerServiceNetworkProfile
@@ -75,16 +95,29 @@
 from .operation_value_paged import OperationValuePaged
 from .managed_cluster_paged import ManagedClusterPaged
 from .container_service_client_enums import (
+    OSType,
+    OpenShiftContainerServiceVMSize,
+    OpenShiftAgentPoolProfileRole,
     ContainerServiceStorageProfileTypes,
     ContainerServiceVMSizeTypes,
     ContainerServiceOrchestratorTypes,
-    OSType,
     NetworkPlugin,
     NetworkPolicy,
 )
 
 __all__ = [
     'Resource',
+    'PurchasePlan',
+    'OpenShiftRouterProfile',
+    'NetworkProfile',
+    'OpenShiftManagedClusterMasterPoolProfile',
+    'OpenShiftManagedClusterAgentPoolProfile',
+    'OpenShiftManagedClusterBaseIdentityProvider',
+    'OpenShiftManagedClusterIdentityProvider',
+    'OpenShiftManagedClusterAuthProfile',
+    'OpenShiftManagedCluster',
+    'OpenShiftManagedClusterAADIdentityProvider',
+    'TagsObject',
     'ContainerServiceCustomProfile',
     'KeyVaultSecretRef',
     'ContainerServiceServicePrincipalProfile',
@@ -99,7 +132,6 @@
     'ContainerServiceDiagnosticsProfile',
     'ContainerService',
     'OperationValue',
-    'TagsObject',
     'ManagedClusterServicePrincipalProfile',
     'ManagedClusterAgentPoolProfile',
     'ContainerServiceNetworkProfile',
@@ -117,10 +149,12 @@
     'ContainerServicePaged',
     'OperationValuePaged',
     'ManagedClusterPaged',
+    'OSType',
+    'OpenShiftContainerServiceVMSize',
+    'OpenShiftAgentPoolProfileRole',
     'ContainerServiceStorageProfileTypes',
     'ContainerServiceVMSizeTypes',
     'ContainerServiceOrchestratorTypes',
-    'OSType',
     'NetworkPlugin',
     'NetworkPolicy',
 ]

azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_client_enums.py

@@ -12,6 +12,24 @@
 from enum import Enum
 
 
+class OSType(str, Enum):
+
+    linux = "Linux"
+    windows = "Windows"
+
+
+class OpenShiftContainerServiceVMSize(str, Enum):
+
+    standard_d2s_v3 = "Standard_D2s_v3"
+    standard_d4s_v3 = "Standard_D4s_v3"
+
+
+class OpenShiftAgentPoolProfileRole(str, Enum):
+
+    compute = "compute"
+    infra = "infra"
+
+
 class ContainerServiceStorageProfileTypes(str, Enum):
 
     storage_account = "StorageAccount"
@@ -205,12 +223,6 @@ class ContainerServiceOrchestratorTypes(str, Enum):
     custom = "Custom"
 
 
-class OSType(str, Enum):
-
-    linux = "Linux"
-    windows = "Windows"
-
-
 class NetworkPlugin(str, Enum):
 
     azure = "azure"

azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_aad_profile.py

@@ -21,7 +21,7 @@ class ManagedClusterAADProfile(Model):
     :type client_app_id: str
     :param server_app_id: Required. The server AAD application ID.
     :type server_app_id: str
-    :param server_app_secret: Required. The server AAD application secret.
+    :param server_app_secret: The server AAD application secret.
     :type server_app_secret: str
     :param tenant_id: The AAD tenant ID to use for authentication. If not
      specified, will use the tenant of the deployment subscription.
@@ -31,7 +31,6 @@ class ManagedClusterAADProfile(Model):
     _validation = {
         'client_app_id': {'required': True},
         'server_app_id': {'required': True},
-        'server_app_secret': {'required': True},
     }
 
     _attribute_map = {

azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_aad_profile_py3.py

@@ -21,7 +21,7 @@ class ManagedClusterAADProfile(Model):
     :type client_app_id: str
     :param server_app_id: Required. The server AAD application ID.
     :type server_app_id: str
-    :param server_app_secret: Required. The server AAD application secret.
+    :param server_app_secret: The server AAD application secret.
     :type server_app_secret: str
     :param tenant_id: The AAD tenant ID to use for authentication. If not
      specified, will use the tenant of the deployment subscription.
@@ -31,7 +31,6 @@ class ManagedClusterAADProfile(Model):
     _validation = {
         'client_app_id': {'required': True},
         'server_app_id': {'required': True},
-        'server_app_secret': {'required': True},
     }
 
     _attribute_map = {
@@ -41,7 +40,7 @@ class ManagedClusterAADProfile(Model):
         'tenant_id': {'key': 'tenantID', 'type': 'str'},
     }
 
-    def __init__(self, *, client_app_id: str, server_app_id: str, server_app_secret: str, tenant_id: str=None, **kwargs) -> None:
+    def __init__(self, *, client_app_id: str, server_app_id: str, server_app_secret: str=None, tenant_id: str=None, **kwargs) -> None:
         super(ManagedClusterAADProfile, self).__init__(**kwargs)
         self.client_app_id = client_app_id
         self.server_app_id = server_app_id

azure-mgmt-containerservice/azure/mgmt/containerservice/models/network_profile.py

@@ -0,0 +1,33 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class NetworkProfile(Model):
+    """Represents the OpenShift networking configuration.
+
+    :param vnet_cidr: CIDR for the OpenShift Vnet. Default value: "10.0.0.0/8"
+     .
+    :type vnet_cidr: str
+    :param peer_vnet_id: CIDR of the Vnet to peer.
+    :type peer_vnet_id: str
+    """
+
+    _attribute_map = {
+        'vnet_cidr': {'key': 'vnetCidr', 'type': 'str'},
+        'peer_vnet_id': {'key': 'peerVnetId', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(NetworkProfile, self).__init__(**kwargs)
+        self.vnet_cidr = kwargs.get('vnet_cidr', "10.0.0.0/8")
+        self.peer_vnet_id = kwargs.get('peer_vnet_id', None)

azure-mgmt-containerservice/azure/mgmt/containerservice/models/network_profile_py3.py

@@ -0,0 +1,33 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class NetworkProfile(Model):
+    """Represents the OpenShift networking configuration.
+
+    :param vnet_cidr: CIDR for the OpenShift Vnet. Default value: "10.0.0.0/8"
+     .
+    :type vnet_cidr: str
+    :param peer_vnet_id: CIDR of the Vnet to peer.
+    :type peer_vnet_id: str
+    """
+
+    _attribute_map = {
+        'vnet_cidr': {'key': 'vnetCidr', 'type': 'str'},
+        'peer_vnet_id': {'key': 'peerVnetId', 'type': 'str'},
+    }
+
+    def __init__(self, *, vnet_cidr: str="10.0.0.0/8", peer_vnet_id: str=None, **kwargs) -> None:
+        super(NetworkProfile, self).__init__(**kwargs)
+        self.vnet_cidr = vnet_cidr
+        self.peer_vnet_id = peer_vnet_id

azure-mgmt-containerservice/azure/mgmt/containerservice/models/open_shift_managed_cluster.py

@@ -0,0 +1,102 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from .resource import Resource
+
+
+class OpenShiftManagedCluster(Resource):
+    """OpenShift Managed cluster.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :ivar id: Resource Id
+    :vartype id: str
+    :ivar name: Resource name
+    :vartype name: str
+    :ivar type: Resource type
+    :vartype type: str
+    :param location: Required. Resource location
+    :type location: str
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param plan: Define the resource plan as required by ARM for billing
+     purposes
+    :type plan: ~azure.mgmt.containerservice.models.PurchasePlan
+    :ivar provisioning_state: The current deployment or provisioning state,
+     which only appears in the response.
+    :vartype provisioning_state: str
+    :param open_shift_version: Required. Version of OpenShift specified when
+     creating the cluster.
+    :type open_shift_version: str
+    :param public_hostname: Optional user-specified FQDN for OpenShift API
+     server.
+    :type public_hostname: str
+    :param fqdn: User-specified FQDN for OpenShift API server loadbalancer
+     internal hostname.
+    :type fqdn: str
+    :param network_profile: Configuration for OpenShift networking.
+    :type network_profile: ~azure.mgmt.containerservice.models.NetworkProfile
+    :param router_profiles: Configuration for OpenShift router(s).
+    :type router_profiles:
+     list[~azure.mgmt.containerservice.models.OpenShiftRouterProfile]
+    :param master_pool_profile: Configuration for OpenShift master VMs.
+    :type master_pool_profile:
+     ~azure.mgmt.containerservice.models.OpenShiftManagedClusterMasterPoolProfile
+    :param agent_pool_profiles: Configuration of OpenShift cluster VMs.
+    :type agent_pool_profiles:
+     list[~azure.mgmt.containerservice.models.OpenShiftManagedClusterAgentPoolProfile]
+    :param auth_profile: Configures OpenShift authentication.
+    :type auth_profile:
+     ~azure.mgmt.containerservice.models.OpenShiftManagedClusterAuthProfile
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': True},
+        'provisioning_state': {'readonly': True},
+        'open_shift_version': {'required': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'location': {'key': 'location', 'type': 'str'},
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'plan': {'key': 'plan', 'type': 'PurchasePlan'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+        'open_shift_version': {'key': 'properties.openShiftVersion', 'type': 'str'},
+        'public_hostname': {'key': 'properties.publicHostname', 'type': 'str'},
+        'fqdn': {'key': 'properties.fqdn', 'type': 'str'},
+        'network_profile': {'key': 'properties.networkProfile', 'type': 'NetworkProfile'},
+        'router_profiles': {'key': 'properties.routerProfiles', 'type': '[OpenShiftRouterProfile]'},
+        'master_pool_profile': {'key': 'properties.masterPoolProfile', 'type': 'OpenShiftManagedClusterMasterPoolProfile'},
+        'agent_pool_profiles': {'key': 'properties.agentPoolProfiles', 'type': '[OpenShiftManagedClusterAgentPoolProfile]'},
+        'auth_profile': {'key': 'properties.authProfile', 'type': 'OpenShiftManagedClusterAuthProfile'},
+    }
+
+    def __init__(self, **kwargs):
+        super(OpenShiftManagedCluster, self).__init__(**kwargs)
+        self.plan = kwargs.get('plan', None)
+        self.provisioning_state = None
+        self.open_shift_version = kwargs.get('open_shift_version', None)
+        self.public_hostname = kwargs.get('public_hostname', None)
+        self.fqdn = kwargs.get('fqdn', None)
+        self.network_profile = kwargs.get('network_profile', None)
+        self.router_profiles = kwargs.get('router_profiles', None)
+        self.master_pool_profile = kwargs.get('master_pool_profile', None)
+        self.agent_pool_profiles = kwargs.get('agent_pool_profiles', None)
+        self.auth_profile = kwargs.get('auth_profile', None)