[AutoPR azure-mgmt-security] On boarding Solutions to latest stable API version

sdk/security/azure-mgmt-security/azure/mgmt/security/_security_center.py

@@ -23,8 +23,6 @@
 from .operations import IotSecuritySolutionAnalyticsOperations
 from .operations import IotSecuritySolutionsAnalyticsAggregatedAlertOperations
 from .operations import IotSecuritySolutionsAnalyticsRecommendationOperations
-from .operations import DiscoveredSecuritySolutionsOperations
-from .operations import ExternalSecuritySolutionsOperations
 from .operations import LocationsOperations
 from .operations import Operations
 from .operations import TasksOperations
@@ -46,6 +44,8 @@
 from .operations import AllowedConnectionsOperations
 from .operations import TopologyOperations
 from .operations import JitNetworkAccessPoliciesOperations
+from .operations import DiscoveredSecuritySolutionsOperations
+from .operations import ExternalSecuritySolutionsOperations
 from . import models
 
 
@@ -75,10 +75,6 @@ class SecurityCenter(SDKClient):
     :vartype iot_security_solutions_analytics_aggregated_alert: azure.mgmt.security.operations.IotSecuritySolutionsAnalyticsAggregatedAlertOperations
     :ivar iot_security_solutions_analytics_recommendation: IotSecuritySolutionsAnalyticsRecommendation operations
     :vartype iot_security_solutions_analytics_recommendation: azure.mgmt.security.operations.IotSecuritySolutionsAnalyticsRecommendationOperations
-    :ivar discovered_security_solutions: DiscoveredSecuritySolutions operations
-    :vartype discovered_security_solutions: azure.mgmt.security.operations.DiscoveredSecuritySolutionsOperations
-    :ivar external_security_solutions: ExternalSecuritySolutions operations
-    :vartype external_security_solutions: azure.mgmt.security.operations.ExternalSecuritySolutionsOperations
     :ivar locations: Locations operations
     :vartype locations: azure.mgmt.security.operations.LocationsOperations
     :ivar operations: Operations operations
@@ -121,6 +117,10 @@ class SecurityCenter(SDKClient):
     :vartype topology: azure.mgmt.security.operations.TopologyOperations
     :ivar jit_network_access_policies: JitNetworkAccessPolicies operations
     :vartype jit_network_access_policies: azure.mgmt.security.operations.JitNetworkAccessPoliciesOperations
+    :ivar discovered_security_solutions: DiscoveredSecuritySolutions operations
+    :vartype discovered_security_solutions: azure.mgmt.security.operations.DiscoveredSecuritySolutionsOperations
+    :ivar external_security_solutions: ExternalSecuritySolutions operations
+    :vartype external_security_solutions: azure.mgmt.security.operations.ExternalSecuritySolutionsOperations
 
     :param credentials: Credentials needed for the client to connect to Azure.
     :type credentials: :mod:`A msrestazure Credentials
@@ -163,10 +163,6 @@ def __init__(
             self._client, self.config, self._serialize, self._deserialize)
         self.iot_security_solutions_analytics_recommendation = IotSecuritySolutionsAnalyticsRecommendationOperations(
             self._client, self.config, self._serialize, self._deserialize)
-        self.discovered_security_solutions = DiscoveredSecuritySolutionsOperations(
-            self._client, self.config, self._serialize, self._deserialize)
-        self.external_security_solutions = ExternalSecuritySolutionsOperations(
-            self._client, self.config, self._serialize, self._deserialize)
         self.locations = LocationsOperations(
             self._client, self.config, self._serialize, self._deserialize)
         self.operations = Operations(
@@ -209,3 +205,7 @@ def __init__(
             self._client, self.config, self._serialize, self._deserialize)
         self.jit_network_access_policies = JitNetworkAccessPoliciesOperations(
             self._client, self.config, self._serialize, self._deserialize)
+        self.discovered_security_solutions = DiscoveredSecuritySolutionsOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.external_security_solutions = ExternalSecuritySolutionsOperations(
+            self._client, self.config, self._serialize, self._deserialize)

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

@@ -340,9 +340,6 @@
     RecommendationType,
     RecommendationConfigStatus,
     UnmaskedIpLoggingStatus,
-    SecurityFamily,
-    AadConnectivityState,
-    ExternalSecuritySolutionKind,
     AutoProvision,
     Rank,
     AlertNotifications,
@@ -364,6 +361,9 @@
     Protocol,
     Status,
     StatusReason,
+    SecurityFamily,
+    AadConnectivityState,
+    ExternalSecuritySolutionKind,
     ExpandEnum,
     ConnectionType,
 )
@@ -521,8 +521,6 @@
     'IoTSecuritySolutionModelPaged',
     'IoTSecurityAggregatedAlertPaged',
     'IoTSecurityAggregatedRecommendationPaged',
-    'DiscoveredSecuritySolutionPaged',
-    'ExternalSecuritySolutionPaged',
     'AscLocationPaged',
     'OperationPaged',
     'SecurityTaskPaged',
@@ -542,6 +540,8 @@
     'AllowedConnectionsResourcePaged',
     'TopologyResourcePaged',
     'JitNetworkAccessPolicyPaged',
+    'DiscoveredSecuritySolutionPaged',
+    'ExternalSecuritySolutionPaged',
     'ResourceStatus',
     'PricingTier',
     'ReportedSeverity',
@@ -552,9 +552,6 @@
     'RecommendationType',
     'RecommendationConfigStatus',
     'UnmaskedIpLoggingStatus',
-    'SecurityFamily',
-    'AadConnectivityState',
-    'ExternalSecuritySolutionKind',
     'AutoProvision',
     'Rank',
     'AlertNotifications',
@@ -576,6 +573,9 @@
     'Protocol',
     'Status',
     'StatusReason',
+    'SecurityFamily',
+    'AadConnectivityState',
+    'ExternalSecuritySolutionKind',
     'ExpandEnum',
     'ConnectionType',
 ]

sdk/security/azure-mgmt-security/azure/mgmt/security/models/_paged_models.py

@@ -103,32 +103,6 @@ class IoTSecurityAggregatedRecommendationPaged(Paged):
     def __init__(self, *args, **kwargs):
 
         super(IoTSecurityAggregatedRecommendationPaged, self).__init__(*args, **kwargs)
-class DiscoveredSecuritySolutionPaged(Paged):
-    """
-    A paging container for iterating over a list of :class:`DiscoveredSecuritySolution <azure.mgmt.security.models.DiscoveredSecuritySolution>` object
-    """
-
-    _attribute_map = {
-        'next_link': {'key': 'nextLink', 'type': 'str'},
-        'current_page': {'key': 'value', 'type': '[DiscoveredSecuritySolution]'}
-    }
-
-    def __init__(self, *args, **kwargs):
-
-        super(DiscoveredSecuritySolutionPaged, self).__init__(*args, **kwargs)
-class ExternalSecuritySolutionPaged(Paged):
-    """
-    A paging container for iterating over a list of :class:`ExternalSecuritySolution <azure.mgmt.security.models.ExternalSecuritySolution>` object
-    """
-
-    _attribute_map = {
-        'next_link': {'key': 'nextLink', 'type': 'str'},
-        'current_page': {'key': 'value', 'type': '[ExternalSecuritySolution]'}
-    }
-
-    def __init__(self, *args, **kwargs):
-
-        super(ExternalSecuritySolutionPaged, self).__init__(*args, **kwargs)
 class AscLocationPaged(Paged):
     """
     A paging container for iterating over a list of :class:`AscLocation <azure.mgmt.security.models.AscLocation>` object
@@ -376,3 +350,29 @@ class JitNetworkAccessPolicyPaged(Paged):
     def __init__(self, *args, **kwargs):
 
         super(JitNetworkAccessPolicyPaged, self).__init__(*args, **kwargs)
+class DiscoveredSecuritySolutionPaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`DiscoveredSecuritySolution <azure.mgmt.security.models.DiscoveredSecuritySolution>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[DiscoveredSecuritySolution]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(DiscoveredSecuritySolutionPaged, self).__init__(*args, **kwargs)
+class ExternalSecuritySolutionPaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`ExternalSecuritySolution <azure.mgmt.security.models.ExternalSecuritySolution>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[ExternalSecuritySolution]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(ExternalSecuritySolutionPaged, self).__init__(*args, **kwargs)

sdk/security/azure-mgmt-security/azure/mgmt/security/models/_security_center_enums.py

@@ -88,28 +88,6 @@ class UnmaskedIpLoggingStatus(str, Enum):
     enabled = "Enabled"  #: Unmasked IP logging is enabled
 
 
-class SecurityFamily(str, Enum):
-
-    waf = "Waf"
-    ngfw = "Ngfw"
-    saas_waf = "SaasWaf"
-    va = "Va"
-
-
-class AadConnectivityState(str, Enum):
-
-    discovered = "Discovered"
-    not_licensed = "NotLicensed"
-    connected = "Connected"
-
-
-class ExternalSecuritySolutionKind(str, Enum):
-
-    cef = "CEF"
-    ata = "ATA"
-    aad = "AAD"
-
-
 class AutoProvision(str, Enum):
 
     on = "On"  #: Install missing security agent on VMs automatically
@@ -268,6 +246,28 @@ class StatusReason(str, Enum):
     newer_request_initiated = "NewerRequestInitiated"
 
 
+class SecurityFamily(str, Enum):
+
+    waf = "Waf"
+    ngfw = "Ngfw"
+    saas_waf = "SaasWaf"
+    va = "Va"
+
+
+class AadConnectivityState(str, Enum):
+
+    discovered = "Discovered"
+    not_licensed = "NotLicensed"
+    connected = "Connected"
+
+
+class ExternalSecuritySolutionKind(str, Enum):
+
+    cef = "CEF"
+    ata = "ATA"
+    aad = "AAD"
+
+
 class ExpandEnum(str, Enum):
 
     links = "links"  #: All links associated with an assessment

sdk/security/azure-mgmt-security/azure/mgmt/security/operations/__init__.py

@@ -19,8 +19,6 @@
 from ._iot_security_solution_analytics_operations import IotSecuritySolutionAnalyticsOperations
 from ._iot_security_solutions_analytics_aggregated_alert_operations import IotSecuritySolutionsAnalyticsAggregatedAlertOperations
 from ._iot_security_solutions_analytics_recommendation_operations import IotSecuritySolutionsAnalyticsRecommendationOperations
-from ._discovered_security_solutions_operations import DiscoveredSecuritySolutionsOperations
-from ._external_security_solutions_operations import ExternalSecuritySolutionsOperations
 from ._locations_operations import LocationsOperations
 from ._operations import Operations
 from ._tasks_operations import TasksOperations
@@ -42,6 +40,8 @@
 from ._allowed_connections_operations import AllowedConnectionsOperations
 from ._topology_operations import TopologyOperations
 from ._jit_network_access_policies_operations import JitNetworkAccessPoliciesOperations
+from ._discovered_security_solutions_operations import DiscoveredSecuritySolutionsOperations
+from ._external_security_solutions_operations import ExternalSecuritySolutionsOperations
 
 __all__ = [
     'ComplianceResultsOperations',
@@ -54,8 +54,6 @@
     'IotSecuritySolutionAnalyticsOperations',
     'IotSecuritySolutionsAnalyticsAggregatedAlertOperations',
     'IotSecuritySolutionsAnalyticsRecommendationOperations',
-    'DiscoveredSecuritySolutionsOperations',
-    'ExternalSecuritySolutionsOperations',
     'LocationsOperations',
     'Operations',
     'TasksOperations',
@@ -77,4 +75,6 @@
     'AllowedConnectionsOperations',
     'TopologyOperations',
     'JitNetworkAccessPoliciesOperations',
+    'DiscoveredSecuritySolutionsOperations',
+    'ExternalSecuritySolutionsOperations',
 ]

sdk/security/azure-mgmt-security/azure/mgmt/security/operations/_discovered_security_solutions_operations.py

@@ -25,7 +25,7 @@ class DiscoveredSecuritySolutionsOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: API version for the operation. Constant value: "2015-06-01-preview".
+    :ivar api_version: API version for the operation. Constant value: "2020-01-01".
     """
 
     models = models
@@ -35,7 +35,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2015-06-01-preview"
+        self.api_version = "2020-01-01"
 
         self.config = config
 

sdk/security/azure-mgmt-security/azure/mgmt/security/operations/_external_security_solutions_operations.py

@@ -25,7 +25,7 @@ class ExternalSecuritySolutionsOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: API version for the operation. Constant value: "2015-06-01-preview".
+    :ivar api_version: API version for the operation. Constant value: "2020-01-01".
     """
 
     models = models
@@ -35,7 +35,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2015-06-01-preview"
+        self.api_version = "2020-01-01"
 
         self.config = config