Skip to content

Commit 74dd84c

Browse files
mhamzak008mhamzak008
authored
Merge pull request #27 from opsgenie/fix-alert-responders
Fix alert & incident responders
2 parents c2e9ef0 + affe339 commit 74dd84c

21 files changed

+129
-50
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
This Python package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
44

55
- API version: 2.0.0
6-
- Package version: 2.0.1
6+
- Package version: 2.0.2
77
- Build package: com.atlassian.opsgenie.codegen.geniepy.GeniepyGenerator
88

99
For more information, please visit [https://www.opsgenie.com/contact-us](https://www.opsgenie.com/contact-us)

‎docs/Alert.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Name | Type | Description | Notes
2020
**source** | **str** | | [optional]
2121
**owner** | **str** | | [optional]
2222
**priority** | **str** | | [optional]
23-
**responders** | [**list[Recipient]**](Recipient.md) | | [optional]
23+
**responders** | [**list[Responder]**](Responder.md) | | [optional]
2424
**integration** | [**AlertIntegration**](AlertIntegration.md) | | [optional]
2525
**report** | [**AlertReport**](AlertReport.md) | | [optional]
2626
**actions** | **list[str]** | | [optional]

‎docs/BaseAlert.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Name | Type | Description | Notes
2020
**source** | **str** | | [optional]
2121
**owner** | **str** | | [optional]
2222
**priority** | **str** | | [optional]
23-
**responders** | [**list[Recipient]**](Recipient.md) | | [optional]
23+
**responders** | [**list[Responder]**](Responder.md) | | [optional]
2424
**integration** | [**AlertIntegration**](AlertIntegration.md) | | [optional]
2525
**report** | [**AlertReport**](AlertReport.md) | | [optional]
2626

‎docs/BaseIncident.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Name | Type | Description | Notes
1414
**source** | **str** | | [optional]
1515
**owner** | **str** | | [optional]
1616
**priority** | **str** | | [optional]
17-
**responders** | [**list[Recipient]**](Recipient.md) | | [optional]
17+
**responders** | [**list[Responder]**](Responder.md) | | [optional]
1818
**team_id** | **str** | | [optional]
1919
**details** | **dict(str, str)** | Map of key-value pairs to use as custom properties of the incident | [optional]
2020

‎docs/Incident.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Name | Type | Description | Notes
1414
**source** | **str** | | [optional]
1515
**owner** | **str** | | [optional]
1616
**priority** | **str** | | [optional]
17-
**responders** | [**list[Recipient]**](Recipient.md) | | [optional]
17+
**responders** | [**list[Responder]**](Responder.md) | | [optional]
1818
**team_id** | **str** | | [optional]
1919
**details** | **dict(str, str)** | Map of key-value pairs to use as custom properties of the incident | [optional]
2020
**request_id** | **str** | | [optional]

‎docs/TeamResponder.md

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
## Properties
44
Name | Type | Description | Notes
55
------------ | ------------- | ------------- | -------------
6+
**type** | **str** | |
7+
**id** | **str** | |
68
**name** | **str** | | [optional]
79

810
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

‎docs/UserResponder.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
## Properties
44
Name | Type | Description | Notes
55
------------ | ------------- | ------------- | -------------
6-
**id** | **str** | | [optional]
6+
**type** | **str** | |
7+
**id** | **str** | |
78

89
[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
910

‎opsgenie-oas.json

+2-5
Original file line numberDiff line numberDiff line change
@@ -4518,7 +4518,6 @@
45184518
"Responder": {
45194519
"x-opsgenie-domain": "common",
45204520
"type": "object",
4521-
"discriminator": "type",
45224521
"required": [
45234522
"type",
45244523
"id"
@@ -4538,7 +4537,6 @@
45384537
},
45394538
"UserResponder": {
45404539
"x-opsgenie-domain": "common",
4541-
"x-discriminator-value": "user",
45424540
"description": "User responder",
45434541
"allOf": [
45444542
{
@@ -4556,7 +4554,6 @@
45564554
},
45574555
"TeamResponder": {
45584556
"x-opsgenie-domain": "common",
4559-
"x-discriminator-value": "team",
45604557
"description": "Team responder",
45614558
"allOf": [
45624559
{
@@ -5294,7 +5291,7 @@
52945291
"responders": {
52955292
"type": "array",
52965293
"items": {
5297-
"$ref": "#/definitions/Recipient"
5294+
"$ref": "#/definitions/Responder"
52985295
}
52995296
},
53005297
"integration": {
@@ -6127,7 +6124,7 @@
61276124
"responders": {
61286125
"type": "array",
61296126
"items": {
6130-
"$ref": "#/definitions/Recipient"
6127+
"$ref": "#/definitions/Responder"
61316128
}
61326129
},
61336130
"teamId": {

‎opsgenie-oas.yml

+2-6
Original file line numberDiff line numberDiff line change
@@ -9105,7 +9105,7 @@ components:
91059105
responders:
91069106
type: array
91079107
items:
9108-
$ref: '#/components/schemas/Recipient'
9108+
$ref: '#/components/schemas/Responder'
91099109
integration:
91109110
$ref: '#/components/schemas/AlertIntegration'
91119111
report:
@@ -9217,8 +9217,6 @@ components:
92179217
- team
92189218
id:
92199219
type: string
9220-
discriminator:
9221-
propertyName: type
92229220
x-opsgenie-domain: common
92239221
AssignAlertPayload:
92249222
allOf:
@@ -9239,7 +9237,6 @@ components:
92399237
id:
92409238
type: string
92419239
x-opsgenie-domain: common
9242-
x-discriminator-value: user
92439240
AddTagsToAlertPayload:
92449241
allOf:
92459242
- $ref: '#/components/schemas/AlertActionPayload'
@@ -9315,7 +9312,7 @@ components:
93159312
responders:
93169313
type: array
93179314
items:
9318-
$ref: '#/components/schemas/Recipient'
9315+
$ref: '#/components/schemas/Responder'
93199316
teamId:
93209317
type: string
93219318
details:
@@ -9337,7 +9334,6 @@ components:
93379334
name:
93389335
type: string
93399336
x-opsgenie-domain: common
9340-
x-discriminator-value: team
93419337
WeekdayTimeRestrictionInterval:
93429338
description: Weekday time restriction interval
93439339
allOf:

‎opsgenie_sdk/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@
168168
from opsgenie_sdk.models.weekday_time_restriction_interval import WeekdayTimeRestrictionInterval
169169
from opsgenie_sdk.models.weekday_time_restriction_interval_all_of import WeekdayTimeRestrictionIntervalAllOf
170170

171-
__version__ = "2.0.1"
171+
__version__ = "2.0.2"
172172

173173
# import apis into sdk package
174174

‎opsgenie_sdk/api/alert/alert.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class Alert(object):
4949
'source': 'str',
5050
'owner': 'str',
5151
'priority': 'str',
52-
'responders': 'list[Recipient]',
52+
'responders': 'list[Responder]',
5353
'integration': 'AlertIntegration',
5454
'report': 'AlertReport',
5555
'actions': 'list[str]',
@@ -527,7 +527,7 @@ def responders(self):
527527
528528
529529
:return: The responders of this Alert. # noqa: E501
530-
:rtype: list[Recipient]
530+
:rtype: list[Responder]
531531
"""
532532
return self._responders
533533

@@ -537,7 +537,7 @@ def responders(self, responders):
537537
538538
539539
:param responders: The responders of this Alert. # noqa: E501
540-
:type: list[Recipient]
540+
:type: list[Responder]
541541
"""
542542

543543
self._responders = responders

‎opsgenie_sdk/api/alert/base_alert.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class BaseAlert(object):
4949
'source': 'str',
5050
'owner': 'str',
5151
'priority': 'str',
52-
'responders': 'list[Recipient]',
52+
'responders': 'list[Responder]',
5353
'integration': 'AlertIntegration',
5454
'report': 'AlertReport'
5555
}
@@ -507,7 +507,7 @@ def responders(self):
507507
508508
509509
:return: The responders of this BaseAlert. # noqa: E501
510-
:rtype: list[Recipient]
510+
:rtype: list[Responder]
511511
"""
512512
return self._responders
513513

@@ -517,7 +517,7 @@ def responders(self, responders):
517517
518518
519519
:param responders: The responders of this BaseAlert. # noqa: E501
520-
:type: list[Recipient]
520+
:type: list[Responder]
521521
"""
522522

523523
self._responders = responders

‎opsgenie_sdk/api/incident/base_incident.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class BaseIncident(object):
4343
'source': 'str',
4444
'owner': 'str',
4545
'priority': 'str',
46-
'responders': 'list[Recipient]',
46+
'responders': 'list[Responder]',
4747
'team_id': 'str',
4848
'details': 'dict(str, str)'
4949
}
@@ -351,7 +351,7 @@ def responders(self):
351351
352352
353353
:return: The responders of this BaseIncident. # noqa: E501
354-
:rtype: list[Recipient]
354+
:rtype: list[Responder]
355355
"""
356356
return self._responders
357357

@@ -361,7 +361,7 @@ def responders(self, responders):
361361
362362
363363
:param responders: The responders of this BaseIncident. # noqa: E501
364-
:type: list[Recipient]
364+
:type: list[Responder]
365365
"""
366366

367367
self._responders = responders

‎opsgenie_sdk/api/incident/incident.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class Incident(object):
4343
'source': 'str',
4444
'owner': 'str',
4545
'priority': 'str',
46-
'responders': 'list[Recipient]',
46+
'responders': 'list[Responder]',
4747
'team_id': 'str',
4848
'details': 'dict(str, str)',
4949
'request_id': 'str'
@@ -356,7 +356,7 @@ def responders(self):
356356
357357
358358
:return: The responders of this Incident. # noqa: E501
359-
:rtype: list[Recipient]
359+
:rtype: list[Responder]
360360
"""
361361
return self._responders
362362

@@ -366,7 +366,7 @@ def responders(self, responders):
366366
367367
368368
:param responders: The responders of this Incident. # noqa: E501
369-
:type: list[Recipient]
369+
:type: list[Responder]
370370
"""
371371

372372
self._responders = responders

‎opsgenie_sdk/api_client.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
9191
self.default_headers[header_name] = header_value
9292
self.cookie = cookie
9393
# Set default User-Agent.
94-
self.user_agent = 'opsgenie-sdk-python-2.0.1'
94+
self.user_agent = 'opsgenie-sdk-python-2.0.2'
9595

9696
# init metric publishers
9797
self.http_metric_publisher = self.rest_client.http_metric

‎opsgenie_sdk/configuration.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ def to_debug_report(self):
254254
"OS: {env}\n"\
255255
"Python Version: {pyversion}\n"\
256256
"Version of the API: 2.0.0\n"\
257-
"SDK Package Version: 2.0.1".\
257+
"SDK Package Version: 2.0.2".\
258258
format(env=sys.platform, pyversion=sys.version)
259259

260260
def get_host_settings(self):

‎opsgenie_sdk/models/responder.py

+1-12
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,12 @@ class Responder(object):
4141
'id': 'id'
4242
}
4343

44-
discriminator_value_class_map = {
45-
'user': 'UserResponder',
46-
'team': 'TeamResponder'
47-
}
48-
4944
def __init__(self, type=None, id=None): # noqa: E501
5045
"""Responder - a model defined in OpenAPI""" # noqa: E501
5146

5247
self._type = None
5348
self._id = None
54-
self.discriminator = 'type'
49+
self.discriminator = None
5550

5651
self.type = type
5752
self.id = id
@@ -108,12 +103,6 @@ def id(self, id):
108103

109104
self._id = id
110105

111-
def get_real_child_model(self, data):
112-
"""Returns the real base class specified by the discriminator"""
113-
discriminator_key = self.attribute_map[self.discriminator]
114-
discriminator_value = data[discriminator_key]
115-
return self.discriminator_value_class_map.get(discriminator_value)
116-
117106
def to_dict(self):
118107
"""Returns the model properties as a dict"""
119108
result = {}

‎opsgenie_sdk/models/team_responder.py

+61-1
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,82 @@ class TeamResponder(object):
3232
and the value is json key in definition.
3333
"""
3434
openapi_types = {
35+
'type': 'str',
36+
'id': 'str',
3537
'name': 'str'
3638
}
3739

3840
attribute_map = {
41+
'type': 'type',
42+
'id': 'id',
3943
'name': 'name'
4044
}
4145

42-
def __init__(self, name=None): # noqa: E501
46+
def __init__(self, type=None, id=None, name=None): # noqa: E501
4347
"""TeamResponder - a model defined in OpenAPI""" # noqa: E501
4448

49+
self._type = None
50+
self._id = None
4551
self._name = None
4652
self.discriminator = None
4753

54+
self.type = type
55+
self.id = id
4856
if name is not None:
4957
self.name = name
5058

59+
@property
60+
def type(self):
61+
"""Gets the type of this TeamResponder. # noqa: E501
62+
63+
64+
:return: The type of this TeamResponder. # noqa: E501
65+
:rtype: str
66+
"""
67+
return self._type
68+
69+
@type.setter
70+
def type(self, type):
71+
"""Sets the type of this TeamResponder.
72+
73+
74+
:param type: The type of this TeamResponder. # noqa: E501
75+
:type: str
76+
"""
77+
if type is None:
78+
raise ValueError("Invalid value for `type`, must not be `None`") # noqa: E501
79+
allowed_values = ["user", "team"] # noqa: E501
80+
if type not in allowed_values:
81+
raise ValueError(
82+
"Invalid value for `type` ({0}), must be one of {1}" # noqa: E501
83+
.format(type, allowed_values)
84+
)
85+
86+
self._type = type
87+
88+
@property
89+
def id(self):
90+
"""Gets the id of this TeamResponder. # noqa: E501
91+
92+
93+
:return: The id of this TeamResponder. # noqa: E501
94+
:rtype: str
95+
"""
96+
return self._id
97+
98+
@id.setter
99+
def id(self, id):
100+
"""Sets the id of this TeamResponder.
101+
102+
103+
:param id: The id of this TeamResponder. # noqa: E501
104+
:type: str
105+
"""
106+
if id is None:
107+
raise ValueError("Invalid value for `id`, must not be `None`") # noqa: E501
108+
109+
self._id = id
110+
51111
@property
52112
def name(self):
53113
"""Gets the name of this TeamResponder. # noqa: E501

0 commit comments

Comments
 (0)