Generated from d4e67b54bbcb1a92fc397fc1bced0a1360ec48a5

Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs

# Conflicts:
#	specification/security/resource-manager/Microsoft.Security/preview/2017-08-01-preview/security.json

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

@@ -10,13 +10,12 @@
 # --------------------------------------------------------------------------
 
 try:
+    from .pricing_py3 import Pricing
+    from .pricing_list_py3 import PricingList
+    from .asc_location_py3 import AscLocation
     from .resource_py3 import Resource
-    from .tags_resource_py3 import TagsResource
-    from .kind_py3 import Kind
     from .security_contact_py3 import SecurityContact
-    from .pricing_py3 import Pricing
     from .workspace_setting_py3 import WorkspaceSetting
-    from .io_tsecurity_solution_model_py3 import IoTSecuritySolutionModel
     from .auto_provisioning_setting_py3 import AutoProvisioningSetting
     from .compliance_segment_py3 import ComplianceSegment
     from .compliance_py3 import Compliance
@@ -28,20 +27,15 @@
     from .information_protection_keyword_py3 import InformationProtectionKeyword
     from .information_type_py3 import InformationType
     from .information_protection_policy_py3 import InformationProtectionPolicy
-    from .location_py3 import Location
     from .operation_display_py3 import OperationDisplay
     from .operation_py3 import Operation
     from .security_task_parameters_py3 import SecurityTaskParameters
     from .security_task_py3 import SecurityTask
-    from .asc_location_py3 import AscLocation
     from .alert_entity_py3 import AlertEntity
     from .alert_confidence_reason_py3 import AlertConfidenceReason
     from .alert_py3 import Alert
     from .discovered_security_solution_py3 import DiscoveredSecuritySolution
-    from .topology_single_resource_parent_py3 import TopologySingleResourceParent
-    from .topology_single_resource_child_py3 import TopologySingleResourceChild
-    from .topology_single_resource_py3 import TopologySingleResource
-    from .topology_resource_py3 import TopologyResource
+    from .location_py3 import Location
     from .jit_network_access_port_rule_py3 import JitNetworkAccessPortRule
     from .jit_network_access_policy_virtual_machine_py3 import JitNetworkAccessPolicyVirtualMachine
     from .jit_network_access_request_port_py3 import JitNetworkAccessRequestPort
@@ -51,6 +45,7 @@
     from .jit_network_access_policy_initiate_port_py3 import JitNetworkAccessPolicyInitiatePort
     from .jit_network_access_policy_initiate_virtual_machine_py3 import JitNetworkAccessPolicyInitiateVirtualMachine
     from .jit_network_access_policy_initiate_request_py3 import JitNetworkAccessPolicyInitiateRequest
+    from .kind_py3 import Kind
     from .external_security_solution_py3 import ExternalSecuritySolution
     from .cef_solution_properties_py3 import CefSolutionProperties
     from .cef_external_security_solution_py3 import CefExternalSecuritySolution
@@ -62,17 +57,20 @@
     from .external_security_solution_kind1_py3 import ExternalSecuritySolutionKind1
     from .external_security_solution_properties_py3 import ExternalSecuritySolutionProperties
     from .aad_connectivity_state1_py3 import AadConnectivityState1
+    from .topology_single_resource_parent_py3 import TopologySingleResourceParent
+    from .topology_single_resource_child_py3 import TopologySingleResourceChild
+    from .topology_single_resource_py3 import TopologySingleResource
+    from .topology_resource_py3 import TopologyResource
     from .connected_resource_py3 import ConnectedResource
     from .connectable_resource_py3 import ConnectableResource
     from .allowed_connections_resource_py3 import AllowedConnectionsResource
 except (SyntaxError, ImportError):
+    from .pricing import Pricing
+    from .pricing_list import PricingList
+    from .asc_location import AscLocation
     from .resource import Resource
-    from .tags_resource import TagsResource
-    from .kind import Kind
     from .security_contact import SecurityContact
-    from .pricing import Pricing
     from .workspace_setting import WorkspaceSetting
-    from .io_tsecurity_solution_model import IoTSecuritySolutionModel
     from .auto_provisioning_setting import AutoProvisioningSetting
     from .compliance_segment import ComplianceSegment
     from .compliance import Compliance
@@ -84,20 +82,15 @@
     from .information_protection_keyword import InformationProtectionKeyword
     from .information_type import InformationType
     from .information_protection_policy import InformationProtectionPolicy
-    from .location import Location
     from .operation_display import OperationDisplay
     from .operation import Operation
     from .security_task_parameters import SecurityTaskParameters
     from .security_task import SecurityTask
-    from .asc_location import AscLocation
     from .alert_entity import AlertEntity
     from .alert_confidence_reason import AlertConfidenceReason
     from .alert import Alert
     from .discovered_security_solution import DiscoveredSecuritySolution
-    from .topology_single_resource_parent import TopologySingleResourceParent
-    from .topology_single_resource_child import TopologySingleResourceChild
-    from .topology_single_resource import TopologySingleResource
-    from .topology_resource import TopologyResource
+    from .location import Location
     from .jit_network_access_port_rule import JitNetworkAccessPortRule
     from .jit_network_access_policy_virtual_machine import JitNetworkAccessPolicyVirtualMachine
     from .jit_network_access_request_port import JitNetworkAccessRequestPort
@@ -107,6 +100,7 @@
     from .jit_network_access_policy_initiate_port import JitNetworkAccessPolicyInitiatePort
     from .jit_network_access_policy_initiate_virtual_machine import JitNetworkAccessPolicyInitiateVirtualMachine
     from .jit_network_access_policy_initiate_request import JitNetworkAccessPolicyInitiateRequest
+    from .kind import Kind
     from .external_security_solution import ExternalSecuritySolution
     from .cef_solution_properties import CefSolutionProperties
     from .cef_external_security_solution import CefExternalSecuritySolution
@@ -118,14 +112,16 @@
     from .external_security_solution_kind1 import ExternalSecuritySolutionKind1
     from .external_security_solution_properties import ExternalSecuritySolutionProperties
     from .aad_connectivity_state1 import AadConnectivityState1
+    from .topology_single_resource_parent import TopologySingleResourceParent
+    from .topology_single_resource_child import TopologySingleResourceChild
+    from .topology_single_resource import TopologySingleResource
+    from .topology_resource import TopologyResource
     from .connected_resource import ConnectedResource
     from .connectable_resource import ConnectableResource
     from .allowed_connections_resource import AllowedConnectionsResource
-from .pricing_paged import PricingPaged
 from .security_contact_paged import SecurityContactPaged
 from .workspace_setting_paged import WorkspaceSettingPaged
 from .auto_provisioning_setting_paged import AutoProvisioningSettingPaged
-from .io_tsecurity_solution_model_paged import IoTSecuritySolutionModelPaged
 from .compliance_paged import CompliancePaged
 from .setting_paged import SettingPaged
 from .information_protection_policy_paged import InformationProtectionPolicyPaged
@@ -139,12 +135,9 @@
 from .topology_resource_paged import TopologyResourcePaged
 from .allowed_connections_resource_paged import AllowedConnectionsResourcePaged
 from .security_center_enums import (
+    PricingTier,
     AlertNotifications,
     AlertsToAdmins,
-    PricingTier,
-    SecuritySolutionStatus,
-    ExportData,
-    DataSource,
     AutoProvision,
     SettingKind,
     ReportedSeverity,
@@ -158,13 +151,12 @@
 )
 
 __all__ = [
+    'Pricing',
+    'PricingList',
+    'AscLocation',
     'Resource',
-    'TagsResource',
-    'Kind',
     'SecurityContact',
-    'Pricing',
     'WorkspaceSetting',
-    'IoTSecuritySolutionModel',
     'AutoProvisioningSetting',
     'ComplianceSegment',
     'Compliance',
@@ -176,20 +168,15 @@
     'InformationProtectionKeyword',
     'InformationType',
     'InformationProtectionPolicy',
-    'Location',
     'OperationDisplay',
     'Operation',
     'SecurityTaskParameters',
     'SecurityTask',
-    'AscLocation',
     'AlertEntity',
     'AlertConfidenceReason',
     'Alert',
     'DiscoveredSecuritySolution',
-    'TopologySingleResourceParent',
-    'TopologySingleResourceChild',
-    'TopologySingleResource',
-    'TopologyResource',
+    'Location',
     'JitNetworkAccessPortRule',
     'JitNetworkAccessPolicyVirtualMachine',
     'JitNetworkAccessRequestPort',
@@ -199,6 +186,7 @@
     'JitNetworkAccessPolicyInitiatePort',
     'JitNetworkAccessPolicyInitiateVirtualMachine',
     'JitNetworkAccessPolicyInitiateRequest',
+    'Kind',
     'ExternalSecuritySolution',
     'CefSolutionProperties',
     'CefExternalSecuritySolution',
@@ -210,14 +198,16 @@
     'ExternalSecuritySolutionKind1',
     'ExternalSecuritySolutionProperties',
     'AadConnectivityState1',
+    'TopologySingleResourceParent',
+    'TopologySingleResourceChild',
+    'TopologySingleResource',
+    'TopologyResource',
     'ConnectedResource',
     'ConnectableResource',
     'AllowedConnectionsResource',
-    'PricingPaged',
     'SecurityContactPaged',
     'WorkspaceSettingPaged',
     'AutoProvisioningSettingPaged',
-    'IoTSecuritySolutionModelPaged',
     'CompliancePaged',
     'SettingPaged',
     'InformationProtectionPolicyPaged',
@@ -230,12 +220,9 @@
     'ExternalSecuritySolutionPaged',
     'TopologyResourcePaged',
     'AllowedConnectionsResourcePaged',
+    'PricingTier',
     'AlertNotifications',
     'AlertsToAdmins',
-    'PricingTier',
-    'SecuritySolutionStatus',
-    'ExportData',
-    'DataSource',
     'AutoProvision',
     'SettingKind',
     'ReportedSeverity',

azure-mgmt-security/azure/mgmt/security/models/alert.py

@@ -45,7 +45,7 @@ class Alert(Resource):
      (Active, Blocked etc.)
     :vartype action_taken: str
     :ivar reported_severity: Estimated severity of this alert. Possible values
-     include: 'Silent', 'Information', 'Low', 'High'
+     include: 'Informational', 'Low', 'Medium', 'High'
     :vartype reported_severity: str or
      ~azure.mgmt.security.models.ReportedSeverity
     :ivar compromised_entity: The entity that the incident happened on

azure-mgmt-security/azure/mgmt/security/models/alert_py3.py

@@ -45,7 +45,7 @@ class Alert(Resource):
      (Active, Blocked etc.)
     :vartype action_taken: str
     :ivar reported_severity: Estimated severity of this alert. Possible values
-     include: 'Silent', 'Information', 'Low', 'High'
+     include: 'Informational', 'Low', 'Medium', 'High'
     :vartype reported_severity: str or
      ~azure.mgmt.security.models.ReportedSeverity
     :ivar compromised_entity: The entity that the incident happened on