Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[AutoPR security/resource-manager] Azure Security Center - break-to-composite v1 #4354

Merged
merged 2 commits into from
Feb 25, 2019
Merged

[AutoPR security/resource-manager] Azure Security Center - break-to-composite v1 #4354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a163d03
Generated from 2a8aacac69e7675f0417a2dee3770256656042c8
AutorestCI Feb 13, 2019
47e5dc9
Generated from 6cbbbe2e2e840c19e3f97332dbc44d0eb4049ce5
AutorestCI Feb 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions azure-mgmt-security/azure/mgmt/security/models/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
# --------------------------------------------------------------------------

try:
from .pricing_py3 import Pricing
from .asc_location_py3 import AscLocation
from .resource_py3 import Resource
from .kind_py3 import Kind
from .security_contact_py3 import SecurityContact
from .pricing_py3 import Pricing
from .workspace_setting_py3 import WorkspaceSetting
from .auto_provisioning_setting_py3 import AutoProvisioningSetting
from .compliance_segment_py3 import ComplianceSegment
Expand All @@ -26,20 +26,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
Expand All @@ -49,6 +44,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
Expand All @@ -60,14 +56,18 @@
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 .asc_location import AscLocation
from .resource import Resource
from .kind import Kind
from .security_contact import SecurityContact
from .pricing import Pricing
from .workspace_setting import WorkspaceSetting
from .auto_provisioning_setting import AutoProvisioningSetting
from .compliance_segment import ComplianceSegment
Expand All @@ -80,20 +80,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
Expand All @@ -103,6 +98,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
Expand All @@ -114,6 +110,10 @@
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
Expand All @@ -134,9 +134,9 @@
from .topology_resource_paged import TopologyResourcePaged
from .allowed_connections_resource_paged import AllowedConnectionsResourcePaged
from .security_center_enums import (
PricingTier,
AlertNotifications,
AlertsToAdmins,
PricingTier,
AutoProvision,
SettingKind,
ReportedSeverity,
Expand All @@ -150,10 +150,10 @@
)

__all__ = [
'Pricing',
'AscLocation',
'Resource',
'Kind',
'SecurityContact',
'Pricing',
'WorkspaceSetting',
'AutoProvisioningSetting',
'ComplianceSegment',
Expand All @@ -166,20 +166,15 @@
'InformationProtectionKeyword',
'InformationType',
'InformationProtectionPolicy',
'Location',
'OperationDisplay',
'Operation',
'SecurityTaskParameters',
'SecurityTask',
'AscLocation',
'AlertEntity',
'AlertConfidenceReason',
'Alert',
'DiscoveredSecuritySolution',
'TopologySingleResourceParent',
'TopologySingleResourceChild',
'TopologySingleResource',
'TopologyResource',
'Location',
'JitNetworkAccessPortRule',
'JitNetworkAccessPolicyVirtualMachine',
'JitNetworkAccessRequestPort',
Expand All @@ -189,6 +184,7 @@
'JitNetworkAccessPolicyInitiatePort',
'JitNetworkAccessPolicyInitiateVirtualMachine',
'JitNetworkAccessPolicyInitiateRequest',
'Kind',
'ExternalSecuritySolution',
'CefSolutionProperties',
'CefExternalSecuritySolution',
Expand All @@ -200,6 +196,10 @@
'ExternalSecuritySolutionKind1',
'ExternalSecuritySolutionProperties',
'AadConnectivityState1',
'TopologySingleResourceParent',
'TopologySingleResourceChild',
'TopologySingleResource',
'TopologyResource',
'ConnectedResource',
'ConnectableResource',
'AllowedConnectionsResource',
Expand All @@ -219,9 +219,9 @@
'ExternalSecuritySolutionPaged',
'TopologyResourcePaged',
'AllowedConnectionsResourcePaged',
'PricingTier',
'AlertNotifications',
'AlertsToAdmins',
'PricingTier',
'AutoProvision',
'SettingKind',
'ReportedSeverity',
Expand Down
12 changes: 6 additions & 6 deletions azure-mgmt-security/azure/mgmt/security/models/security_center_enums.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
from enum import Enum


class PricingTier(str, Enum):

free = "Free" #: Get free Azure security center experience with basic security features
standard = "Standard" #: Get the standard Azure security center experience with advanced security features


class AlertNotifications(str, Enum):

on = "On" #: Get notifications on new alerts
Expand All @@ -24,12 +30,6 @@ class AlertsToAdmins(str, Enum):
off = "Off" #: Don't send notification on new alerts to the subscription's admins


class PricingTier(str, Enum):

free = "Free" #: Get free Azure security center experience with basic security features
standard = "Standard" #: Get the standard Azure security center experience with advanced security features


class AutoProvision(str, Enum):

on = "On" #: Install missing security agent on VMs automatically
Expand Down