Skip to content

Commit f69d474

Browse files
authored
Merge pull request microsoft#270 from microsoft/users/tedchamb/51cc
regen 5.1 apis, fix casing of some 5.1 properties.
2 parents d518e82 + 5e7af6b commit f69d474

File tree

10 files changed

+113
-89
lines changed

10 files changed

+113
-89
lines changed

azure-devops/azure/devops/released/notification/notification_client.py

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ def __init__(self, base_url=None, creds=None):
2727

2828
def list_logs(self, source, entry_id=None, start_time=None, end_time=None):
2929
"""ListLogs.
30-
List diagnostic logs this service.
31-
:param str source:
32-
:param str entry_id:
33-
:param datetime start_time:
34-
:param datetime end_time:
30+
Get a list of diagnostic logs for this service.
31+
:param str source: ID specifying which type of logs to check diagnostics for.
32+
:param str entry_id: The ID of the specific log to query for.
33+
:param datetime start_time: Start time for the time range to query in.
34+
:param datetime end_time: End time for the time range to query in.
3535
:rtype: [INotificationDiagnosticLog]
3636
"""
3737
route_values = {}
@@ -53,7 +53,8 @@ def list_logs(self, source, entry_id=None, start_time=None, end_time=None):
5353

5454
def get_subscription_diagnostics(self, subscription_id):
5555
"""GetSubscriptionDiagnostics.
56-
:param str subscription_id:
56+
Get the diagnostics settings for a subscription.
57+
:param str subscription_id: The id of the notifications subscription.
5758
:rtype: :class:`<SubscriptionDiagnostics> <azure.devops.v5_1.notification.models.SubscriptionDiagnostics>`
5859
"""
5960
route_values = {}
@@ -67,8 +68,9 @@ def get_subscription_diagnostics(self, subscription_id):
6768

6869
def update_subscription_diagnostics(self, update_parameters, subscription_id):
6970
"""UpdateSubscriptionDiagnostics.
71+
Update the diagnostics settings for a subscription.
7072
:param :class:`<UpdateSubscripitonDiagnosticsParameters> <azure.devops.v5_1.notification.models.UpdateSubscripitonDiagnosticsParameters>` update_parameters:
71-
:param str subscription_id:
73+
:param str subscription_id: The id of the notifications subscription.
7274
:rtype: :class:`<SubscriptionDiagnostics> <azure.devops.v5_1.notification.models.SubscriptionDiagnostics>`
7375
"""
7476
route_values = {}
@@ -85,7 +87,7 @@ def update_subscription_diagnostics(self, update_parameters, subscription_id):
8587
def get_event_type(self, event_type):
8688
"""GetEventType.
8789
Get a specific event type.
88-
:param str event_type:
90+
:param str event_type: The ID of the event type.
8991
:rtype: :class:`<NotificationEventType> <azure.devops.v5_1.notification.models.NotificationEventType>`
9092
"""
9193
route_values = {}
@@ -135,7 +137,8 @@ def update_settings(self, update_parameters):
135137

136138
def get_subscriber(self, subscriber_id):
137139
"""GetSubscriber.
138-
:param str subscriber_id:
140+
Get delivery preferences of a notifications subscriber.
141+
:param str subscriber_id: ID of the user or group.
139142
:rtype: :class:`<NotificationSubscriber> <azure.devops.v5_1.notification.models.NotificationSubscriber>`
140143
"""
141144
route_values = {}
@@ -149,8 +152,9 @@ def get_subscriber(self, subscriber_id):
149152

150153
def update_subscriber(self, update_parameters, subscriber_id):
151154
"""UpdateSubscriber.
155+
Update delivery preferences of a notifications subscriber.
152156
:param :class:`<NotificationSubscriberUpdateParameters> <azure.devops.v5_1.notification.models.NotificationSubscriberUpdateParameters>` update_parameters:
153-
:param str subscriber_id:
157+
:param str subscriber_id: ID of the user or group.
154158
:rtype: :class:`<NotificationSubscriber> <azure.devops.v5_1.notification.models.NotificationSubscriber>`
155159
"""
156160
route_values = {}

azure-devops/azure/devops/v5_1/audit/models.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ class AuditLogEntry(Model):
2727
:type data: dict
2828
:param id: EventId, should be unique
2929
:type id: str
30-
:param iPAddress: IP Address where the event was originated
31-
:type iPAddress: str
30+
:param ip_address: IP Address where the event was originated
31+
:type ip_address: str
3232
:param scope_id: The org, collection or project Id
3333
:type scope_id: str
3434
:param scope_type: The type of the scope, Enterprise, Organization or Project
@@ -48,14 +48,14 @@ class AuditLogEntry(Model):
4848
'correlation_id': {'key': 'correlationId', 'type': 'str'},
4949
'data': {'key': 'data', 'type': '{object}'},
5050
'id': {'key': 'id', 'type': 'str'},
51-
'iPAddress': {'key': 'ipAddress', 'type': 'str'},
51+
'ip_address': {'key': 'ipAddress', 'type': 'str'},
5252
'scope_id': {'key': 'scopeId', 'type': 'str'},
5353
'scope_type': {'key': 'scopeType', 'type': 'object'},
5454
'timestamp': {'key': 'timestamp', 'type': 'iso-8601'},
5555
'user_agent': {'key': 'userAgent', 'type': 'str'}
5656
}
5757

58-
def __init__(self, action_id=None, activity_id=None, actor_cUID=None, actor_user_id=None, authentication_mechanism=None, correlation_id=None, data=None, id=None, iPAddress=None, scope_id=None, scope_type=None, timestamp=None, user_agent=None):
58+
def __init__(self, action_id=None, activity_id=None, actor_cUID=None, actor_user_id=None, authentication_mechanism=None, correlation_id=None, data=None, id=None, ip_address=None, scope_id=None, scope_type=None, timestamp=None, user_agent=None):
5959
super(AuditLogEntry, self).__init__()
6060
self.action_id = action_id
6161
self.activity_id = activity_id
@@ -65,7 +65,7 @@ def __init__(self, action_id=None, activity_id=None, actor_cUID=None, actor_user
6565
self.correlation_id = correlation_id
6666
self.data = data
6767
self.id = id
68-
self.iPAddress = iPAddress
68+
self.ip_address = ip_address
6969
self.scope_id = scope_id
7070
self.scope_type = scope_type
7171
self.timestamp = timestamp

azure-devops/azure/devops/v5_1/cloud_load_test/models.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1503,8 +1503,8 @@ class WebApiUserLoadTestMachineInput(WebApiLoadTestMachineInput):
15031503
:type tenant_id: str
15041504
:param user_load_agent_resources_uri:
15051505
:type user_load_agent_resources_uri: str
1506-
:param vSTSAccount_uri:
1507-
:type vSTSAccount_uri: str
1506+
:param vsts_account_uri:
1507+
:type vsts_account_uri: str
15081508
"""
15091509

15101510
_attribute_map = {
@@ -1515,15 +1515,15 @@ class WebApiUserLoadTestMachineInput(WebApiLoadTestMachineInput):
15151515
'agent_group_name': {'key': 'agentGroupName', 'type': 'str'},
15161516
'tenant_id': {'key': 'tenantId', 'type': 'str'},
15171517
'user_load_agent_resources_uri': {'key': 'userLoadAgentResourcesUri', 'type': 'str'},
1518-
'vSTSAccount_uri': {'key': 'vstsAccountUri', 'type': 'str'}
1518+
'vsts_account_uri': {'key': 'vstsAccountUri', 'type': 'str'}
15191519
}
15201520

1521-
def __init__(self, machine_group_id=None, machine_type=None, setup_configuration=None, supported_run_types=None, agent_group_name=None, tenant_id=None, user_load_agent_resources_uri=None, vSTSAccount_uri=None):
1521+
def __init__(self, machine_group_id=None, machine_type=None, setup_configuration=None, supported_run_types=None, agent_group_name=None, tenant_id=None, user_load_agent_resources_uri=None, vsts_account_uri=None):
15221522
super(WebApiUserLoadTestMachineInput, self).__init__(machine_group_id=machine_group_id, machine_type=machine_type, setup_configuration=setup_configuration, supported_run_types=supported_run_types)
15231523
self.agent_group_name = agent_group_name
15241524
self.tenant_id = tenant_id
15251525
self.user_load_agent_resources_uri = user_load_agent_resources_uri
1526-
self.vSTSAccount_uri = vSTSAccount_uri
1526+
self.vsts_account_uri = vsts_account_uri
15271527

15281528

15291529
class WebInstanceSummaryData(Model):

azure-devops/azure/devops/v5_1/gallery/models.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -63,21 +63,21 @@ def __init__(self, default_operation=None, item_id=None, operations=None, target
6363

6464
class Answers(Model):
6565
"""
66-
:param vSMarketplace_extension_name: Gets or sets the vs marketplace extension name
67-
:type vSMarketplace_extension_name: str
68-
:param vSMarketplace_publisher_name: Gets or sets the vs marketplace publisher name
69-
:type vSMarketplace_publisher_name: str
66+
:param vs_marketplace_extension_name: Gets or sets the vs marketplace extension name
67+
:type vs_marketplace_extension_name: str
68+
:param vs_marketplace_publisher_name: Gets or sets the vs marketplace publisher name
69+
:type vs_marketplace_publisher_name: str
7070
"""
7171

7272
_attribute_map = {
73-
'vSMarketplace_extension_name': {'key': 'vsMarketplaceExtensionName', 'type': 'str'},
74-
'vSMarketplace_publisher_name': {'key': 'vsMarketplacePublisherName', 'type': 'str'}
73+
'vs_marketplace_extension_name': {'key': 'vsMarketplaceExtensionName', 'type': 'str'},
74+
'vs_marketplace_publisher_name': {'key': 'vsMarketplacePublisherName', 'type': 'str'}
7575
}
7676

77-
def __init__(self, vSMarketplace_extension_name=None, vSMarketplace_publisher_name=None):
77+
def __init__(self, vs_marketplace_extension_name=None, vs_marketplace_publisher_name=None):
7878
super(Answers, self).__init__()
79-
self.vSMarketplace_extension_name = vSMarketplace_extension_name
80-
self.vSMarketplace_publisher_name = vSMarketplace_publisher_name
79+
self.vs_marketplace_extension_name = vs_marketplace_extension_name
80+
self.vs_marketplace_publisher_name = vs_marketplace_publisher_name
8181

8282

8383
class AssetDetails(Model):

azure-devops/azure/devops/v5_1/notification/models.py

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -335,23 +335,23 @@ class INotificationDiagnosticLog(Model):
335335
"""
336336
Abstraction interface for the diagnostic log. Primarily for deserialization.
337337
338-
:param activity_id:
338+
:param activity_id: Identifier used for correlating to other diagnostics that may have been recorded elsewhere.
339339
:type activity_id: str
340-
:param description:
340+
:param description: Description of what subscription or notification job is being logged.
341341
:type description: str
342-
:param end_time:
342+
:param end_time: Time the log ended.
343343
:type end_time: datetime
344-
:param id:
344+
:param id: Unique instance identifier.
345345
:type id: str
346-
:param log_type:
346+
:param log_type: Type of information being logged.
347347
:type log_type: str
348-
:param messages:
348+
:param messages: List of log messages.
349349
:type messages: list of :class:`NotificationDiagnosticLogMessage <azure.devops.v5_1.notification.models.NotificationDiagnosticLogMessage>`
350-
:param properties:
350+
:param properties: Dictionary of log properties and settings for the job.
351351
:type properties: dict
352-
:param source:
352+
:param source: This identifier depends on the logType. For notification jobs, this will be the job Id. For subscription tracing, this will be a special root Guid with the subscription Id encoded.
353353
:type source: str
354-
:param start_time:
354+
:param start_time: Time the log started.
355355
:type start_time: datetime
356356
"""
357357

@@ -1260,11 +1260,13 @@ def __init__(self, address=None, type=None, use_custom_address=None):
12601260

12611261
class SubscriptionDiagnostics(Model):
12621262
"""
1263-
:param delivery_results:
1263+
Contains all the diagonstics settings for a subscription.
1264+
1265+
:param delivery_results: Diagnostics settings for retaining delivery results. Used for Service Hooks subscriptions.
12641266
:type delivery_results: :class:`SubscriptionTracing <azure.devops.v5_1.notification.models.SubscriptionTracing>`
1265-
:param delivery_tracing:
1267+
:param delivery_tracing: Diagnostics settings for troubleshooting notification delivery.
12661268
:type delivery_tracing: :class:`SubscriptionTracing <azure.devops.v5_1.notification.models.SubscriptionTracing>`
1267-
:param evaluation_tracing:
1269+
:param evaluation_tracing: Diagnostics settings for troubleshooting event matching.
12681270
:type evaluation_tracing: :class:`SubscriptionTracing <azure.devops.v5_1.notification.models.SubscriptionTracing>`
12691271
"""
12701272

@@ -1459,7 +1461,9 @@ def __init__(self, id=None, name=None, type=None):
14591461

14601462
class SubscriptionTracing(Model):
14611463
"""
1462-
:param enabled:
1464+
Data controlling a single diagnostic setting for a subscription.
1465+
1466+
:param enabled: Indicates whether the diagnostic tracing is enabled or not.
14631467
:type enabled: bool
14641468
:param end_date: Trace until the specified end date.
14651469
:type end_date: datetime
@@ -1507,11 +1511,13 @@ def __init__(self, opted_out=None):
15071511

15081512
class UpdateSubscripitonDiagnosticsParameters(Model):
15091513
"""
1510-
:param delivery_results:
1514+
Parameters to update diagnostics settings for a subscription.
1515+
1516+
:param delivery_results: Diagnostics settings for retaining delivery results. Used for Service Hooks subscriptions.
15111517
:type delivery_results: :class:`UpdateSubscripitonTracingParameters <azure.devops.v5_1.notification.models.UpdateSubscripitonTracingParameters>`
1512-
:param delivery_tracing:
1518+
:param delivery_tracing: Diagnostics settings for troubleshooting notification delivery.
15131519
:type delivery_tracing: :class:`UpdateSubscripitonTracingParameters <azure.devops.v5_1.notification.models.UpdateSubscripitonTracingParameters>`
1514-
:param evaluation_tracing:
1520+
:param evaluation_tracing: Diagnostics settings for troubleshooting event matching.
15151521
:type evaluation_tracing: :class:`UpdateSubscripitonTracingParameters <azure.devops.v5_1.notification.models.UpdateSubscripitonTracingParameters>`
15161522
"""
15171523

@@ -1530,7 +1536,9 @@ def __init__(self, delivery_results=None, delivery_tracing=None, evaluation_trac
15301536

15311537
class UpdateSubscripitonTracingParameters(Model):
15321538
"""
1533-
:param enabled:
1539+
Parameters to update a specific diagnostic setting.
1540+
1541+
:param enabled: Indicates whether to enable to disable the diagnostic tracing.
15341542
:type enabled: bool
15351543
"""
15361544

azure-devops/azure/devops/v5_1/notification/notification_client.py

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ def __init__(self, base_url=None, creds=None):
2727

2828
def list_logs(self, source, entry_id=None, start_time=None, end_time=None):
2929
"""ListLogs.
30-
List diagnostic logs this service.
31-
:param str source:
32-
:param str entry_id:
33-
:param datetime start_time:
34-
:param datetime end_time:
30+
Get a list of diagnostic logs for this service.
31+
:param str source: ID specifying which type of logs to check diagnostics for.
32+
:param str entry_id: The ID of the specific log to query for.
33+
:param datetime start_time: Start time for the time range to query in.
34+
:param datetime end_time: End time for the time range to query in.
3535
:rtype: [INotificationDiagnosticLog]
3636
"""
3737
route_values = {}
@@ -53,7 +53,8 @@ def list_logs(self, source, entry_id=None, start_time=None, end_time=None):
5353

5454
def get_subscription_diagnostics(self, subscription_id):
5555
"""GetSubscriptionDiagnostics.
56-
:param str subscription_id:
56+
Get the diagnostics settings for a subscription.
57+
:param str subscription_id: The id of the notifications subscription.
5758
:rtype: :class:`<SubscriptionDiagnostics> <azure.devops.v5_1.notification.models.SubscriptionDiagnostics>`
5859
"""
5960
route_values = {}
@@ -67,8 +68,9 @@ def get_subscription_diagnostics(self, subscription_id):
6768

6869
def update_subscription_diagnostics(self, update_parameters, subscription_id):
6970
"""UpdateSubscriptionDiagnostics.
71+
Update the diagnostics settings for a subscription.
7072
:param :class:`<UpdateSubscripitonDiagnosticsParameters> <azure.devops.v5_1.notification.models.UpdateSubscripitonDiagnosticsParameters>` update_parameters:
71-
:param str subscription_id:
73+
:param str subscription_id: The id of the notifications subscription.
7274
:rtype: :class:`<SubscriptionDiagnostics> <azure.devops.v5_1.notification.models.SubscriptionDiagnostics>`
7375
"""
7476
route_values = {}
@@ -85,7 +87,7 @@ def update_subscription_diagnostics(self, update_parameters, subscription_id):
8587
def get_event_type(self, event_type):
8688
"""GetEventType.
8789
Get a specific event type.
88-
:param str event_type:
90+
:param str event_type: The ID of the event type.
8991
:rtype: :class:`<NotificationEventType> <azure.devops.v5_1.notification.models.NotificationEventType>`
9092
"""
9193
route_values = {}
@@ -135,7 +137,8 @@ def update_settings(self, update_parameters):
135137

136138
def get_subscriber(self, subscriber_id):
137139
"""GetSubscriber.
138-
:param str subscriber_id:
140+
Get delivery preferences of a notifications subscriber.
141+
:param str subscriber_id: ID of the user or group.
139142
:rtype: :class:`<NotificationSubscriber> <azure.devops.v5_1.notification.models.NotificationSubscriber>`
140143
"""
141144
route_values = {}
@@ -149,8 +152,9 @@ def get_subscriber(self, subscriber_id):
149152

150153
def update_subscriber(self, update_parameters, subscriber_id):
151154
"""UpdateSubscriber.
155+
Update delivery preferences of a notifications subscriber.
152156
:param :class:`<NotificationSubscriberUpdateParameters> <azure.devops.v5_1.notification.models.NotificationSubscriberUpdateParameters>` update_parameters:
153-
:param str subscriber_id:
157+
:param str subscriber_id: ID of the user or group.
154158
:rtype: :class:`<NotificationSubscriber> <azure.devops.v5_1.notification.models.NotificationSubscriber>`
155159
"""
156160
route_values = {}

azure-devops/azure/devops/v5_1/profile/models.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ def __init__(self, is_auto_generated=None, size=None, time_stamp=None, value=Non
8484

8585
class CreateProfileContext(Model):
8686
"""
87-
:param cIData:
88-
:type cIData: dict
87+
:param ci_data:
88+
:type ci_data: dict
8989
:param contact_with_offers:
9090
:type contact_with_offers: bool
9191
:param country_name:
@@ -105,7 +105,7 @@ class CreateProfileContext(Model):
105105
"""
106106

107107
_attribute_map = {
108-
'cIData': {'key': 'ciData', 'type': '{object}'},
108+
'ci_data': {'key': 'ciData', 'type': '{object}'},
109109
'contact_with_offers': {'key': 'contactWithOffers', 'type': 'bool'},
110110
'country_name': {'key': 'countryName', 'type': 'str'},
111111
'display_name': {'key': 'displayName', 'type': 'str'},
@@ -116,9 +116,9 @@ class CreateProfileContext(Model):
116116
'profile_state': {'key': 'profileState', 'type': 'object'}
117117
}
118118

119-
def __init__(self, cIData=None, contact_with_offers=None, country_name=None, display_name=None, email_address=None, has_account=None, language=None, phone_number=None, profile_state=None):
119+
def __init__(self, ci_data=None, contact_with_offers=None, country_name=None, display_name=None, email_address=None, has_account=None, language=None, phone_number=None, profile_state=None):
120120
super(CreateProfileContext, self).__init__()
121-
self.cIData = cIData
121+
self.ci_data = ci_data
122122
self.contact_with_offers = contact_with_offers
123123
self.country_name = country_name
124124
self.display_name = display_name

azure-devops/azure/devops/v5_1/release/models.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1431,8 +1431,8 @@ class MailMessage(Model):
14311431
"""
14321432
:param body: Body of mail.
14331433
:type body: str
1434-
:param cC: Mail CC recipients.
1435-
:type cC: :class:`EmailRecipients <azure.devops.v5_1.release.models.EmailRecipients>`
1434+
:param cc: Mail CC recipients.
1435+
:type cc: :class:`EmailRecipients <azure.devops.v5_1.release.models.EmailRecipients>`
14361436
:param in_reply_to: Reply to.
14371437
:type in_reply_to: str
14381438
:param message_id: Message ID of the mail.
@@ -1453,7 +1453,7 @@ class MailMessage(Model):
14531453

14541454
_attribute_map = {
14551455
'body': {'key': 'body', 'type': 'str'},
1456-
'cC': {'key': 'cc', 'type': 'EmailRecipients'},
1456+
'cc': {'key': 'cc', 'type': 'EmailRecipients'},
14571457
'in_reply_to': {'key': 'inReplyTo', 'type': 'str'},
14581458
'message_id': {'key': 'messageId', 'type': 'str'},
14591459
'reply_by': {'key': 'replyBy', 'type': 'iso-8601'},
@@ -1464,10 +1464,10 @@ class MailMessage(Model):
14641464
'to': {'key': 'to', 'type': 'EmailRecipients'}
14651465
}
14661466

1467-
def __init__(self, body=None, cC=None, in_reply_to=None, message_id=None, reply_by=None, reply_to=None, sections=None, sender_type=None, subject=None, to=None):
1467+
def __init__(self, body=None, cc=None, in_reply_to=None, message_id=None, reply_by=None, reply_to=None, sections=None, sender_type=None, subject=None, to=None):
14681468
super(MailMessage, self).__init__()
14691469
self.body = body
1470-
self.cC = cC
1470+
self.cc = cc
14711471
self.in_reply_to = in_reply_to
14721472
self.message_id = message_id
14731473
self.reply_by = reply_by

0 commit comments

Comments
 (0)