[AutoPR securityinsights/resource-manager] fix ResourceWithEtag not to contain inheritance to fix the multiple i…

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

@@ -16,7 +16,8 @@
     from .aatp_data_connector_py3 import AATPDataConnector
     from .asc_data_connector_py3 import ASCDataConnector
     from .account_entity_py3 import AccountEntity
-    from .action_py3 import Action
+    from .action_request_py3 import ActionRequest
+    from .action_response_py3 import ActionResponse
     from .aggregations_py3 import Aggregations
     from .aggregations_kind1_py3 import AggregationsKind1
     from .alert_rule_py3 import AlertRule
@@ -28,6 +29,11 @@
     from .aws_cloud_trail_data_connector_data_types_py3 import AwsCloudTrailDataConnectorDataTypes
     from .aws_cloud_trail_data_connector_py3 import AwsCloudTrailDataConnector
     from .azure_resource_entity_py3 import AzureResourceEntity
+    from .relation_base_py3 import RelationBase
+    from .case_relation_py3 import CaseRelation
+    from .bookmark_relation_py3 import BookmarkRelation
+    from .relation_node_py3 import RelationNode
+    from .relations_model_input_py3 import RelationsModelInput
     from .user_info_py3 import UserInfo
     from .bookmark_py3 import Bookmark
     from .case_py3 import Case
@@ -100,7 +106,8 @@
     from .aatp_data_connector import AATPDataConnector
     from .asc_data_connector import ASCDataConnector
     from .account_entity import AccountEntity
-    from .action import Action
+    from .action_request import ActionRequest
+    from .action_response import ActionResponse
     from .aggregations import Aggregations
     from .aggregations_kind1 import AggregationsKind1
     from .alert_rule import AlertRule
@@ -112,6 +119,11 @@
     from .aws_cloud_trail_data_connector_data_types import AwsCloudTrailDataConnectorDataTypes
     from .aws_cloud_trail_data_connector import AwsCloudTrailDataConnector
     from .azure_resource_entity import AzureResourceEntity
+    from .relation_base import RelationBase
+    from .case_relation import CaseRelation
+    from .bookmark_relation import BookmarkRelation
+    from .relation_node import RelationNode
+    from .relations_model_input import RelationsModelInput
     from .user_info import UserInfo
     from .bookmark import Bookmark
     from .case import Case
@@ -179,11 +191,13 @@
     from .url_entity import UrlEntity
 from .operation_paged import OperationPaged
 from .alert_rule_paged import AlertRulePaged
-from .action_paged import ActionPaged
+from .action_response_paged import ActionResponsePaged
 from .alert_rule_template_paged import AlertRuleTemplatePaged
 from .case_paged import CasePaged
 from .case_comment_paged import CaseCommentPaged
 from .bookmark_paged import BookmarkPaged
+from .case_relation_paged import CaseRelationPaged
+from .bookmark_relation_paged import BookmarkRelationPaged
 from .data_connector_paged import DataConnectorPaged
 from .entity_paged import EntityPaged
 from .office_consent_paged import OfficeConsentPaged
@@ -196,6 +210,8 @@
     AttackTactic,
     TriggerOperator,
     AlertSeverity,
+    RelationTypes,
+    RelationNodeKind,
     CloseReason,
     CaseSeverity,
     CaseStatus,
@@ -225,7 +241,8 @@
     'AATPDataConnector',
     'ASCDataConnector',
     'AccountEntity',
-    'Action',
+    'ActionRequest',
+    'ActionResponse',
     'Aggregations',
     'AggregationsKind1',
     'AlertRule',
@@ -237,6 +254,11 @@
     'AwsCloudTrailDataConnectorDataTypes',
     'AwsCloudTrailDataConnector',
     'AzureResourceEntity',
+    'RelationBase',
+    'CaseRelation',
+    'BookmarkRelation',
+    'RelationNode',
+    'RelationsModelInput',
     'UserInfo',
     'Bookmark',
     'Case',
@@ -304,11 +326,13 @@
     'UrlEntity',
     'OperationPaged',
     'AlertRulePaged',
-    'ActionPaged',
+    'ActionResponsePaged',
     'AlertRuleTemplatePaged',
     'CasePaged',
     'CaseCommentPaged',
     'BookmarkPaged',
+    'CaseRelationPaged',
+    'BookmarkRelationPaged',
     'DataConnectorPaged',
     'EntityPaged',
     'OfficeConsentPaged',
@@ -320,6 +344,8 @@
     'AttackTactic',
     'TriggerOperator',
     'AlertSeverity',
+    'RelationTypes',
+    'RelationNodeKind',
     'CloseReason',
     'CaseSeverity',
     'CaseStatus',

sdk/azure-mgmt-securityinsight/azure/mgmt/securityinsight/models/aad_data_connector.py

@@ -15,8 +15,17 @@
 class AADDataConnector(DataConnector):
     """Represents AAD (Azure Active Directory) data connector.
 
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
     All required parameters must be populated in order to send to Azure.
 
+    :ivar id: Azure resource Id
+    :vartype id: str
+    :ivar name: Azure resource name
+    :vartype name: str
+    :ivar type: Azure resource type
+    :vartype type: str
     :param etag: Etag of the azure resource
     :type etag: str
     :param kind: Required. Constant filled by server.
@@ -29,10 +38,16 @@ class AADDataConnector(DataConnector):
     """
 
     _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
         'kind': {'required': True},
     }
 
     _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
         'etag': {'key': 'etag', 'type': 'str'},
         'kind': {'key': 'kind', 'type': 'str'},
         'tenant_id': {'key': 'properties.tenantId', 'type': 'str'},

sdk/azure-mgmt-securityinsight/azure/mgmt/securityinsight/models/aad_data_connector_py3.py

@@ -15,8 +15,17 @@
 class AADDataConnector(DataConnector):
     """Represents AAD (Azure Active Directory) data connector.
 
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
     All required parameters must be populated in order to send to Azure.
 
+    :ivar id: Azure resource Id
+    :vartype id: str
+    :ivar name: Azure resource name
+    :vartype name: str
+    :ivar type: Azure resource type
+    :vartype type: str
     :param etag: Etag of the azure resource
     :type etag: str
     :param kind: Required. Constant filled by server.
@@ -29,10 +38,16 @@ class AADDataConnector(DataConnector):
     """
 
     _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
         'kind': {'required': True},
     }
 
     _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
         'etag': {'key': 'etag', 'type': 'str'},
         'kind': {'key': 'kind', 'type': 'str'},
         'tenant_id': {'key': 'properties.tenantId', 'type': 'str'},

sdk/azure-mgmt-securityinsight/azure/mgmt/securityinsight/models/aatp_data_connector.py

@@ -15,8 +15,17 @@
 class AATPDataConnector(DataConnector):
     """Represents AATP (Azure Advanced Threat Protection) data connector.
 
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
     All required parameters must be populated in order to send to Azure.
 
+    :ivar id: Azure resource Id
+    :vartype id: str
+    :ivar name: Azure resource name
+    :vartype name: str
+    :ivar type: Azure resource type
+    :vartype type: str
     :param etag: Etag of the azure resource
     :type etag: str
     :param kind: Required. Constant filled by server.
@@ -29,10 +38,16 @@ class AATPDataConnector(DataConnector):
     """
 
     _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
         'kind': {'required': True},
     }
 
     _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
         'etag': {'key': 'etag', 'type': 'str'},
         'kind': {'key': 'kind', 'type': 'str'},
         'tenant_id': {'key': 'properties.tenantId', 'type': 'str'},

sdk/azure-mgmt-securityinsight/azure/mgmt/securityinsight/models/aatp_data_connector_py3.py

@@ -15,8 +15,17 @@
 class AATPDataConnector(DataConnector):
     """Represents AATP (Azure Advanced Threat Protection) data connector.
 
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
     All required parameters must be populated in order to send to Azure.
 
+    :ivar id: Azure resource Id
+    :vartype id: str
+    :ivar name: Azure resource name
+    :vartype name: str
+    :ivar type: Azure resource type
+    :vartype type: str
     :param etag: Etag of the azure resource
     :type etag: str
     :param kind: Required. Constant filled by server.
@@ -29,10 +38,16 @@ class AATPDataConnector(DataConnector):
     """
 
     _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
         'kind': {'required': True},
     }
 
     _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
         'etag': {'key': 'etag', 'type': 'str'},
         'kind': {'key': 'kind', 'type': 'str'},
         'tenant_id': {'key': 'properties.tenantId', 'type': 'str'},

sdk/azure-mgmt-securityinsight/azure/mgmt/securityinsight/models/action.py → sdk/azure-mgmt-securityinsight/azure/mgmt/securityinsight/models/action_request.py

@@ -12,7 +12,7 @@
 from .resource_with_etag import ResourceWithEtag
 
 
-class Action(ResourceWithEtag):
+class ActionRequest(ResourceWithEtag):
     """Action for alert rule.
 
     Variables are only populated by the server, and will be ignored when
@@ -26,7 +26,7 @@ class Action(ResourceWithEtag):
     :vartype type: str
     :param etag: Etag of the azure resource
     :type etag: str
-    :param trigger_uri: The uri for the action to trigger.
+    :param trigger_uri: Logic App Callback URL for this specific workflow.
     :type trigger_uri: str
     """
 
@@ -45,5 +45,5 @@ class Action(ResourceWithEtag):
     }
 
     def __init__(self, **kwargs):
-        super(Action, self).__init__(**kwargs)
+        super(ActionRequest, self).__init__(**kwargs)
         self.trigger_uri = kwargs.get('trigger_uri', None)

sdk/azure-mgmt-securityinsight/azure/mgmt/securityinsight/models/action_py3.py → sdk/azure-mgmt-securityinsight/azure/mgmt/securityinsight/models/action_request_py3.py

@@ -12,7 +12,7 @@
 from .resource_with_etag_py3 import ResourceWithEtag
 
 
-class Action(ResourceWithEtag):
+class ActionRequest(ResourceWithEtag):
     """Action for alert rule.
 
     Variables are only populated by the server, and will be ignored when
@@ -26,7 +26,7 @@ class Action(ResourceWithEtag):
     :vartype type: str
     :param etag: Etag of the azure resource
     :type etag: str
-    :param trigger_uri: The uri for the action to trigger.
+    :param trigger_uri: Logic App Callback URL for this specific workflow.
     :type trigger_uri: str
     """
 
@@ -45,5 +45,5 @@ class Action(ResourceWithEtag):
     }
 
     def __init__(self, *, etag: str=None, trigger_uri: str=None, **kwargs) -> None:
-        super(Action, self).__init__(etag=etag, **kwargs)
+        super(ActionRequest, self).__init__(etag=etag, **kwargs)
         self.trigger_uri = trigger_uri

sdk/azure-mgmt-securityinsight/azure/mgmt/securityinsight/models/action_response.py

@@ -0,0 +1,50 @@
+# 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 ActionResponse(Resource):
+    """Action for alert rule.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Azure resource Id
+    :vartype id: str
+    :ivar name: Azure resource name
+    :vartype name: str
+    :ivar type: Azure resource type
+    :vartype type: str
+    :param etag: Etag of the action.
+    :type etag: str
+    :param workflow_id: The name of the logic app's workflow.
+    :type workflow_id: str
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'etag': {'key': 'etag', 'type': 'str'},
+        'workflow_id': {'key': 'properties.workflowId', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ActionResponse, self).__init__(**kwargs)
+        self.etag = kwargs.get('etag', None)
+        self.workflow_id = kwargs.get('workflow_id', None)

sdk/azure-mgmt-securityinsight/azure/mgmt/securityinsight/models/action_paged.py → sdk/azure-mgmt-securityinsight/azure/mgmt/securityinsight/models/action_response_paged.py

@@ -12,16 +12,16 @@
 from msrest.paging import Paged
 
 
-class ActionPaged(Paged):
+class ActionResponsePaged(Paged):
     """
-    A paging container for iterating over a list of :class:`Action <azure.mgmt.securityinsight.models.Action>` object
+    A paging container for iterating over a list of :class:`ActionResponse <azure.mgmt.securityinsight.models.ActionResponse>` object
     """
 
     _attribute_map = {
         'next_link': {'key': 'nextLink', 'type': 'str'},
-        'current_page': {'key': 'value', 'type': '[Action]'}
+        'current_page': {'key': 'value', 'type': '[ActionResponse]'}
     }
 
     def __init__(self, *args, **kwargs):
 
-        super(ActionPaged, self).__init__(*args, **kwargs)
+        super(ActionResponsePaged, self).__init__(*args, **kwargs)