[AutoPR hdinsight/resource-manager] [HDInsight] Refactoring and bug fixes

azure-mgmt-hdinsight/azure/mgmt/hdinsight/hd_insight_management_client.py

@@ -15,9 +15,9 @@
 from .version import VERSION
 from .operations.clusters_operations import ClustersOperations
 from .operations.applications_operations import ApplicationsOperations
-from .operations.location_operations import LocationOperations
+from .operations.locations_operations import LocationsOperations
 from .operations.configurations_operations import ConfigurationsOperations
-from .operations.extension_operations import ExtensionOperations
+from .operations.extensions_operations import ExtensionsOperations
 from .operations.script_actions_operations import ScriptActionsOperations
 from .operations.script_execution_history_operations import ScriptExecutionHistoryOperations
 from .operations.operations import Operations
@@ -68,12 +68,12 @@ class HDInsightManagementClient(object):
     :vartype clusters: azure.mgmt.hdinsight.operations.ClustersOperations
     :ivar applications: Applications operations
     :vartype applications: azure.mgmt.hdinsight.operations.ApplicationsOperations
-    :ivar location: Location operations
-    :vartype location: azure.mgmt.hdinsight.operations.LocationOperations
+    :ivar locations: Locations operations
+    :vartype locations: azure.mgmt.hdinsight.operations.LocationsOperations
     :ivar configurations: Configurations operations
     :vartype configurations: azure.mgmt.hdinsight.operations.ConfigurationsOperations
-    :ivar extension: Extension operations
-    :vartype extension: azure.mgmt.hdinsight.operations.ExtensionOperations
+    :ivar extensions: Extensions operations
+    :vartype extensions: azure.mgmt.hdinsight.operations.ExtensionsOperations
     :ivar script_actions: ScriptActions operations
     :vartype script_actions: azure.mgmt.hdinsight.operations.ScriptActionsOperations
     :ivar script_execution_history: ScriptExecutionHistory operations
@@ -98,19 +98,19 @@ def __init__(
         self._client = ServiceClient(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
-        self.api_version = '2015-03-01-preview'
+        self.api_version = '2018-06-01-preview'
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 
         self.clusters = ClustersOperations(
             self._client, self.config, self._serialize, self._deserialize)
         self.applications = ApplicationsOperations(
             self._client, self.config, self._serialize, self._deserialize)
-        self.location = LocationOperations(
+        self.locations = LocationsOperations(
             self._client, self.config, self._serialize, self._deserialize)
         self.configurations = ConfigurationsOperations(
             self._client, self.config, self._serialize, self._deserialize)
-        self.extension = ExtensionOperations(
+        self.extensions = ExtensionsOperations(
             self._client, self.config, self._serialize, self._deserialize)
         self.script_actions = ScriptActionsOperations(
             self._client, self.config, self._serialize, self._deserialize)

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

@@ -42,25 +42,20 @@
 from .resource import Resource
 from .tracked_resource import TrackedResource
 from .proxy_resource import ProxyResource
-from .operation_display import OperationDisplay
-from .operation import Operation
+from .error_response import ErrorResponse, ErrorResponseException
 from .application_get_https_endpoint import ApplicationGetHttpsEndpoint
 from .application_get_endpoint import ApplicationGetEndpoint
-from .application_get_properties import ApplicationGetProperties
+from .application_properties import ApplicationProperties
 from .application import Application
-from .version_spec import VersionSpec
-from .versions_capability import VersionsCapability
-from .regions_capability import RegionsCapability
-from .vm_sizes_capability import VmSizesCapability
-from .vm_size_compatibility_filter import VmSizeCompatibilityFilter
-from .regional_quota_capability import RegionalQuotaCapability
-from .quota_capability import QuotaCapability
-from .capabilities_result import CapabilitiesResult
-from .http_connectivity_settings import HttpConnectivitySettings
+from .localized_name import LocalizedName
+from .usage import Usage
+from .usages_list_result import UsagesListResult
 from .extension import Extension
 from .cluster_monitoring_response import ClusterMonitoringResponse
 from .cluster_monitoring_request import ClusterMonitoringRequest
 from .script_action_persisted_get_response_spec import ScriptActionPersistedGetResponseSpec
+from .operation_display import OperationDisplay
+from .operation import Operation
 from .cluster_paged import ClusterPaged
 from .application_paged import ApplicationPaged
 from .runtime_script_action_detail_paged import RuntimeScriptActionDetailPaged
@@ -107,25 +102,20 @@
     'Resource',
     'TrackedResource',
     'ProxyResource',
-    'OperationDisplay',
-    'Operation',
+    'ErrorResponse', 'ErrorResponseException',
     'ApplicationGetHttpsEndpoint',
     'ApplicationGetEndpoint',
-    'ApplicationGetProperties',
+    'ApplicationProperties',
     'Application',
-    'VersionSpec',
-    'VersionsCapability',
-    'RegionsCapability',
-    'VmSizesCapability',
-    'VmSizeCompatibilityFilter',
-    'RegionalQuotaCapability',
-    'QuotaCapability',
-    'CapabilitiesResult',
-    'HttpConnectivitySettings',
+    'LocalizedName',
+    'Usage',
+    'UsagesListResult',
     'Extension',
     'ClusterMonitoringResponse',
     'ClusterMonitoringRequest',
     'ScriptActionPersistedGetResponseSpec',
+    'OperationDisplay',
+    'Operation',
     'ClusterPaged',
     'ApplicationPaged',
     'RuntimeScriptActionDetailPaged',

azure-mgmt-hdinsight/azure/mgmt/hdinsight/models/application.py

@@ -29,7 +29,7 @@ class Application(ProxyResource):
     :param tags: The tags for the application.
     :type tags: dict[str, str]
     :param properties: The properties of the application.
-    :type properties: ~azure.mgmt.hdinsight.models.ApplicationGetProperties
+    :type properties: ~azure.mgmt.hdinsight.models.ApplicationProperties
     """
 
     _validation = {
@@ -44,7 +44,7 @@ class Application(ProxyResource):
         'type': {'key': 'type', 'type': 'str'},
         'etag': {'key': 'etag', 'type': 'str'},
         'tags': {'key': 'tags', 'type': '{str}'},
-        'properties': {'key': 'properties', 'type': 'ApplicationGetProperties'},
+        'properties': {'key': 'properties', 'type': 'ApplicationProperties'},
     }
 
     def __init__(self, etag=None, tags=None, properties=None):

azure-mgmt-hdinsight/azure/mgmt/hdinsight/models/application_get_properties.py → azure-mgmt-hdinsight/azure/mgmt/hdinsight/models/application_properties.py

@@ -12,7 +12,7 @@
 from msrest.serialization import Model
 
 
-class ApplicationGetProperties(Model):
+class ApplicationProperties(Model):
     """The HDInsight cluster application GET response.
 
     Variables are only populated by the server, and will be ignored when
@@ -71,7 +71,7 @@ class ApplicationGetProperties(Model):
     }
 
     def __init__(self, compute_profile=None, install_script_actions=None, uninstall_script_actions=None, https_endpoints=None, ssh_endpoints=None, application_type=None, errors=None, additional_properties=None):
-        super(ApplicationGetProperties, self).__init__()
+        super(ApplicationProperties, self).__init__()
         self.compute_profile = compute_profile
         self.install_script_actions = install_script_actions
         self.uninstall_script_actions = uninstall_script_actions

azure-mgmt-hdinsight/azure/mgmt/hdinsight/models/cluster_monitoring_response.py

@@ -24,8 +24,8 @@ class ClusterMonitoringResponse(Model):
     """
 
     _attribute_map = {
-        'cluster_monitoring_enabled': {'key': 'ClusterMonitoringEnabled', 'type': 'bool'},
-        'workspace_id': {'key': 'WorkspaceId', 'type': 'str'},
+        'cluster_monitoring_enabled': {'key': 'clusterMonitoringEnabled', 'type': 'bool'},
+        'workspace_id': {'key': 'workspaceId', 'type': 'str'},
     }
 
     def __init__(self, cluster_monitoring_enabled=None, workspace_id=None):

azure-mgmt-hdinsight/azure/mgmt/hdinsight/models/error_response.py

@@ -0,0 +1,45 @@
+# 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
+from msrest.exceptions import HttpOperationError
+
+
+class ErrorResponse(Model):
+    """Describes the format of Error response.
+
+    :param code: Error code
+    :type code: str
+    :param message: Error message indicating why the operation failed.
+    :type message: str
+    """
+
+    _attribute_map = {
+        'code': {'key': 'code', 'type': 'str'},
+        'message': {'key': 'message', 'type': 'str'},
+    }
+
+    def __init__(self, code=None, message=None):
+        super(ErrorResponse, self).__init__()
+        self.code = code
+        self.message = message
+
+
+class ErrorResponseException(HttpOperationError):
+    """Server responsed with exception of type: 'ErrorResponse'.
+
+    :param deserialize: A deserializer
+    :param response: Server response to be deserialized.
+    """
+
+    def __init__(self, deserialize, response, *args):
+
+        super(ErrorResponseException, self).__init__(deserialize, response, 'ErrorResponse', *args)

azure-mgmt-hdinsight/azure/mgmt/hdinsight/models/localized_name.py

@@ -0,0 +1,32 @@
+# 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 LocalizedName(Model):
+    """The details about the localizable name of a type of usage.
+
+    :param value: The name of the used resource.
+    :type value: str
+    :param localized_value: The localized name of the used resource.
+    :type localized_value: str
+    """
+
+    _attribute_map = {
+        'value': {'key': 'value', 'type': 'str'},
+        'localized_value': {'key': 'localizedValue', 'type': 'str'},
+    }
+
+    def __init__(self, value=None, localized_value=None):
+        super(LocalizedName, self).__init__()
+        self.value = value
+        self.localized_value = localized_value

azure-mgmt-hdinsight/azure/mgmt/hdinsight/models/operation_display.py

@@ -18,7 +18,7 @@ class OperationDisplay(Model):
     :param provider: The service provider: Microsoft.HDInsight
     :type provider: str
     :param resource: The resource on which the operation is performed:
-     Cluster, Capabilities, etc.
+     Cluster, Applications, etc.
     :type resource: str
     :param operation: The operation type: read, write, delete, etc.
     :type operation: str