From 9c55250f00542befdc525a6ab07a09d3a6bea455 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Thu, 30 Aug 2018 21:42:02 +0000 Subject: [PATCH 1/3] Generated from 2b946c42fe05c892efee90f150c5b2b7897d9e8d Change some string modelled enums back into enums --- .../azure/mgmt/logic/models/__init__.py | 5 --- ...access_key_regenerate_action_definition.py | 35 ------------------- ...ss_key_regenerate_action_definition_py3.py | 35 ------------------- .../models/edifact_delimiter_override.py | 4 +-- .../models/edifact_delimiter_override_py3.py | 4 +-- .../logic/models/edifact_framing_settings.py | 4 +-- .../models/edifact_framing_settings_py3.py | 4 +-- .../models/integration_account_agreement.py | 2 +- .../integration_account_agreement_filter.py | 2 +- ...ntegration_account_agreement_filter_py3.py | 2 +- .../integration_account_agreement_py3.py | 2 +- .../models/logic_management_client_enums.py | 9 +---- .../mgmt/logic/models/recurrence_schedule.py | 2 +- .../models/recurrence_schedule_occurrence.py | 2 +- .../recurrence_schedule_occurrence_py3.py | 2 +- .../logic/models/recurrence_schedule_py3.py | 2 +- .../azure/mgmt/logic/models/tracking_event.py | 2 +- .../mgmt/logic/models/tracking_event_py3.py | 2 +- .../logic/models/x12_delimiter_overrides.py | 2 +- .../models/x12_delimiter_overrides_py3.py | 2 +- .../mgmt/logic/models/x12_framing_settings.py | 2 +- .../logic/models/x12_framing_settings_py3.py | 2 +- ...integration_account_sessions_operations.py | 8 +++-- 23 files changed, 28 insertions(+), 108 deletions(-) delete mode 100644 azure-mgmt-logic/azure/mgmt/logic/models/access_key_regenerate_action_definition.py delete mode 100644 azure-mgmt-logic/azure/mgmt/logic/models/access_key_regenerate_action_definition_py3.py diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/__init__.py b/azure-mgmt-logic/azure/mgmt/logic/models/__init__.py index 3f5a248b0d14..a79386ed9a8f 100644 --- a/azure-mgmt-logic/azure/mgmt/logic/models/__init__.py +++ b/azure-mgmt-logic/azure/mgmt/logic/models/__init__.py @@ -111,7 +111,6 @@ from .tracking_event_error_info_py3 import TrackingEventErrorInfo from .tracking_event_py3 import TrackingEvent from .tracking_events_definition_py3 import TrackingEventsDefinition - from .access_key_regenerate_action_definition_py3 import AccessKeyRegenerateActionDefinition from .set_trigger_state_action_definition_py3 import SetTriggerStateActionDefinition from .expression_root_py3 import ExpressionRoot from .azure_resource_error_info_py3 import AzureResourceErrorInfo @@ -234,7 +233,6 @@ from .tracking_event_error_info import TrackingEventErrorInfo from .tracking_event import TrackingEvent from .tracking_events_definition import TrackingEventsDefinition - from .access_key_regenerate_action_definition import AccessKeyRegenerateActionDefinition from .set_trigger_state_action_definition import SetTriggerStateActionDefinition from .expression_root import ExpressionRoot from .azure_resource_error_info import AzureResourceErrorInfo @@ -305,7 +303,6 @@ TrackEventsOperationOptions, EventLevel, TrackingRecordType, - AccessKeyType, ) __all__ = [ @@ -410,7 +407,6 @@ 'TrackingEventErrorInfo', 'TrackingEvent', 'TrackingEventsDefinition', - 'AccessKeyRegenerateActionDefinition', 'SetTriggerStateActionDefinition', 'ExpressionRoot', 'AzureResourceErrorInfo', @@ -480,5 +476,4 @@ 'TrackEventsOperationOptions', 'EventLevel', 'TrackingRecordType', - 'AccessKeyType', ] diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/access_key_regenerate_action_definition.py b/azure-mgmt-logic/azure/mgmt/logic/models/access_key_regenerate_action_definition.py deleted file mode 100644 index 3f0252392c9f..000000000000 --- a/azure-mgmt-logic/azure/mgmt/logic/models/access_key_regenerate_action_definition.py +++ /dev/null @@ -1,35 +0,0 @@ -# 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 AccessKeyRegenerateActionDefinition(Model): - """AccessKeyRegenerateActionDefinition. - - All required parameters must be populated in order to send to Azure. - - :param key_type: Required. Possible values include: 'NotSpecified', - 'Primary', 'Secondary' - :type key_type: str or ~azure.mgmt.logic.models.AccessKeyType - """ - - _validation = { - 'key_type': {'required': True}, - } - - _attribute_map = { - 'key_type': {'key': 'keyType', 'type': 'str'}, - } - - def __init__(self, **kwargs): - super(AccessKeyRegenerateActionDefinition, self).__init__(**kwargs) - self.key_type = kwargs.get('key_type', None) diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/access_key_regenerate_action_definition_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/access_key_regenerate_action_definition_py3.py deleted file mode 100644 index cbe83e687dda..000000000000 --- a/azure-mgmt-logic/azure/mgmt/logic/models/access_key_regenerate_action_definition_py3.py +++ /dev/null @@ -1,35 +0,0 @@ -# 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 AccessKeyRegenerateActionDefinition(Model): - """AccessKeyRegenerateActionDefinition. - - All required parameters must be populated in order to send to Azure. - - :param key_type: Required. Possible values include: 'NotSpecified', - 'Primary', 'Secondary' - :type key_type: str or ~azure.mgmt.logic.models.AccessKeyType - """ - - _validation = { - 'key_type': {'required': True}, - } - - _attribute_map = { - 'key_type': {'key': 'keyType', 'type': 'str'}, - } - - def __init__(self, *, key_type, **kwargs) -> None: - super(AccessKeyRegenerateActionDefinition, self).__init__(**kwargs) - self.key_type = key_type diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_delimiter_override.py b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_delimiter_override.py index ce43ee219d87..9cab599afb9a 100644 --- a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_delimiter_override.py +++ b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_delimiter_override.py @@ -67,8 +67,8 @@ class EdifactDelimiterOverride(Model): 'component_separator': {'key': 'componentSeparator', 'type': 'int'}, 'segment_terminator': {'key': 'segmentTerminator', 'type': 'int'}, 'repetition_separator': {'key': 'repetitionSeparator', 'type': 'int'}, - 'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'str'}, - 'decimal_point_indicator': {'key': 'decimalPointIndicator', 'type': 'str'}, + 'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'SegmentTerminatorSuffix'}, + 'decimal_point_indicator': {'key': 'decimalPointIndicator', 'type': 'EdifactDecimalIndicator'}, 'release_indicator': {'key': 'releaseIndicator', 'type': 'int'}, 'message_association_assigned_code': {'key': 'messageAssociationAssignedCode', 'type': 'str'}, 'target_namespace': {'key': 'targetNamespace', 'type': 'str'}, diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_delimiter_override_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_delimiter_override_py3.py index 8c5dc9ad9887..3d35e5e000a6 100644 --- a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_delimiter_override_py3.py +++ b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_delimiter_override_py3.py @@ -67,8 +67,8 @@ class EdifactDelimiterOverride(Model): 'component_separator': {'key': 'componentSeparator', 'type': 'int'}, 'segment_terminator': {'key': 'segmentTerminator', 'type': 'int'}, 'repetition_separator': {'key': 'repetitionSeparator', 'type': 'int'}, - 'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'str'}, - 'decimal_point_indicator': {'key': 'decimalPointIndicator', 'type': 'str'}, + 'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'SegmentTerminatorSuffix'}, + 'decimal_point_indicator': {'key': 'decimalPointIndicator', 'type': 'EdifactDecimalIndicator'}, 'release_indicator': {'key': 'releaseIndicator', 'type': 'int'}, 'message_association_assigned_code': {'key': 'messageAssociationAssignedCode', 'type': 'str'}, 'target_namespace': {'key': 'targetNamespace', 'type': 'str'}, diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_framing_settings.py b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_framing_settings.py index c3d9467aedeb..07795e620caf 100644 --- a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_framing_settings.py +++ b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_framing_settings.py @@ -73,8 +73,8 @@ class EdifactFramingSettings(Model): 'release_indicator': {'key': 'releaseIndicator', 'type': 'int'}, 'repetition_separator': {'key': 'repetitionSeparator', 'type': 'int'}, 'character_set': {'key': 'characterSet', 'type': 'str'}, - 'decimal_point_indicator': {'key': 'decimalPointIndicator', 'type': 'str'}, - 'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'str'}, + 'decimal_point_indicator': {'key': 'decimalPointIndicator', 'type': 'EdifactDecimalIndicator'}, + 'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'SegmentTerminatorSuffix'}, } def __init__(self, **kwargs): diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_framing_settings_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_framing_settings_py3.py index b9de26605360..f7b668535545 100644 --- a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_framing_settings_py3.py +++ b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_framing_settings_py3.py @@ -73,8 +73,8 @@ class EdifactFramingSettings(Model): 'release_indicator': {'key': 'releaseIndicator', 'type': 'int'}, 'repetition_separator': {'key': 'repetitionSeparator', 'type': 'int'}, 'character_set': {'key': 'characterSet', 'type': 'str'}, - 'decimal_point_indicator': {'key': 'decimalPointIndicator', 'type': 'str'}, - 'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'str'}, + 'decimal_point_indicator': {'key': 'decimalPointIndicator', 'type': 'EdifactDecimalIndicator'}, + 'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'SegmentTerminatorSuffix'}, } def __init__(self, *, protocol_version: int, data_element_separator: int, component_separator: int, segment_terminator: int, release_indicator: int, repetition_separator: int, character_set, decimal_point_indicator, segment_terminator_suffix, service_code_list_directory_version: str=None, character_encoding: str=None, **kwargs) -> None: diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement.py b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement.py index 6d4384aa44a5..ec6d719d3fe7 100644 --- a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement.py +++ b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement.py @@ -37,7 +37,7 @@ class IntegrationAccountAgreement(Resource): :param metadata: The metadata. :type metadata: object :param agreement_type: Required. The agreement type. Possible values - include: 'NotSpecified', 'AS2', 'X12', 'Edifact' + include: 'NotSpecified', 'AS2', 'X12', 'EDIFACT' :type agreement_type: str or ~azure.mgmt.logic.models.AgreementType :param host_partner: Required. The integration account partner that is set as host partner for this agreement. diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_filter.py b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_filter.py index 23cee38077a5..3410be1a8b2a 100644 --- a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_filter.py +++ b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_filter.py @@ -19,7 +19,7 @@ class IntegrationAccountAgreementFilter(Model): :param agreement_type: Required. The agreement type of integration account agreement. Possible values include: 'NotSpecified', 'AS2', 'X12', - 'Edifact' + 'EDIFACT' :type agreement_type: str or ~azure.mgmt.logic.models.AgreementType """ diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_filter_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_filter_py3.py index 691b1f4d5e50..36d16c2ccbd8 100644 --- a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_filter_py3.py +++ b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_filter_py3.py @@ -19,7 +19,7 @@ class IntegrationAccountAgreementFilter(Model): :param agreement_type: Required. The agreement type of integration account agreement. Possible values include: 'NotSpecified', 'AS2', 'X12', - 'Edifact' + 'EDIFACT' :type agreement_type: str or ~azure.mgmt.logic.models.AgreementType """ diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_py3.py index 46bddc85dca4..89be8c2564a4 100644 --- a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_py3.py +++ b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_py3.py @@ -37,7 +37,7 @@ class IntegrationAccountAgreement(Resource): :param metadata: The metadata. :type metadata: object :param agreement_type: Required. The agreement type. Possible values - include: 'NotSpecified', 'AS2', 'X12', 'Edifact' + include: 'NotSpecified', 'AS2', 'X12', 'EDIFACT' :type agreement_type: str or ~azure.mgmt.logic.models.AgreementType :param host_partner: Required. The integration account partner that is set as host partner for this agreement. diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/logic_management_client_enums.py b/azure-mgmt-logic/azure/mgmt/logic/models/logic_management_client_enums.py index 402d02db10f6..10d06865d029 100644 --- a/azure-mgmt-logic/azure/mgmt/logic/models/logic_management_client_enums.py +++ b/azure-mgmt-logic/azure/mgmt/logic/models/logic_management_client_enums.py @@ -181,7 +181,7 @@ class AgreementType(str, Enum): not_specified = "NotSpecified" as2 = "AS2" x12 = "X12" - edifact = "Edifact" + edifact = "EDIFACT" class HashingAlgorithm(str, Enum): @@ -332,10 +332,3 @@ class TrackingRecordType(str, Enum): edifact_interchange_acknowledgment = "EdifactInterchangeAcknowledgment" edifact_functional_group_acknowledgment = "EdifactFunctionalGroupAcknowledgment" edifact_transaction_set_acknowledgment = "EdifactTransactionSetAcknowledgment" - - -class AccessKeyType(str, Enum): - - not_specified = "NotSpecified" - primary = "Primary" - secondary = "Secondary" diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule.py b/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule.py index 4a0c226bfc3e..7fdfd3fb5d71 100644 --- a/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule.py +++ b/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule.py @@ -31,7 +31,7 @@ class RecurrenceSchedule(Model): _attribute_map = { 'minutes': {'key': 'minutes', 'type': '[int]'}, 'hours': {'key': 'hours', 'type': '[int]'}, - 'week_days': {'key': 'weekDays', 'type': '[str]'}, + 'week_days': {'key': 'weekDays', 'type': '[DaysOfWeek]'}, 'month_days': {'key': 'monthDays', 'type': '[int]'}, 'monthly_occurrences': {'key': 'monthlyOccurrences', 'type': '[RecurrenceScheduleOccurrence]'}, } diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule_occurrence.py b/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule_occurrence.py index 71308e754c50..b32dbc67e712 100644 --- a/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule_occurrence.py +++ b/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule_occurrence.py @@ -23,7 +23,7 @@ class RecurrenceScheduleOccurrence(Model): """ _attribute_map = { - 'day': {'key': 'day', 'type': 'str'}, + 'day': {'key': 'day', 'type': 'DayOfWeek'}, 'occurrence': {'key': 'occurrence', 'type': 'int'}, } diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule_occurrence_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule_occurrence_py3.py index 65a779eec3e8..1bdaee939cc9 100644 --- a/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule_occurrence_py3.py +++ b/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule_occurrence_py3.py @@ -23,7 +23,7 @@ class RecurrenceScheduleOccurrence(Model): """ _attribute_map = { - 'day': {'key': 'day', 'type': 'str'}, + 'day': {'key': 'day', 'type': 'DayOfWeek'}, 'occurrence': {'key': 'occurrence', 'type': 'int'}, } diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule_py3.py index 08b5d5d7df10..68c42503da65 100644 --- a/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule_py3.py +++ b/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule_py3.py @@ -31,7 +31,7 @@ class RecurrenceSchedule(Model): _attribute_map = { 'minutes': {'key': 'minutes', 'type': '[int]'}, 'hours': {'key': 'hours', 'type': '[int]'}, - 'week_days': {'key': 'weekDays', 'type': '[str]'}, + 'week_days': {'key': 'weekDays', 'type': '[DaysOfWeek]'}, 'month_days': {'key': 'monthDays', 'type': '[int]'}, 'monthly_occurrences': {'key': 'monthlyOccurrences', 'type': '[RecurrenceScheduleOccurrence]'}, } diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/tracking_event.py b/azure-mgmt-logic/azure/mgmt/logic/models/tracking_event.py index 56d123ddfd51..505ce146ce76 100644 --- a/azure-mgmt-logic/azure/mgmt/logic/models/tracking_event.py +++ b/azure-mgmt-logic/azure/mgmt/logic/models/tracking_event.py @@ -42,7 +42,7 @@ class TrackingEvent(Model): } _attribute_map = { - 'event_level': {'key': 'eventLevel', 'type': 'str'}, + 'event_level': {'key': 'eventLevel', 'type': 'EventLevel'}, 'event_time': {'key': 'eventTime', 'type': 'iso-8601'}, 'record_type': {'key': 'recordType', 'type': 'str'}, 'error': {'key': 'error', 'type': 'TrackingEventErrorInfo'}, diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/tracking_event_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/tracking_event_py3.py index 472692e6d6f1..cd6606b4095e 100644 --- a/azure-mgmt-logic/azure/mgmt/logic/models/tracking_event_py3.py +++ b/azure-mgmt-logic/azure/mgmt/logic/models/tracking_event_py3.py @@ -42,7 +42,7 @@ class TrackingEvent(Model): } _attribute_map = { - 'event_level': {'key': 'eventLevel', 'type': 'str'}, + 'event_level': {'key': 'eventLevel', 'type': 'EventLevel'}, 'event_time': {'key': 'eventTime', 'type': 'iso-8601'}, 'record_type': {'key': 'recordType', 'type': 'str'}, 'error': {'key': 'error', 'type': 'TrackingEventErrorInfo'}, diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/x12_delimiter_overrides.py b/azure-mgmt-logic/azure/mgmt/logic/models/x12_delimiter_overrides.py index ee6f39190c38..ee545215c677 100644 --- a/azure-mgmt-logic/azure/mgmt/logic/models/x12_delimiter_overrides.py +++ b/azure-mgmt-logic/azure/mgmt/logic/models/x12_delimiter_overrides.py @@ -56,7 +56,7 @@ class X12DelimiterOverrides(Model): 'data_element_separator': {'key': 'dataElementSeparator', 'type': 'int'}, 'component_separator': {'key': 'componentSeparator', 'type': 'int'}, 'segment_terminator': {'key': 'segmentTerminator', 'type': 'int'}, - 'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'str'}, + 'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'SegmentTerminatorSuffix'}, 'replace_character': {'key': 'replaceCharacter', 'type': 'int'}, 'replace_separators_in_payload': {'key': 'replaceSeparatorsInPayload', 'type': 'bool'}, 'target_namespace': {'key': 'targetNamespace', 'type': 'str'}, diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/x12_delimiter_overrides_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/x12_delimiter_overrides_py3.py index 193867ce4458..c2333de8a794 100644 --- a/azure-mgmt-logic/azure/mgmt/logic/models/x12_delimiter_overrides_py3.py +++ b/azure-mgmt-logic/azure/mgmt/logic/models/x12_delimiter_overrides_py3.py @@ -56,7 +56,7 @@ class X12DelimiterOverrides(Model): 'data_element_separator': {'key': 'dataElementSeparator', 'type': 'int'}, 'component_separator': {'key': 'componentSeparator', 'type': 'int'}, 'segment_terminator': {'key': 'segmentTerminator', 'type': 'int'}, - 'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'str'}, + 'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'SegmentTerminatorSuffix'}, 'replace_character': {'key': 'replaceCharacter', 'type': 'int'}, 'replace_separators_in_payload': {'key': 'replaceSeparatorsInPayload', 'type': 'bool'}, 'target_namespace': {'key': 'targetNamespace', 'type': 'str'}, diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/x12_framing_settings.py b/azure-mgmt-logic/azure/mgmt/logic/models/x12_framing_settings.py index 9799aac0e65b..c28e541459b2 100644 --- a/azure-mgmt-logic/azure/mgmt/logic/models/x12_framing_settings.py +++ b/azure-mgmt-logic/azure/mgmt/logic/models/x12_framing_settings.py @@ -54,7 +54,7 @@ class X12FramingSettings(Model): 'replace_character': {'key': 'replaceCharacter', 'type': 'int'}, 'segment_terminator': {'key': 'segmentTerminator', 'type': 'int'}, 'character_set': {'key': 'characterSet', 'type': 'str'}, - 'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'str'}, + 'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'SegmentTerminatorSuffix'}, } def __init__(self, **kwargs): diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/x12_framing_settings_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/x12_framing_settings_py3.py index 42d0aec04043..ffd8f09a407d 100644 --- a/azure-mgmt-logic/azure/mgmt/logic/models/x12_framing_settings_py3.py +++ b/azure-mgmt-logic/azure/mgmt/logic/models/x12_framing_settings_py3.py @@ -54,7 +54,7 @@ class X12FramingSettings(Model): 'replace_character': {'key': 'replaceCharacter', 'type': 'int'}, 'segment_terminator': {'key': 'segmentTerminator', 'type': 'int'}, 'character_set': {'key': 'characterSet', 'type': 'str'}, - 'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'str'}, + 'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'SegmentTerminatorSuffix'}, } def __init__(self, *, data_element_separator: int, component_separator: int, replace_separators_in_payload: bool, replace_character: int, segment_terminator: int, character_set, segment_terminator_suffix, **kwargs) -> None: diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_sessions_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_sessions_operations.py index 3ac925d6632f..9169be91fa09 100644 --- a/azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_sessions_operations.py +++ b/azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_sessions_operations.py @@ -11,6 +11,7 @@ import uuid from msrest.pipeline import ClientRawResponse +from msrestazure.azure_exceptions import CloudError from .. import models @@ -267,8 +268,7 @@ def delete( overrides`. :return: None or ClientRawResponse if raw=true :rtype: None or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ # Construct URL url = self.delete.metadata['url'] @@ -298,7 +298,9 @@ def delete( response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 204]: - raise models.ErrorResponseException(self._deserialize, response) + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp if raw: client_raw_response = ClientRawResponse(None, response) From be31dc37e1b4afb7585d9348ea4ed13193fe8760 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Fri, 7 Sep 2018 18:16:22 +0000 Subject: [PATCH 2/3] Generated from c016726b2b4438bf45bdbebe25f68a67330478b0 Change EDIFACT back to be an enum, not a string --- .../azure/mgmt/logic/models/integration_account_agreement.py | 4 ++-- .../mgmt/logic/models/integration_account_agreement_filter.py | 4 ++-- .../logic/models/integration_account_agreement_filter_py3.py | 4 ++-- .../mgmt/logic/models/integration_account_agreement_py3.py | 4 ++-- .../azure/mgmt/logic/models/logic_management_client_enums.py | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement.py b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement.py index ec6d719d3fe7..5fad800c2ade 100644 --- a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement.py +++ b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement.py @@ -37,7 +37,7 @@ class IntegrationAccountAgreement(Resource): :param metadata: The metadata. :type metadata: object :param agreement_type: Required. The agreement type. Possible values - include: 'NotSpecified', 'AS2', 'X12', 'EDIFACT' + include: 'NotSpecified', 'AS2', 'X12', 'Edifact' :type agreement_type: str or ~azure.mgmt.logic.models.AgreementType :param host_partner: Required. The integration account partner that is set as host partner for this agreement. @@ -77,7 +77,7 @@ class IntegrationAccountAgreement(Resource): 'created_time': {'key': 'properties.createdTime', 'type': 'iso-8601'}, 'changed_time': {'key': 'properties.changedTime', 'type': 'iso-8601'}, 'metadata': {'key': 'properties.metadata', 'type': 'object'}, - 'agreement_type': {'key': 'properties.agreementType', 'type': 'str'}, + 'agreement_type': {'key': 'properties.agreementType', 'type': 'AgreementType'}, 'host_partner': {'key': 'properties.hostPartner', 'type': 'str'}, 'guest_partner': {'key': 'properties.guestPartner', 'type': 'str'}, 'host_identity': {'key': 'properties.hostIdentity', 'type': 'BusinessIdentity'}, diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_filter.py b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_filter.py index 3410be1a8b2a..ed00ee6cf955 100644 --- a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_filter.py +++ b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_filter.py @@ -19,7 +19,7 @@ class IntegrationAccountAgreementFilter(Model): :param agreement_type: Required. The agreement type of integration account agreement. Possible values include: 'NotSpecified', 'AS2', 'X12', - 'EDIFACT' + 'Edifact' :type agreement_type: str or ~azure.mgmt.logic.models.AgreementType """ @@ -28,7 +28,7 @@ class IntegrationAccountAgreementFilter(Model): } _attribute_map = { - 'agreement_type': {'key': 'agreementType', 'type': 'str'}, + 'agreement_type': {'key': 'agreementType', 'type': 'AgreementType'}, } def __init__(self, **kwargs): diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_filter_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_filter_py3.py index 36d16c2ccbd8..aa7b65c825aa 100644 --- a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_filter_py3.py +++ b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_filter_py3.py @@ -19,7 +19,7 @@ class IntegrationAccountAgreementFilter(Model): :param agreement_type: Required. The agreement type of integration account agreement. Possible values include: 'NotSpecified', 'AS2', 'X12', - 'EDIFACT' + 'Edifact' :type agreement_type: str or ~azure.mgmt.logic.models.AgreementType """ @@ -28,7 +28,7 @@ class IntegrationAccountAgreementFilter(Model): } _attribute_map = { - 'agreement_type': {'key': 'agreementType', 'type': 'str'}, + 'agreement_type': {'key': 'agreementType', 'type': 'AgreementType'}, } def __init__(self, *, agreement_type, **kwargs) -> None: diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_py3.py index 89be8c2564a4..4f6d7c00bb25 100644 --- a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_py3.py +++ b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_py3.py @@ -37,7 +37,7 @@ class IntegrationAccountAgreement(Resource): :param metadata: The metadata. :type metadata: object :param agreement_type: Required. The agreement type. Possible values - include: 'NotSpecified', 'AS2', 'X12', 'EDIFACT' + include: 'NotSpecified', 'AS2', 'X12', 'Edifact' :type agreement_type: str or ~azure.mgmt.logic.models.AgreementType :param host_partner: Required. The integration account partner that is set as host partner for this agreement. @@ -77,7 +77,7 @@ class IntegrationAccountAgreement(Resource): 'created_time': {'key': 'properties.createdTime', 'type': 'iso-8601'}, 'changed_time': {'key': 'properties.changedTime', 'type': 'iso-8601'}, 'metadata': {'key': 'properties.metadata', 'type': 'object'}, - 'agreement_type': {'key': 'properties.agreementType', 'type': 'str'}, + 'agreement_type': {'key': 'properties.agreementType', 'type': 'AgreementType'}, 'host_partner': {'key': 'properties.hostPartner', 'type': 'str'}, 'guest_partner': {'key': 'properties.guestPartner', 'type': 'str'}, 'host_identity': {'key': 'properties.hostIdentity', 'type': 'BusinessIdentity'}, diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/logic_management_client_enums.py b/azure-mgmt-logic/azure/mgmt/logic/models/logic_management_client_enums.py index 10d06865d029..a87fce21bef8 100644 --- a/azure-mgmt-logic/azure/mgmt/logic/models/logic_management_client_enums.py +++ b/azure-mgmt-logic/azure/mgmt/logic/models/logic_management_client_enums.py @@ -181,7 +181,7 @@ class AgreementType(str, Enum): not_specified = "NotSpecified" as2 = "AS2" x12 = "X12" - edifact = "EDIFACT" + edifact = "Edifact" class HashingAlgorithm(str, Enum): From f546e0e63182af6b62c340be802c5adf9589d443 Mon Sep 17 00:00:00 2001 From: azuresdkci Date: Fri, 7 Sep 2018 18:45:45 +0000 Subject: [PATCH 3/3] Packaging update of azure-mgmt-logic --- azure-mgmt-logic/README.rst | 2 +- azure-mgmt-logic/setup.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/azure-mgmt-logic/README.rst b/azure-mgmt-logic/README.rst index 095902143154..c380cdb9816d 100644 --- a/azure-mgmt-logic/README.rst +++ b/azure-mgmt-logic/README.rst @@ -6,7 +6,7 @@ This is the Microsoft Azure Logic Apps Management Client Library. Azure Resource Manager (ARM) is the next generation of management APIs that replace the old Azure Service Management (ASM). -This package has been tested with Python 2.7, 3.4, 3.5 and 3.6. +This package has been tested with Python 2.7, 3.4, 3.5, 3.6 and 3.7. For the older Azure Service Management (ASM) libraries, see `azure-servicemanagement-legacy `__ library. diff --git a/azure-mgmt-logic/setup.py b/azure-mgmt-logic/setup.py index 17ac0d37f0d3..9018d5b45c2a 100644 --- a/azure-mgmt-logic/setup.py +++ b/azure-mgmt-logic/setup.py @@ -72,12 +72,14 @@ 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', 'License :: OSI Approved :: MIT License', ], zip_safe=False, packages=find_packages(exclude=["tests"]), install_requires=[ - 'msrestazure>=0.4.27,<2.0.0', + 'msrest>=0.5.0', + 'msrestazure>=0.4.32,<2.0.0', 'azure-common~=1.1', ], cmdclass=cmdclass