Skip to content

Commit

Permalink
[Compute] Adding LogAnalytics to Compute spec (#1863)
Browse files Browse the repository at this point in the history
* Generated from 02702702645f7e64ae63f4b6016bcc966f8513d9

Adding 6.1 tag to readme

* Generated from ef99ca24deaaecb3fdb6d1587617a98805cdd61b

Dropping 4th digit from version number for clarity

* Generated from c0dcfcd2e00ac0ac516d28ff343d1f1d40b3d45b

Update readme.md

* updating history to reflect new version

* azure-servicefabric 6.1.2.9

* Restapi auto areddish custom vision swagger (#1771)

* Generated from 0d4e675c639f9fe784946e2267223c132b266fcf

Add automatic Python conf for Custom Vision Prediction

* Generated from 049c2dd356adb296c9c28386207b66cd48781467

Add automatic Python conf to Custom Vision Training

* Generated from 599b21132b4678729ebe24ad4a60439fbf57047c

Fix Prediction Examples

* Generated from disks (#1835) - doc only

added image examples to 2017-12-01

* Restapi auto v sodsou content moderator v2 (#1861)

* Generated from b594737f845e43b28bd77878820b39f8543650d1

Revert version changes

* Generated from d18cc9d65430a8e1a1c3af522db42cbdbdcfe819

Missing Python version

* Generated from 8eb897fbdd6a4dcd68621f9ae311447d478a2ced

Adding LogAnalytics to comptue spec and also including previously missing VM sizes.

* Generated from 03fbec7ef3885d93b5ee939eff0e9de9d4ef0185

Adding response type models in swagger and example files.

* Generated from 2ff7912f1a75581dd595bd47c2cb290d71e9d31e

Updating LogAnalyticsOperationResult to inherit from OperationStatusResponse.

* Generated from 5f2d9322e0bd866cf2bb55bca4bca75d4c799371

Updating example files.
  • Loading branch information
AutorestCI authored and lmazuel committed Mar 9, 2018
1 parent 4d830d8 commit e182820
Show file tree
Hide file tree
Showing 11 changed files with 651 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
from .operations.virtual_machine_scale_set_extensions_operations import VirtualMachineScaleSetExtensionsOperations
from .operations.virtual_machine_scale_set_rolling_upgrades_operations import VirtualMachineScaleSetRollingUpgradesOperations
from .operations.virtual_machine_scale_set_vms_operations import VirtualMachineScaleSetVMsOperations
from .operations.log_analytics_operations import LogAnalyticsOperations
from .operations.virtual_machine_run_commands_operations import VirtualMachineRunCommandsOperations
from . import models

Expand Down Expand Up @@ -93,6 +94,8 @@ class ComputeManagementClient(object):
:vartype virtual_machine_scale_set_rolling_upgrades: azure.mgmt.compute.v2017_12_01.operations.VirtualMachineScaleSetRollingUpgradesOperations
:ivar virtual_machine_scale_set_vms: VirtualMachineScaleSetVMs operations
:vartype virtual_machine_scale_set_vms: azure.mgmt.compute.v2017_12_01.operations.VirtualMachineScaleSetVMsOperations
:ivar log_analytics: LogAnalytics operations
:vartype log_analytics: azure.mgmt.compute.v2017_12_01.operations.LogAnalyticsOperations
:ivar virtual_machine_run_commands: VirtualMachineRunCommands operations
:vartype virtual_machine_run_commands: azure.mgmt.compute.v2017_12_01.operations.VirtualMachineRunCommandsOperations
Expand Down Expand Up @@ -141,5 +144,7 @@ def __init__(
self._client, self.config, self._serialize, self._deserialize)
self.virtual_machine_scale_set_vms = VirtualMachineScaleSetVMsOperations(
self._client, self.config, self._serialize, self._deserialize)
self.log_analytics = LogAnalyticsOperations(
self._client, self.config, self._serialize, self._deserialize)
self.virtual_machine_run_commands = VirtualMachineRunCommandsOperations(
self._client, self.config, self._serialize, self._deserialize)
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,11 @@
from .update_resource import UpdateResource
from .sub_resource_read_only import SubResourceReadOnly
from .operation_status_response import OperationStatusResponse
from .request_rate_by_interval_input import RequestRateByIntervalInput
from .throttled_requests_input import ThrottledRequestsInput
from .log_analytics_input_base import LogAnalyticsInputBase
from .log_analytics_output import LogAnalyticsOutput
from .log_analytics_operation_result import LogAnalyticsOperationResult
from .run_command_input_parameter import RunCommandInputParameter
from .run_command_input import RunCommandInput
from .run_command_parameter_definition import RunCommandParameterDefinition
Expand Down Expand Up @@ -149,6 +154,7 @@
VirtualMachineScaleSetSkuScaleType,
RollingUpgradeStatusCode,
RollingUpgradeActionType,
IntervalInMins,
InstanceViewTypes,
)

Expand Down Expand Up @@ -257,6 +263,11 @@
'UpdateResource',
'SubResourceReadOnly',
'OperationStatusResponse',
'RequestRateByIntervalInput',
'ThrottledRequestsInput',
'LogAnalyticsInputBase',
'LogAnalyticsOutput',
'LogAnalyticsOperationResult',
'RunCommandInputParameter',
'RunCommandInput',
'RunCommandParameterDefinition',
Expand Down Expand Up @@ -292,5 +303,6 @@
'VirtualMachineScaleSetSkuScaleType',
'RollingUpgradeStatusCode',
'RollingUpgradeActionType',
'IntervalInMins',
'InstanceViewTypes',
]
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,12 @@ class VirtualMachineSizeTypes(Enum):
standard_a2m_v2 = "Standard_A2m_v2"
standard_a4m_v2 = "Standard_A4m_v2"
standard_a8m_v2 = "Standard_A8m_v2"
standard_b1s = "Standard_B1s"
standard_b1ms = "Standard_B1ms"
standard_b2s = "Standard_B2s"
standard_b2ms = "Standard_B2ms"
standard_b4ms = "Standard_B4ms"
standard_b8ms = "Standard_B8ms"
standard_d1 = "Standard_D1"
standard_d2 = "Standard_D2"
standard_d3 = "Standard_D3"
Expand All @@ -64,6 +70,18 @@ class VirtualMachineSizeTypes(Enum):
standard_d3_v2 = "Standard_D3_v2"
standard_d4_v2 = "Standard_D4_v2"
standard_d5_v2 = "Standard_D5_v2"
standard_d2_v3 = "Standard_D2_v3"
standard_d4_v3 = "Standard_D4_v3"
standard_d8_v3 = "Standard_D8_v3"
standard_d16_v3 = "Standard_D16_v3"
standard_d32_v3 = "Standard_D32_v3"
standard_d64_v3 = "Standard_D64_v3"
standard_d2s_v3 = "Standard_D2s_v3"
standard_d4s_v3 = "Standard_D4s_v3"
standard_d8s_v3 = "Standard_D8s_v3"
standard_d16s_v3 = "Standard_D16s_v3"
standard_d32s_v3 = "Standard_D32s_v3"
standard_d64s_v3 = "Standard_D64s_v3"
standard_d11_v2 = "Standard_D11_v2"
standard_d12_v2 = "Standard_D12_v2"
standard_d13_v2 = "Standard_D13_v2"
Expand All @@ -87,6 +105,26 @@ class VirtualMachineSizeTypes(Enum):
standard_ds13_v2 = "Standard_DS13_v2"
standard_ds14_v2 = "Standard_DS14_v2"
standard_ds15_v2 = "Standard_DS15_v2"
standard_ds13_4_v2 = "Standard_DS13-4_v2"
standard_ds13_2_v2 = "Standard_DS13-2_v2"
standard_ds14_8_v2 = "Standard_DS14-8_v2"
standard_ds14_4_v2 = "Standard_DS14-4_v2"
standard_e2_v3 = "Standard_E2_v3"
standard_e4_v3 = "Standard_E4_v3"
standard_e8_v3 = "Standard_E8_v3"
standard_e16_v3 = "Standard_E16_v3"
standard_e32_v3 = "Standard_E32_v3"
standard_e64_v3 = "Standard_E64_v3"
standard_e2s_v3 = "Standard_E2s_v3"
standard_e4s_v3 = "Standard_E4s_v3"
standard_e8s_v3 = "Standard_E8s_v3"
standard_e16s_v3 = "Standard_E16s_v3"
standard_e32s_v3 = "Standard_E32s_v3"
standard_e64s_v3 = "Standard_E64s_v3"
standard_e32_16_v3 = "Standard_E32-16_v3"
standard_e32_8s_v3 = "Standard_E32-8s_v3"
standard_e64_32s_v3 = "Standard_E64-32s_v3"
standard_e64_16s_v3 = "Standard_E64-16s_v3"
standard_f1 = "Standard_F1"
standard_f2 = "Standard_F2"
standard_f4 = "Standard_F4"
Expand All @@ -97,6 +135,13 @@ class VirtualMachineSizeTypes(Enum):
standard_f4s = "Standard_F4s"
standard_f8s = "Standard_F8s"
standard_f16s = "Standard_F16s"
standard_f2s_v2 = "Standard_F2s_v2"
standard_f4s_v2 = "Standard_F4s_v2"
standard_f8s_v2 = "Standard_F8s_v2"
standard_f16s_v2 = "Standard_F16s_v2"
standard_f32s_v2 = "Standard_F32s_v2"
standard_f64s_v2 = "Standard_F64s_v2"
standard_f72s_v2 = "Standard_F72s_v2"
standard_g1 = "Standard_G1"
standard_g2 = "Standard_G2"
standard_g3 = "Standard_G3"
Expand All @@ -107,6 +152,10 @@ class VirtualMachineSizeTypes(Enum):
standard_gs3 = "Standard_GS3"
standard_gs4 = "Standard_GS4"
standard_gs5 = "Standard_GS5"
standard_gs4_8 = "Standard_GS4-8"
standard_gs4_4 = "Standard_GS4-4"
standard_gs5_16 = "Standard_GS5-16"
standard_gs5_8 = "Standard_GS5-8"
standard_h8 = "Standard_H8"
standard_h16 = "Standard_H16"
standard_h8m = "Standard_H8m"
Expand All @@ -117,10 +166,30 @@ class VirtualMachineSizeTypes(Enum):
standard_l8s = "Standard_L8s"
standard_l16s = "Standard_L16s"
standard_l32s = "Standard_L32s"
standard_m64s = "Standard_M64s"
standard_m64ms = "Standard_M64ms"
standard_m128s = "Standard_M128s"
standard_m128ms = "Standard_M128ms"
standard_m64_32ms = "Standard_M64-32ms"
standard_m64_16ms = "Standard_M64-16ms"
standard_m128_64ms = "Standard_M128-64ms"
standard_m128_32ms = "Standard_M128-32ms"
standard_nc6 = "Standard_NC6"
standard_nc12 = "Standard_NC12"
standard_nc24 = "Standard_NC24"
standard_nc24r = "Standard_NC24r"
standard_nc6s_v2 = "Standard_NC6s_v2"
standard_nc12s_v2 = "Standard_NC12s_v2"
standard_nc24s_v2 = "Standard_NC24s_v2"
standard_nc24rs_v2 = "Standard_NC24rs_v2"
standard_nc6s_v3 = "Standard_NC6s_v3"
standard_nc12s_v3 = "Standard_NC12s_v3"
standard_nc24s_v3 = "Standard_NC24s_v3"
standard_nc24rs_v3 = "Standard_NC24rs_v3"
standard_nd6s = "Standard_ND6s"
standard_nd12s = "Standard_ND12s"
standard_nd24s = "Standard_ND24s"
standard_nd24rs = "Standard_ND24rs"
standard_nv6 = "Standard_NV6"
standard_nv12 = "Standard_NV12"
standard_nv24 = "Standard_NV24"
Expand Down Expand Up @@ -229,6 +298,14 @@ class RollingUpgradeActionType(Enum):
cancel = "Cancel"


class IntervalInMins(Enum):

three_mins = "ThreeMins"
five_mins = "FiveMins"
thirty_mins = "ThirtyMins"
sixty_mins = "SixtyMins"


class InstanceViewTypes(Enum):

instance_view = "instanceView"
Original file line number Diff line number Diff line change
Expand Up @@ -31,25 +31,46 @@ class HardwareProfile(Model):
'Standard_A5', 'Standard_A6', 'Standard_A7', 'Standard_A8', 'Standard_A9',
'Standard_A10', 'Standard_A11', 'Standard_A1_v2', 'Standard_A2_v2',
'Standard_A4_v2', 'Standard_A8_v2', 'Standard_A2m_v2', 'Standard_A4m_v2',
'Standard_A8m_v2', 'Standard_D1', 'Standard_D2', 'Standard_D3',
'Standard_D4', 'Standard_D11', 'Standard_D12', 'Standard_D13',
'Standard_D14', 'Standard_D1_v2', 'Standard_D2_v2', 'Standard_D3_v2',
'Standard_D4_v2', 'Standard_D5_v2', 'Standard_D11_v2', 'Standard_D12_v2',
'Standard_D13_v2', 'Standard_D14_v2', 'Standard_D15_v2', 'Standard_DS1',
'Standard_DS2', 'Standard_DS3', 'Standard_DS4', 'Standard_DS11',
'Standard_DS12', 'Standard_DS13', 'Standard_DS14', 'Standard_DS1_v2',
'Standard_DS2_v2', 'Standard_DS3_v2', 'Standard_DS4_v2',
'Standard_DS5_v2', 'Standard_DS11_v2', 'Standard_DS12_v2',
'Standard_DS13_v2', 'Standard_DS14_v2', 'Standard_DS15_v2', 'Standard_F1',
'Standard_A8m_v2', 'Standard_B1s', 'Standard_B1ms', 'Standard_B2s',
'Standard_B2ms', 'Standard_B4ms', 'Standard_B8ms', 'Standard_D1',
'Standard_D2', 'Standard_D3', 'Standard_D4', 'Standard_D11',
'Standard_D12', 'Standard_D13', 'Standard_D14', 'Standard_D1_v2',
'Standard_D2_v2', 'Standard_D3_v2', 'Standard_D4_v2', 'Standard_D5_v2',
'Standard_D2_v3', 'Standard_D4_v3', 'Standard_D8_v3', 'Standard_D16_v3',
'Standard_D32_v3', 'Standard_D64_v3', 'Standard_D2s_v3',
'Standard_D4s_v3', 'Standard_D8s_v3', 'Standard_D16s_v3',
'Standard_D32s_v3', 'Standard_D64s_v3', 'Standard_D11_v2',
'Standard_D12_v2', 'Standard_D13_v2', 'Standard_D14_v2',
'Standard_D15_v2', 'Standard_DS1', 'Standard_DS2', 'Standard_DS3',
'Standard_DS4', 'Standard_DS11', 'Standard_DS12', 'Standard_DS13',
'Standard_DS14', 'Standard_DS1_v2', 'Standard_DS2_v2', 'Standard_DS3_v2',
'Standard_DS4_v2', 'Standard_DS5_v2', 'Standard_DS11_v2',
'Standard_DS12_v2', 'Standard_DS13_v2', 'Standard_DS14_v2',
'Standard_DS15_v2', 'Standard_DS13-4_v2', 'Standard_DS13-2_v2',
'Standard_DS14-8_v2', 'Standard_DS14-4_v2', 'Standard_E2_v3',
'Standard_E4_v3', 'Standard_E8_v3', 'Standard_E16_v3', 'Standard_E32_v3',
'Standard_E64_v3', 'Standard_E2s_v3', 'Standard_E4s_v3',
'Standard_E8s_v3', 'Standard_E16s_v3', 'Standard_E32s_v3',
'Standard_E64s_v3', 'Standard_E32-16_v3', 'Standard_E32-8s_v3',
'Standard_E64-32s_v3', 'Standard_E64-16s_v3', 'Standard_F1',
'Standard_F2', 'Standard_F4', 'Standard_F8', 'Standard_F16',
'Standard_F1s', 'Standard_F2s', 'Standard_F4s', 'Standard_F8s',
'Standard_F16s', 'Standard_G1', 'Standard_G2', 'Standard_G3',
'Standard_F16s', 'Standard_F2s_v2', 'Standard_F4s_v2', 'Standard_F8s_v2',
'Standard_F16s_v2', 'Standard_F32s_v2', 'Standard_F64s_v2',
'Standard_F72s_v2', 'Standard_G1', 'Standard_G2', 'Standard_G3',
'Standard_G4', 'Standard_G5', 'Standard_GS1', 'Standard_GS2',
'Standard_GS3', 'Standard_GS4', 'Standard_GS5', 'Standard_H8',
'Standard_GS3', 'Standard_GS4', 'Standard_GS5', 'Standard_GS4-8',
'Standard_GS4-4', 'Standard_GS5-16', 'Standard_GS5-8', 'Standard_H8',
'Standard_H16', 'Standard_H8m', 'Standard_H16m', 'Standard_H16r',
'Standard_H16mr', 'Standard_L4s', 'Standard_L8s', 'Standard_L16s',
'Standard_L32s', 'Standard_NC6', 'Standard_NC12', 'Standard_NC24',
'Standard_NC24r', 'Standard_NV6', 'Standard_NV12', 'Standard_NV24'
'Standard_L32s', 'Standard_M64s', 'Standard_M64ms', 'Standard_M128s',
'Standard_M128ms', 'Standard_M64-32ms', 'Standard_M64-16ms',
'Standard_M128-64ms', 'Standard_M128-32ms', 'Standard_NC6',
'Standard_NC12', 'Standard_NC24', 'Standard_NC24r', 'Standard_NC6s_v2',
'Standard_NC12s_v2', 'Standard_NC24s_v2', 'Standard_NC24rs_v2',
'Standard_NC6s_v3', 'Standard_NC12s_v3', 'Standard_NC24s_v3',
'Standard_NC24rs_v3', 'Standard_ND6s', 'Standard_ND12s', 'Standard_ND24s',
'Standard_ND24rs', 'Standard_NV6', 'Standard_NV12', 'Standard_NV24'
:type vm_size: str or
~azure.mgmt.compute.v2017_12_01.models.VirtualMachineSizeTypes
"""
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
# 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 LogAnalyticsInputBase(Model):
"""Api input base class for LogAnalytics Api.
:param blob_container_sas_uri: SAS Uri of the logging blob container to
which LogAnalytics Api writes output logs to.
:type blob_container_sas_uri: str
:param from_time: From time of the query
:type from_time: datetime
:param to_time: To time of the query
:type to_time: datetime
:param group_by_throttle_policy: Group query result by Throttle Policy
applied.
:type group_by_throttle_policy: bool
:param group_by_operation_name: Group query result by by Operation Name.
:type group_by_operation_name: bool
:param group_by_resource_name: Group query result by Resource Name.
:type group_by_resource_name: bool
"""

_validation = {
'blob_container_sas_uri': {'required': True},
'from_time': {'required': True},
'to_time': {'required': True},
}

_attribute_map = {
'blob_container_sas_uri': {'key': 'blobContainerSasUri', 'type': 'str'},
'from_time': {'key': 'fromTime', 'type': 'iso-8601'},
'to_time': {'key': 'toTime', 'type': 'iso-8601'},
'group_by_throttle_policy': {'key': 'groupByThrottlePolicy', 'type': 'bool'},
'group_by_operation_name': {'key': 'groupByOperationName', 'type': 'bool'},
'group_by_resource_name': {'key': 'groupByResourceName', 'type': 'bool'},
}

def __init__(self, blob_container_sas_uri, from_time, to_time, group_by_throttle_policy=None, group_by_operation_name=None, group_by_resource_name=None):
super(LogAnalyticsInputBase, self).__init__()
self.blob_container_sas_uri = blob_container_sas_uri
self.from_time = from_time
self.to_time = to_time
self.group_by_throttle_policy = group_by_throttle_policy
self.group_by_operation_name = group_by_operation_name
self.group_by_resource_name = group_by_resource_name
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
# 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 .operation_status_response import OperationStatusResponse


class LogAnalyticsOperationResult(OperationStatusResponse):
"""LogAnalytics operation status response.
Variables are only populated by the server, and will be ignored when
sending a request.
:ivar name: Operation ID
:vartype name: str
:ivar status: Operation status
:vartype status: str
:ivar start_time: Start time of the operation
:vartype start_time: datetime
:ivar end_time: End time of the operation
:vartype end_time: datetime
:ivar error: Api error
:vartype error: ~azure.mgmt.compute.v2017_12_01.models.ApiError
:ivar properties: LogAnalyticsOutput
:vartype properties:
~azure.mgmt.compute.v2017_12_01.models.LogAnalyticsOutput
"""

_validation = {
'name': {'readonly': True},
'status': {'readonly': True},
'start_time': {'readonly': True},
'end_time': {'readonly': True},
'error': {'readonly': True},
'properties': {'readonly': True},
}

_attribute_map = {
'name': {'key': 'name', 'type': 'str'},
'status': {'key': 'status', 'type': 'str'},
'start_time': {'key': 'startTime', 'type': 'iso-8601'},
'end_time': {'key': 'endTime', 'type': 'iso-8601'},
'error': {'key': 'error', 'type': 'ApiError'},
'properties': {'key': 'properties', 'type': 'LogAnalyticsOutput'},
}

def __init__(self):
super(LogAnalyticsOperationResult, self).__init__()
self.properties = None
Loading

0 comments on commit e182820

Please sign in to comment.