[AutoPR security/resource-manager] Changes to the JIT API for Firewal…

…l Support (#6047) * Generated from 0a90b13aa3eeec05f438be7bbe0eb444a084e789 Update jitNetworkAccessPolicies.json * Generated from 77db60c613fff13703dc99ca4aaa81bfbd4900ef Update jitNetworkAccessPolicies.json * Generated from 77db60c613fff13703dc99ca4aaa81bfbd4900ef Update jitNetworkAccessPolicies.json
Azure · Aug 1, 2019 · 66407bd · 66407bd
1 parent 9820cd6
commit 66407bd
Show file tree

Hide file tree

Showing 12 changed files with 507 additions and 2 deletions.
diff --git a/sdk/security/azure-mgmt-security/azure/mgmt/security/models/__init__.py b/sdk/security/azure-mgmt-security/azure/mgmt/security/models/__init__.py
@@ -68,6 +68,8 @@
     from .regulatory_compliance_standard_py3 import RegulatoryComplianceStandard
     from .regulatory_compliance_control_py3 import RegulatoryComplianceControl
     from .regulatory_compliance_assessment_py3 import RegulatoryComplianceAssessment
+    from .server_vulnerability_assessment_py3 import ServerVulnerabilityAssessment
+    from .server_vulnerability_assessments_list_py3 import ServerVulnerabilityAssessmentsList
 except (SyntaxError, ImportError):
     from .compliance_result import ComplianceResult
     from .asc_location import AscLocation
@@ -127,6 +129,8 @@
     from .regulatory_compliance_standard import RegulatoryComplianceStandard
     from .regulatory_compliance_control import RegulatoryComplianceControl
     from .regulatory_compliance_assessment import RegulatoryComplianceAssessment
+    from .server_vulnerability_assessment import ServerVulnerabilityAssessment
+    from .server_vulnerability_assessments_list import ServerVulnerabilityAssessmentsList
 from .compliance_result_paged import ComplianceResultPaged
 from .alert_paged import AlertPaged
 from .setting_paged import SettingPaged
@@ -223,6 +227,8 @@
     'RegulatoryComplianceStandard',
     'RegulatoryComplianceControl',
     'RegulatoryComplianceAssessment',
+    'ServerVulnerabilityAssessment',
+    'ServerVulnerabilityAssessmentsList',
     'ComplianceResultPaged',
     'AlertPaged',
     'SettingPaged',

diff --git a/...ure-mgmt-security/azure/mgmt/security/models/jit_network_access_policy_virtual_machine.py b/...ure-mgmt-security/azure/mgmt/security/models/jit_network_access_policy_virtual_machine.py
@@ -22,6 +22,9 @@ class JitNetworkAccessPolicyVirtualMachine(Model):
     :type id: str
     :param ports: Required. Port configurations for the virtual machine
     :type ports: list[~azure.mgmt.security.models.JitNetworkAccessPortRule]
+    :param public_ip_address: Public IP address of the Azure Firewall that is
+     linked to this policy, if applicable
+    :type public_ip_address: str
     """
 
     _validation = {
@@ -32,9 +35,11 @@ class JitNetworkAccessPolicyVirtualMachine(Model):
     _attribute_map = {
         'id': {'key': 'id', 'type': 'str'},
         'ports': {'key': 'ports', 'type': '[JitNetworkAccessPortRule]'},
+        'public_ip_address': {'key': 'publicIpAddress', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
         super(JitNetworkAccessPolicyVirtualMachine, self).__init__(**kwargs)
         self.id = kwargs.get('id', None)
         self.ports = kwargs.get('ports', None)
+        self.public_ip_address = kwargs.get('public_ip_address', None)
diff --git a/...mgmt-security/azure/mgmt/security/models/jit_network_access_policy_virtual_machine_py3.py b/...mgmt-security/azure/mgmt/security/models/jit_network_access_policy_virtual_machine_py3.py
@@ -22,6 +22,9 @@ class JitNetworkAccessPolicyVirtualMachine(Model):
     :type id: str
     :param ports: Required. Port configurations for the virtual machine
     :type ports: list[~azure.mgmt.security.models.JitNetworkAccessPortRule]
+    :param public_ip_address: Public IP address of the Azure Firewall that is
+     linked to this policy, if applicable
+    :type public_ip_address: str
     """
 
     _validation = {
@@ -32,9 +35,11 @@ class JitNetworkAccessPolicyVirtualMachine(Model):
     _attribute_map = {
         'id': {'key': 'id', 'type': 'str'},
         'ports': {'key': 'ports', 'type': '[JitNetworkAccessPortRule]'},
+        'public_ip_address': {'key': 'publicIpAddress', 'type': 'str'},
     }
 
-    def __init__(self, *, id: str, ports, **kwargs) -> None:
+    def __init__(self, *, id: str, ports, public_ip_address: str=None, **kwargs) -> None:
         super(JitNetworkAccessPolicyVirtualMachine, self).__init__(**kwargs)
         self.id = id
         self.ports = ports
+        self.public_ip_address = public_ip_address
diff --git a/...ecurity/azure-mgmt-security/azure/mgmt/security/models/jit_network_access_request_port.py b/...ecurity/azure-mgmt-security/azure/mgmt/security/models/jit_network_access_request_port.py
@@ -36,6 +36,9 @@ class JitNetworkAccessRequestPort(Model):
      value. Possible values include: 'Expired', 'UserRequested',
      'NewerRequestInitiated'
     :type status_reason: str or ~azure.mgmt.security.models.StatusReason
+    :param mapped_port: The port which is mapped to this port's `number` in
+     the Azure Firewall, if applicable
+    :type mapped_port: int
     """
 
     _validation = {
@@ -52,6 +55,7 @@ class JitNetworkAccessRequestPort(Model):
         'end_time_utc': {'key': 'endTimeUtc', 'type': 'iso-8601'},
         'status': {'key': 'status', 'type': 'str'},
         'status_reason': {'key': 'statusReason', 'type': 'str'},
+        'mapped_port': {'key': 'mappedPort', 'type': 'int'},
     }
 
     def __init__(self, **kwargs):
@@ -62,3 +66,4 @@ def __init__(self, **kwargs):
         self.end_time_utc = kwargs.get('end_time_utc', None)
         self.status = kwargs.get('status', None)
         self.status_reason = kwargs.get('status_reason', None)
+        self.mapped_port = kwargs.get('mapped_port', None)
diff --git a/...ity/azure-mgmt-security/azure/mgmt/security/models/jit_network_access_request_port_py3.py b/...ity/azure-mgmt-security/azure/mgmt/security/models/jit_network_access_request_port_py3.py
@@ -36,6 +36,9 @@ class JitNetworkAccessRequestPort(Model):
      value. Possible values include: 'Expired', 'UserRequested',
      'NewerRequestInitiated'
     :type status_reason: str or ~azure.mgmt.security.models.StatusReason
+    :param mapped_port: The port which is mapped to this port's `number` in
+     the Azure Firewall, if applicable
+    :type mapped_port: int
     """
 
     _validation = {
@@ -52,13 +55,15 @@ class JitNetworkAccessRequestPort(Model):
         'end_time_utc': {'key': 'endTimeUtc', 'type': 'iso-8601'},
         'status': {'key': 'status', 'type': 'str'},
         'status_reason': {'key': 'statusReason', 'type': 'str'},
+        'mapped_port': {'key': 'mappedPort', 'type': 'int'},
     }
 
-    def __init__(self, *, number: int, end_time_utc, status, status_reason, allowed_source_address_prefix: str=None, allowed_source_address_prefixes=None, **kwargs) -> None:
+    def __init__(self, *, number: int, end_time_utc, status, status_reason, allowed_source_address_prefix: str=None, allowed_source_address_prefixes=None, mapped_port: int=None, **kwargs) -> None:
         super(JitNetworkAccessRequestPort, self).__init__(**kwargs)
         self.number = number
         self.allowed_source_address_prefix = allowed_source_address_prefix
         self.allowed_source_address_prefixes = allowed_source_address_prefixes
         self.end_time_utc = end_time_utc
         self.status = status
         self.status_reason = status_reason
+        self.mapped_port = mapped_port
diff --git a/...ecurity/azure-mgmt-security/azure/mgmt/security/models/server_vulnerability_assessment.py b/...ecurity/azure-mgmt-security/azure/mgmt/security/models/server_vulnerability_assessment.py
@@ -0,0 +1,49 @@
+# 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 .resource import Resource
+
+
+class ServerVulnerabilityAssessment(Resource):
+    """Describes the server vulnerability assessment details on a resource.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Resource Id
+    :vartype id: str
+    :ivar name: Resource name
+    :vartype name: str
+    :ivar type: Resource type
+    :vartype type: str
+    :ivar provisioning_state: The provisioningState of the vulnerability
+     assessment capability on the VM. Possible values include: 'Succeeded',
+     'Failed', 'Canceled', 'Provisioning', 'Deprovisioning'
+    :vartype provisioning_state: str or ~azure.mgmt.security.models.enum
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'provisioning_state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ServerVulnerabilityAssessment, self).__init__(**kwargs)
+        self.provisioning_state = None
diff --git a/...ity/azure-mgmt-security/azure/mgmt/security/models/server_vulnerability_assessment_py3.py b/...ity/azure-mgmt-security/azure/mgmt/security/models/server_vulnerability_assessment_py3.py
@@ -0,0 +1,49 @@
+# 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 .resource_py3 import Resource
+
+
+class ServerVulnerabilityAssessment(Resource):
+    """Describes the server vulnerability assessment details on a resource.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Resource Id
+    :vartype id: str
+    :ivar name: Resource name
+    :vartype name: str
+    :ivar type: Resource type
+    :vartype type: str
+    :ivar provisioning_state: The provisioningState of the vulnerability
+     assessment capability on the VM. Possible values include: 'Succeeded',
+     'Failed', 'Canceled', 'Provisioning', 'Deprovisioning'
+    :vartype provisioning_state: str or ~azure.mgmt.security.models.enum
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'provisioning_state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(ServerVulnerabilityAssessment, self).__init__(**kwargs)
+        self.provisioning_state = None
diff --git a/...y/azure-mgmt-security/azure/mgmt/security/models/server_vulnerability_assessments_list.py b/...y/azure-mgmt-security/azure/mgmt/security/models/server_vulnerability_assessments_list.py
@@ -0,0 +1,29 @@
+# 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 ServerVulnerabilityAssessmentsList(Model):
+    """List of server vulnerability assessments.
+
+    :param value:
+    :type value:
+     list[~azure.mgmt.security.models.ServerVulnerabilityAssessment]
+    """
+
+    _attribute_map = {
+        'value': {'key': 'value', 'type': '[ServerVulnerabilityAssessment]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ServerVulnerabilityAssessmentsList, self).__init__(**kwargs)
+        self.value = kwargs.get('value', None)
diff --git a/...ure-mgmt-security/azure/mgmt/security/models/server_vulnerability_assessments_list_py3.py b/...ure-mgmt-security/azure/mgmt/security/models/server_vulnerability_assessments_list_py3.py
@@ -0,0 +1,29 @@
+# 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 ServerVulnerabilityAssessmentsList(Model):
+    """List of server vulnerability assessments.
+
+    :param value:
+    :type value:
+     list[~azure.mgmt.security.models.ServerVulnerabilityAssessment]
+    """
+
+    _attribute_map = {
+        'value': {'key': 'value', 'type': '[ServerVulnerabilityAssessment]'},
+    }
+
+    def __init__(self, *, value=None, **kwargs) -> None:
+        super(ServerVulnerabilityAssessmentsList, self).__init__(**kwargs)
+        self.value = value
diff --git a/sdk/security/azure-mgmt-security/azure/mgmt/security/operations/__init__.py b/sdk/security/azure-mgmt-security/azure/mgmt/security/operations/__init__.py
@@ -30,6 +30,7 @@
 from .regulatory_compliance_standards_operations import RegulatoryComplianceStandardsOperations
 from .regulatory_compliance_controls_operations import RegulatoryComplianceControlsOperations
 from .regulatory_compliance_assessments_operations import RegulatoryComplianceAssessmentsOperations
+from .server_vulnerability_assessment_operations import ServerVulnerabilityAssessmentOperations
 
 __all__ = [
     'ComplianceResultsOperations',
@@ -53,4 +54,5 @@
     'RegulatoryComplianceStandardsOperations',
     'RegulatoryComplianceControlsOperations',
     'RegulatoryComplianceAssessmentsOperations',
+    'ServerVulnerabilityAssessmentOperations',
 ]