Skip to content

Commit 1ada541

Browse files
authored
Merge pull request #272 from microsoft/dev
Update 5.1.0.b4
2 parents 0cd0d53 + 097e4dc commit 1ada541

File tree

21 files changed

+240
-213
lines changed

21 files changed

+240
-213
lines changed

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -300,3 +300,6 @@ vsts/build/bdist.win32/
300300
!azure-devops/azure/devops/released/release
301301
!azure-devops/azure/devops/v5_0/release
302302
!azure-devops/azure/devops/v5_1/release
303+
304+
# ignore private folder for testing reported issues
305+
issues/

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

+14-10
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_0/cloud_load_test/models.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -1442,8 +1442,8 @@ class WebApiUserLoadTestMachineInput(WebApiLoadTestMachineInput):
14421442
:type tenant_id: str
14431443
:param user_load_agent_resources_uri:
14441444
:type user_load_agent_resources_uri: str
1445-
:param vSTSAccount_uri:
1446-
:type vSTSAccount_uri: str
1445+
:param vsts_account_uri:
1446+
:type vsts_account_uri: str
14471447
"""
14481448

14491449
_attribute_map = {
@@ -1454,15 +1454,15 @@ class WebApiUserLoadTestMachineInput(WebApiLoadTestMachineInput):
14541454
'agent_group_name': {'key': 'agentGroupName', 'type': 'str'},
14551455
'tenant_id': {'key': 'tenantId', 'type': 'str'},
14561456
'user_load_agent_resources_uri': {'key': 'userLoadAgentResourcesUri', 'type': 'str'},
1457-
'vSTSAccount_uri': {'key': 'vSTSAccountUri', 'type': 'str'}
1457+
'vsts_account_uri': {'key': 'vstsAccountUri', 'type': 'str'}
14581458
}
14591459

1460-
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):
1460+
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):
14611461
super(WebApiUserLoadTestMachineInput, self).__init__(machine_group_id=machine_group_id, machine_type=machine_type, setup_configuration=setup_configuration, supported_run_types=supported_run_types)
14621462
self.agent_group_name = agent_group_name
14631463
self.tenant_id = tenant_id
14641464
self.user_load_agent_resources_uri = user_load_agent_resources_uri
1465-
self.vSTSAccount_uri = vSTSAccount_uri
1465+
self.vsts_account_uri = vsts_account_uri
14661466

14671467

14681468
class WebInstanceSummaryData(Model):

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

+9-9
Original file line numberDiff line numberDiff line change
@@ -64,21 +64,21 @@ def __init__(self, default_operation=None, item_id=None, operations=None, target
6464
class Answers(Model):
6565
"""Answers.
6666
67-
:param vSMarketplace_extension_name: Gets or sets the vs marketplace extension name
68-
:type vSMarketplace_extension_name: str
69-
:param vSMarketplace_publisher_name: Gets or sets the vs marketplace publsiher name
70-
:type vSMarketplace_publisher_name: str
67+
:param vs_marketplace_extension_name: Gets or sets the vs marketplace extension name
68+
:type vs_marketplace_extension_name: str
69+
:param vs_marketplace_publisher_name: Gets or sets the vs marketplace publsiher name
70+
:type vs_marketplace_publisher_name: str
7171
"""
7272

7373
_attribute_map = {
74-
'vSMarketplace_extension_name': {'key': 'vSMarketplaceExtensionName', 'type': 'str'},
75-
'vSMarketplace_publisher_name': {'key': 'vSMarketplacePublisherName', 'type': 'str'}
74+
'vs_marketplace_extension_name': {'key': 'vsMarketplaceExtensionName', 'type': 'str'},
75+
'vs_marketplace_publisher_name': {'key': 'vsMarketplacePublisherName', 'type': 'str'}
7676
}
7777

78-
def __init__(self, vSMarketplace_extension_name=None, vSMarketplace_publisher_name=None):
78+
def __init__(self, vs_marketplace_extension_name=None, vs_marketplace_publisher_name=None):
7979
super(Answers, self).__init__()
80-
self.vSMarketplace_extension_name = vSMarketplace_extension_name
81-
self.vSMarketplace_publisher_name = vSMarketplace_publisher_name
80+
self.vs_marketplace_extension_name = vs_marketplace_extension_name
81+
self.vs_marketplace_publisher_name = vs_marketplace_publisher_name
8282

8383

8484
class AssetDetails(Model):

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -244,9 +244,9 @@ def get_subscription(self, subscription_id, query_flags=None):
244244

245245
def list_subscriptions(self, target_id=None, ids=None, query_flags=None):
246246
"""ListSubscriptions.
247-
[Preview API]
248-
:param str target_id:
249-
:param [str] ids:
247+
[Preview API] Get a list of notification subscriptions, either by subscription IDs or by all subscriptions for a given user or group.
248+
:param str target_id: User or Group ID
249+
:param [str] ids: List of subscription IDs
250250
:param str query_flags:
251251
:rtype: [NotificationSubscription]
252252
"""

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

+5-5
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
class CreateProfileContext(Model):
8585
"""CreateProfileContext.
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_0/release/models.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -1430,8 +1430,8 @@ class MailMessage(Model):
14301430
14311431
:param body:
14321432
:type body: str
1433-
:param cC:
1434-
:type cC: :class:`EmailRecipients <azure.devops.v5_0.release.models.EmailRecipients>`
1433+
:param cc:
1434+
:type cc: :class:`EmailRecipients <azure.devops.v5_0.release.models.EmailRecipients>`
14351435
:param in_reply_to:
14361436
:type in_reply_to: str
14371437
:param message_id:
@@ -1452,7 +1452,7 @@ class MailMessage(Model):
14521452

14531453
_attribute_map = {
14541454
'body': {'key': 'body', 'type': 'str'},
1455-
'cC': {'key': 'cC', 'type': 'EmailRecipients'},
1455+
'cc': {'key': 'cc', 'type': 'EmailRecipients'},
14561456
'in_reply_to': {'key': 'inReplyTo', 'type': 'str'},
14571457
'message_id': {'key': 'messageId', 'type': 'str'},
14581458
'reply_by': {'key': 'replyBy', 'type': 'iso-8601'},
@@ -1463,10 +1463,10 @@ class MailMessage(Model):
14631463
'to': {'key': 'to', 'type': 'EmailRecipients'}
14641464
}
14651465

1466-
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):
1466+
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):
14671467
super(MailMessage, self).__init__()
14681468
self.body = body
1469-
self.cC = cC
1469+
self.cc = cc
14701470
self.in_reply_to = in_reply_to
14711471
self.message_id = message_id
14721472
self.reply_by = reply_by

azure-devops/azure/devops/v5_0/task_agent/models.py

+15-15
Original file line numberDiff line numberDiff line change
@@ -2142,8 +2142,8 @@ class TaskAgentMessage(Model):
21422142
21432143
:param body: Gets or sets the body of the message. If the <c>IV</c> property is provided the body will need to be decrypted using the <c>TaskAgentSession.EncryptionKey</c> value in addition to the <c>IV</c>.
21442144
:type body: str
2145-
:param iV: Gets or sets the intialization vector used to encrypt this message.
2146-
:type iV: str
2145+
:param iv: Gets or sets the intialization vector used to encrypt this message.
2146+
:type iv: str
21472147
:param message_id: Gets or sets the message identifier.
21482148
:type message_id: long
21492149
:param message_type: Gets or sets the message type, describing the data contract found in <c>TaskAgentMessage.Body</c>.
@@ -2152,15 +2152,15 @@ class TaskAgentMessage(Model):
21522152

21532153
_attribute_map = {
21542154
'body': {'key': 'body', 'type': 'str'},
2155-
'iV': {'key': 'iV', 'type': 'str'},
2155+
'iv': {'key': 'iv', 'type': 'str'},
21562156
'message_id': {'key': 'messageId', 'type': 'long'},
21572157
'message_type': {'key': 'messageType', 'type': 'str'}
21582158
}
21592159

2160-
def __init__(self, body=None, iV=None, message_id=None, message_type=None):
2160+
def __init__(self, body=None, iv=None, message_id=None, message_type=None):
21612161
super(TaskAgentMessage, self).__init__()
21622162
self.body = body
2163-
self.iV = iV
2163+
self.iv = iv
21642164
self.message_id = message_id
21652165
self.message_type = message_type
21662166

@@ -2466,8 +2466,8 @@ class TaskAgentReference(Model):
24662466
:type id: int
24672467
:param name: Gets the name of the agent.
24682468
:type name: str
2469-
:param oSDescription: Gets the OS of the agent.
2470-
:type oSDescription: str
2469+
:param os_description: Gets the OS of the agent.
2470+
:type os_description: str
24712471
:param provisioning_state: Gets or sets the current provisioning state of this agent
24722472
:type provisioning_state: str
24732473
:param status: Gets the current connectivity status of the agent.
@@ -2482,20 +2482,20 @@ class TaskAgentReference(Model):
24822482
'enabled': {'key': 'enabled', 'type': 'bool'},
24832483
'id': {'key': 'id', 'type': 'int'},
24842484
'name': {'key': 'name', 'type': 'str'},
2485-
'oSDescription': {'key': 'oSDescription', 'type': 'str'},
2485+
'os_description': {'key': 'osDescription', 'type': 'str'},
24862486
'provisioning_state': {'key': 'provisioningState', 'type': 'str'},
24872487
'status': {'key': 'status', 'type': 'object'},
24882488
'version': {'key': 'version', 'type': 'str'}
24892489
}
24902490

2491-
def __init__(self, _links=None, access_point=None, enabled=None, id=None, name=None, oSDescription=None, provisioning_state=None, status=None, version=None):
2491+
def __init__(self, _links=None, access_point=None, enabled=None, id=None, name=None, os_description=None, provisioning_state=None, status=None, version=None):
24922492
super(TaskAgentReference, self).__init__()
24932493
self._links = _links
24942494
self.access_point = access_point
24952495
self.enabled = enabled
24962496
self.id = id
24972497
self.name = name
2498-
self.oSDescription = oSDescription
2498+
self.os_description = os_description
24992499
self.provisioning_state = provisioning_state
25002500
self.status = status
25012501
self.version = version
@@ -3897,8 +3897,8 @@ class TaskAgent(TaskAgentReference):
38973897
:type id: int
38983898
:param name: Gets the name of the agent.
38993899
:type name: str
3900-
:param oSDescription: Gets the OS of the agent.
3901-
:type oSDescription: str
3900+
:param os_description: Gets the OS of the agent.
3901+
:type os_description: str
39023902
:param provisioning_state: Gets or sets the current provisioning state of this agent
39033903
:type provisioning_state: str
39043904
:param status: Gets the current connectivity status of the agent.
@@ -3935,7 +3935,7 @@ class TaskAgent(TaskAgentReference):
39353935
'enabled': {'key': 'enabled', 'type': 'bool'},
39363936
'id': {'key': 'id', 'type': 'int'},
39373937
'name': {'key': 'name', 'type': 'str'},
3938-
'oSDescription': {'key': 'oSDescription', 'type': 'str'},
3938+
'os_description': {'key': 'osDescription', 'type': 'str'},
39393939
'provisioning_state': {'key': 'provisioningState', 'type': 'str'},
39403940
'status': {'key': 'status', 'type': 'object'},
39413941
'version': {'key': 'version', 'type': 'str'},
@@ -3952,8 +3952,8 @@ class TaskAgent(TaskAgentReference):
39523952
'user_capabilities': {'key': 'userCapabilities', 'type': '{str}'}
39533953
}
39543954

3955-
def __init__(self, _links=None, access_point=None, enabled=None, id=None, name=None, oSDescription=None, provisioning_state=None, status=None, version=None, assigned_agent_cloud_request=None, assigned_request=None, authorization=None, created_on=None, last_completed_request=None, max_parallelism=None, pending_update=None, properties=None, status_changed_on=None, system_capabilities=None, user_capabilities=None):
3956-
super(TaskAgent, self).__init__(_links=_links, access_point=access_point, enabled=enabled, id=id, name=name, oSDescription=oSDescription, provisioning_state=provisioning_state, status=status, version=version)
3955+
def __init__(self, _links=None, access_point=None, enabled=None, id=None, name=None, os_description=None, provisioning_state=None, status=None, version=None, assigned_agent_cloud_request=None, assigned_request=None, authorization=None, created_on=None, last_completed_request=None, max_parallelism=None, pending_update=None, properties=None, status_changed_on=None, system_capabilities=None, user_capabilities=None):
3956+
super(TaskAgent, self).__init__(_links=_links, access_point=access_point, enabled=enabled, id=id, name=name, os_description=os_description, provisioning_state=provisioning_state, status=status, version=version)
39573957
self.assigned_agent_cloud_request = assigned_agent_cloud_request
39583958
self.assigned_request = assigned_request
39593959
self.authorization = authorization

0 commit comments

Comments
 (0)