[AutoPR machinelearningservices/resource-manager] [DO NOT MERGE ] Migrate version to 2019-05-01 in new folder and Adding usages by VM family support

sdk/azure-mgmt-machinelearningservices/azure/mgmt/machinelearningservices/azure_machine_learning_workspaces.py

@@ -15,6 +15,8 @@
 from .version import VERSION
 from .operations.operations import Operations
 from .operations.workspaces_operations import WorkspacesOperations
+from .operations.usages_operations import UsagesOperations
+from .operations.virtual_machine_sizes_operations import VirtualMachineSizesOperations
 from .operations.machine_learning_compute_operations import MachineLearningComputeOperations
 from . import models
 
@@ -61,6 +63,10 @@ class AzureMachineLearningWorkspaces(SDKClient):
     :vartype operations: azure.mgmt.machinelearningservices.operations.Operations
     :ivar workspaces: Workspaces operations
     :vartype workspaces: azure.mgmt.machinelearningservices.operations.WorkspacesOperations
+    :ivar usages: Usages operations
+    :vartype usages: azure.mgmt.machinelearningservices.operations.UsagesOperations
+    :ivar virtual_machine_sizes: VirtualMachineSizes operations
+    :vartype virtual_machine_sizes: azure.mgmt.machinelearningservices.operations.VirtualMachineSizesOperations
     :ivar machine_learning_compute: MachineLearningCompute operations
     :vartype machine_learning_compute: azure.mgmt.machinelearningservices.operations.MachineLearningComputeOperations
 
@@ -79,13 +85,17 @@ def __init__(
         super(AzureMachineLearningWorkspaces, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
-        self.api_version = '2018-03-01-preview'
+        self.api_version = '2019-05-01'
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 
         self.operations = Operations(
             self._client, self.config, self._serialize, self._deserialize)
         self.workspaces = WorkspacesOperations(
             self._client, self.config, self._serialize, self._deserialize)
+        self.usages = UsagesOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.virtual_machine_sizes = VirtualMachineSizesOperations(
+            self._client, self.config, self._serialize, self._deserialize)
         self.machine_learning_compute = MachineLearningComputeOperations(
             self._client, self.config, self._serialize, self._deserialize)

sdk/azure-mgmt-machinelearningservices/azure/mgmt/machinelearningservices/models/__init__.py

@@ -14,8 +14,13 @@
     from .operation_py3 import Operation
     from .workspace_py3 import Workspace
     from .workspace_update_parameters_py3 import WorkspaceUpdateParameters
+    from .usage_name_py3 import UsageName
+    from .usage_py3 import Usage
+    from .virtual_machine_size_py3 import VirtualMachineSize
+    from .virtual_machine_size_list_result_py3 import VirtualMachineSizeListResult
     from .identity_py3 import Identity
     from .resource_py3 import Resource
+    from .resource_id_py3 import ResourceId
     from .password_py3 import Password
     from .registry_list_credentials_result_py3 import RegistryListCredentialsResult
     from .list_workspace_keys_result_py3 import ListWorkspaceKeysResult
@@ -26,28 +31,45 @@
     from .compute_resource_py3 import ComputeResource
     from .system_service_py3 import SystemService
     from .ssl_configuration_py3 import SslConfiguration
+    from .aks_networking_configuration_py3 import AksNetworkingConfiguration
     from .aks_properties_py3 import AKSProperties
     from .aks_py3 import AKS
     from .scale_settings_py3 import ScaleSettings
-    from .batch_ai_properties_py3 import BatchAIProperties
-    from .batch_ai_py3 import BatchAI
+    from .user_account_credentials_py3 import UserAccountCredentials
+    from .node_state_counts_py3 import NodeStateCounts
+    from .aml_compute_properties_py3 import AmlComputeProperties
+    from .aml_compute_py3 import AmlCompute
     from .virtual_machine_ssh_credentials_py3 import VirtualMachineSshCredentials
     from .virtual_machine_properties_py3 import VirtualMachineProperties
     from .virtual_machine_py3 import VirtualMachine
     from .hd_insight_properties_py3 import HDInsightProperties
     from .hd_insight_py3 import HDInsight
     from .data_factory_py3 import DataFactory
+    from .databricks_properties_py3 import DatabricksProperties
+    from .databricks_py3 import Databricks
+    from .data_lake_analytics_properties_py3 import DataLakeAnalyticsProperties
+    from .data_lake_analytics_py3 import DataLakeAnalytics
     from .service_principal_credentials_py3 import ServicePrincipalCredentials
+    from .cluster_update_parameters_py3 import ClusterUpdateParameters
+    from .compute_nodes_information_py3 import ComputeNodesInformation
+    from .aml_compute_node_information_py3 import AmlComputeNodeInformation
+    from .aml_compute_nodes_information_py3 import AmlComputeNodesInformation
     from .compute_secrets_py3 import ComputeSecrets
     from .aks_compute_secrets_py3 import AksComputeSecrets
     from .virtual_machine_secrets_py3 import VirtualMachineSecrets
+    from .databricks_compute_secrets_py3 import DatabricksComputeSecrets
 except (SyntaxError, ImportError):
     from .operation_display import OperationDisplay
     from .operation import Operation
     from .workspace import Workspace
     from .workspace_update_parameters import WorkspaceUpdateParameters
+    from .usage_name import UsageName
+    from .usage import Usage
+    from .virtual_machine_size import VirtualMachineSize
+    from .virtual_machine_size_list_result import VirtualMachineSizeListResult
     from .identity import Identity
     from .resource import Resource
+    from .resource_id import ResourceId
     from .password import Password
     from .registry_list_credentials_result import RegistryListCredentialsResult
     from .list_workspace_keys_result import ListWorkspaceKeysResult
@@ -58,37 +80,59 @@
     from .compute_resource import ComputeResource
     from .system_service import SystemService
     from .ssl_configuration import SslConfiguration
+    from .aks_networking_configuration import AksNetworkingConfiguration
     from .aks_properties import AKSProperties
     from .aks import AKS
     from .scale_settings import ScaleSettings
-    from .batch_ai_properties import BatchAIProperties
-    from .batch_ai import BatchAI
+    from .user_account_credentials import UserAccountCredentials
+    from .node_state_counts import NodeStateCounts
+    from .aml_compute_properties import AmlComputeProperties
+    from .aml_compute import AmlCompute
     from .virtual_machine_ssh_credentials import VirtualMachineSshCredentials
     from .virtual_machine_properties import VirtualMachineProperties
     from .virtual_machine import VirtualMachine
     from .hd_insight_properties import HDInsightProperties
     from .hd_insight import HDInsight
     from .data_factory import DataFactory
+    from .databricks_properties import DatabricksProperties
+    from .databricks import Databricks
+    from .data_lake_analytics_properties import DataLakeAnalyticsProperties
+    from .data_lake_analytics import DataLakeAnalytics
     from .service_principal_credentials import ServicePrincipalCredentials
+    from .cluster_update_parameters import ClusterUpdateParameters
+    from .compute_nodes_information import ComputeNodesInformation
+    from .aml_compute_node_information import AmlComputeNodeInformation
+    from .aml_compute_nodes_information import AmlComputeNodesInformation
     from .compute_secrets import ComputeSecrets
     from .aks_compute_secrets import AksComputeSecrets
     from .virtual_machine_secrets import VirtualMachineSecrets
+    from .databricks_compute_secrets import DatabricksComputeSecrets
 from .operation_paged import OperationPaged
 from .workspace_paged import WorkspacePaged
+from .usage_paged import UsagePaged
 from .compute_resource_paged import ComputeResourcePaged
 from .azure_machine_learning_workspaces_enums import (
     ProvisioningState,
+    UsageUnit,
     ResourceIdentityType,
+    VmPriority,
+    AllocationState,
     ComputeType,
+    UnderlyingResourceAction,
 )
 
 __all__ = [
     'OperationDisplay',
     'Operation',
     'Workspace',
     'WorkspaceUpdateParameters',
+    'UsageName',
+    'Usage',
+    'VirtualMachineSize',
+    'VirtualMachineSizeListResult',
     'Identity',
     'Resource',
+    'ResourceId',
     'Password',
     'RegistryListCredentialsResult',
     'ListWorkspaceKeysResult',
@@ -99,25 +143,42 @@
     'ComputeResource',
     'SystemService',
     'SslConfiguration',
+    'AksNetworkingConfiguration',
     'AKSProperties',
     'AKS',
     'ScaleSettings',
-    'BatchAIProperties',
-    'BatchAI',
+    'UserAccountCredentials',
+    'NodeStateCounts',
+    'AmlComputeProperties',
+    'AmlCompute',
     'VirtualMachineSshCredentials',
     'VirtualMachineProperties',
     'VirtualMachine',
     'HDInsightProperties',
     'HDInsight',
     'DataFactory',
+    'DatabricksProperties',
+    'Databricks',
+    'DataLakeAnalyticsProperties',
+    'DataLakeAnalytics',
     'ServicePrincipalCredentials',
+    'ClusterUpdateParameters',
+    'ComputeNodesInformation',
+    'AmlComputeNodeInformation',
+    'AmlComputeNodesInformation',
     'ComputeSecrets',
     'AksComputeSecrets',
     'VirtualMachineSecrets',
+    'DatabricksComputeSecrets',
     'OperationPaged',
     'WorkspacePaged',
+    'UsagePaged',
     'ComputeResourcePaged',
     'ProvisioningState',
+    'UsageUnit',
     'ResourceIdentityType',
+    'VmPriority',
+    'AllocationState',
     'ComputeType',
+    'UnderlyingResourceAction',
 ]

sdk/azure-mgmt-machinelearningservices/azure/mgmt/machinelearningservices/models/aks.py

@@ -34,11 +34,15 @@ class AKS(Compute):
     :vartype created_on: datetime
     :ivar modified_on: The date and time when the compute was last modified.
     :vartype modified_on: datetime
-    :param resource_id: ARM resource id of the compute
+    :param resource_id: ARM resource id of the underlying compute
     :type resource_id: str
     :ivar provisioning_errors: Errors during provisioning
     :vartype provisioning_errors:
      list[~azure.mgmt.machinelearningservices.models.MachineLearningServiceError]
+    :ivar is_attached_compute: Indicating whether the compute was provisioned
+     by user and brought from outside if true, or machine learning service
+     provisioned it if false.
+    :vartype is_attached_compute: bool
     :param compute_type: Required. Constant filled by server.
     :type compute_type: str
     :param properties: AKS properties
@@ -50,6 +54,7 @@ class AKS(Compute):
         'created_on': {'readonly': True},
         'modified_on': {'readonly': True},
         'provisioning_errors': {'readonly': True},
+        'is_attached_compute': {'readonly': True},
         'compute_type': {'required': True},
     }
 
@@ -61,6 +66,7 @@ class AKS(Compute):
         'modified_on': {'key': 'modifiedOn', 'type': 'iso-8601'},
         'resource_id': {'key': 'resourceId', 'type': 'str'},
         'provisioning_errors': {'key': 'provisioningErrors', 'type': '[MachineLearningServiceError]'},
+        'is_attached_compute': {'key': 'isAttachedCompute', 'type': 'bool'},
         'compute_type': {'key': 'computeType', 'type': 'str'},
         'properties': {'key': 'properties', 'type': 'AKSProperties'},
     }

sdk/azure-mgmt-machinelearningservices/azure/mgmt/machinelearningservices/models/aks_networking_configuration.py

@@ -0,0 +1,52 @@
+# 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 AksNetworkingConfiguration(Model):
+    """Advance configuration for AKS networking.
+
+    :param subnet_id: Virtual network subnet resource ID the compute nodes
+     belong to
+    :type subnet_id: str
+    :param service_cidr: A CIDR notation IP range from which to assign service
+     cluster IPs. It must not overlap with any Subnet IP ranges.
+    :type service_cidr: str
+    :param dns_service_ip: An IP address assigned to the Kubernetes DNS
+     service. It must be within the Kubernetes service address range specified
+     in serviceCidr.
+    :type dns_service_ip: str
+    :param docker_bridge_cidr: A CIDR notation IP range assigned to the Docker
+     bridge network. It must not overlap with any Subnet IP ranges or the
+     Kubernetes service address range.
+    :type docker_bridge_cidr: str
+    """
+
+    _validation = {
+        'service_cidr': {'pattern': r'^([0-9]{1,3}\.){3}[0-9]{1,3}(\/([0-9]|[1-2][0-9]|3[0-2]))?$'},
+        'dns_service_ip': {'pattern': r'^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$'},
+        'docker_bridge_cidr': {'pattern': r'^([0-9]{1,3}\.){3}[0-9]{1,3}(\/([0-9]|[1-2][0-9]|3[0-2]))?$'},
+    }
+
+    _attribute_map = {
+        'subnet_id': {'key': 'subnetId', 'type': 'str'},
+        'service_cidr': {'key': 'serviceCidr', 'type': 'str'},
+        'dns_service_ip': {'key': 'dnsServiceIP', 'type': 'str'},
+        'docker_bridge_cidr': {'key': 'dockerBridgeCidr', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(AksNetworkingConfiguration, self).__init__(**kwargs)
+        self.subnet_id = kwargs.get('subnet_id', None)
+        self.service_cidr = kwargs.get('service_cidr', None)
+        self.dns_service_ip = kwargs.get('dns_service_ip', None)
+        self.docker_bridge_cidr = kwargs.get('docker_bridge_cidr', None)

sdk/azure-mgmt-machinelearningservices/azure/mgmt/machinelearningservices/models/aks_networking_configuration_py3.py

@@ -0,0 +1,52 @@
+# 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 AksNetworkingConfiguration(Model):
+    """Advance configuration for AKS networking.
+
+    :param subnet_id: Virtual network subnet resource ID the compute nodes
+     belong to
+    :type subnet_id: str
+    :param service_cidr: A CIDR notation IP range from which to assign service
+     cluster IPs. It must not overlap with any Subnet IP ranges.
+    :type service_cidr: str
+    :param dns_service_ip: An IP address assigned to the Kubernetes DNS
+     service. It must be within the Kubernetes service address range specified
+     in serviceCidr.
+    :type dns_service_ip: str
+    :param docker_bridge_cidr: A CIDR notation IP range assigned to the Docker
+     bridge network. It must not overlap with any Subnet IP ranges or the
+     Kubernetes service address range.
+    :type docker_bridge_cidr: str
+    """
+
+    _validation = {
+        'service_cidr': {'pattern': r'^([0-9]{1,3}\.){3}[0-9]{1,3}(\/([0-9]|[1-2][0-9]|3[0-2]))?$'},
+        'dns_service_ip': {'pattern': r'^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$'},
+        'docker_bridge_cidr': {'pattern': r'^([0-9]{1,3}\.){3}[0-9]{1,3}(\/([0-9]|[1-2][0-9]|3[0-2]))?$'},
+    }
+
+    _attribute_map = {
+        'subnet_id': {'key': 'subnetId', 'type': 'str'},
+        'service_cidr': {'key': 'serviceCidr', 'type': 'str'},
+        'dns_service_ip': {'key': 'dnsServiceIP', 'type': 'str'},
+        'docker_bridge_cidr': {'key': 'dockerBridgeCidr', 'type': 'str'},
+    }
+
+    def __init__(self, *, subnet_id: str=None, service_cidr: str=None, dns_service_ip: str=None, docker_bridge_cidr: str=None, **kwargs) -> None:
+        super(AksNetworkingConfiguration, self).__init__(**kwargs)
+        self.subnet_id = subnet_id
+        self.service_cidr = service_cidr
+        self.dns_service_ip = dns_service_ip
+        self.docker_bridge_cidr = docker_bridge_cidr

sdk/azure-mgmt-machinelearningservices/azure/mgmt/machinelearningservices/models/aks_properties.py

@@ -15,10 +15,13 @@
 class AKSProperties(Model):
     """AKS properties.
 
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
     :param cluster_fqdn: Cluster full qualified domain name
     :type cluster_fqdn: str
-    :param system_services: System services
-    :type system_services:
+    :ivar system_services: System services
+    :vartype system_services:
      list[~azure.mgmt.machinelearningservices.models.SystemService]
     :param agent_count: Number of agents
     :type agent_count: int
@@ -27,9 +30,13 @@ class AKSProperties(Model):
     :param ssl_configuration: SSL configuration
     :type ssl_configuration:
      ~azure.mgmt.machinelearningservices.models.SslConfiguration
+    :param aks_networking_configuration: AKS networking configuration for vnet
+    :type aks_networking_configuration:
+     ~azure.mgmt.machinelearningservices.models.AksNetworkingConfiguration
     """
 
     _validation = {
+        'system_services': {'readonly': True},
         'agent_count': {'minimum': 1},
     }
 
@@ -39,12 +46,14 @@ class AKSProperties(Model):
         'agent_count': {'key': 'agentCount', 'type': 'int'},
         'agent_vm_size': {'key': 'agentVMSize', 'type': 'str'},
         'ssl_configuration': {'key': 'sslConfiguration', 'type': 'SslConfiguration'},
+        'aks_networking_configuration': {'key': 'aksNetworkingConfiguration', 'type': 'AksNetworkingConfiguration'},
     }
 
     def __init__(self, **kwargs):
         super(AKSProperties, self).__init__(**kwargs)
         self.cluster_fqdn = kwargs.get('cluster_fqdn', None)
-        self.system_services = kwargs.get('system_services', None)
+        self.system_services = None
         self.agent_count = kwargs.get('agent_count', None)
         self.agent_vm_size = kwargs.get('agent_vm_size', None)
         self.ssl_configuration = kwargs.get('ssl_configuration', None)
+        self.aks_networking_configuration = kwargs.get('aks_networking_configuration', None)