Merge pull request #243 from microsoft/dev

M153, released 5.1 clients

Author: tedchamb

README.md

@@ -42,7 +42,7 @@ for project in projects:
 
 ## API documentation
 
-This Python library provides a thin wrapper around the Azure DevOps REST APIs. See the [Azure DevOps REST API reference](https://docs.microsoft.com/en-us/rest/api/vsts/?view=vsts-rest-5.0) for details on calling different APIs.
+This Python library provides a thin wrapper around the Azure DevOps REST APIs. See the [Azure DevOps REST API reference](https://docs.microsoft.com/en-us/rest/api/azure/devops/?view=azure-devops-rest-5.1) for details on calling different APIs.
 
 ## Samples
 

azure-devops/azure/devops/client.py

@@ -124,24 +124,23 @@ def _create_request_message(self, http_method, location_id, route_values=None,
             route_values = {}
         route_values['area'] = location.area
         route_values['resource'] = location.resource_name
-        route_template = self._remove_optional_route_parameters(location.route_template,
-                                                                route_values)
+        url = self._transform_route_template(location.route_template, route_values)
         logger.debug('Route template: %s', location.route_template)
-        url = self._client.format_url(route_template, **route_values)
         request = ClientRequest(method=http_method, url=self._client.format_url(url))
         if query_parameters:
             request.format_parameters(query_parameters)
         return request
 
     @staticmethod
-    def _remove_optional_route_parameters(route_template, route_values):
+    def _transform_route_template(route_template, route_values):
         new_template = ''
         route_template = route_template.replace('{*', '{')
         for path_segment in route_template.split('/'):
             if (len(path_segment) <= 2 or not path_segment[0] == '{'
-                    or not path_segment[len(path_segment) - 1] == '}'
-                    or path_segment[1:len(path_segment) - 1] in route_values):
+                    or not path_segment[len(path_segment) - 1] == '}'):
                 new_template = new_template + '/' + path_segment
+            elif path_segment[1:len(path_segment) - 1] in route_values:
+                new_template = new_template + '/' + route_values[path_segment[1:len(path_segment) - 1]]
         return new_template
 
     def _get_resource_location(self, location_id):
@@ -222,7 +221,7 @@ def _negotiate_request_version(location, version):
         else:
             # We can send at the requested api version. Make sure the resource version
             # is not bigger than what the server supports
-            negotiated_version = str(requested_api_version)
+            negotiated_version = match.group(1)
             is_preview = match.group(3) is not None
             if is_preview:
                 negotiated_version += '-preview'
@@ -267,7 +266,7 @@ def _handle_error(self, request, response):
             raise AzureDevOpsAuthenticationError(full_message_format.format(error_message=error_message,
                                                                             url=request.url))
         else:
-            full_message_format = '{error_message}Operation returned an invalid status code of {status_code}.'
+            full_message_format = '{error_message}Operation returned a {status_code} status code.'
             raise AzureDevOpsClientRequestError(full_message_format.format(error_message=error_message,
                                                                            status_code=response.status_code))
 

azure-devops/azure/devops/released/accounts/__init__.py

@@ -6,7 +6,7 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------------------------
 
-from ...v5_0.accounts.models import *
+from ...v5_1.accounts.models import *
 from .accounts_client import AccountsClient
 
 __all__ = [

azure-devops/azure/devops/released/accounts/accounts_client.py

@@ -8,7 +8,7 @@
 
 from msrest import Serializer, Deserializer
 from ...client import Client
-from ...v5_0.accounts import models
+from ...v5_1.accounts import models
 
 
 class AccountsClient(Client):
@@ -42,7 +42,7 @@ def get_accounts(self, owner_id=None, member_id=None, properties=None):
             query_parameters['properties'] = self._serialize.query('properties', properties, 'str')
         response = self._send(http_method='GET',
                               location_id='229a6a53-b428-4ffb-a835-e8f36b5b4b1e',
-                              version='5.0',
+                              version='5.1',
                               query_parameters=query_parameters)
         return self._deserialize('[Account]', self._unwrap_collection(response))
 

azure-devops/azure/devops/released/build/__init__.py

@@ -6,11 +6,12 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------------------------
 
-from ...v5_0.build.models import *
+from ...v5_1.build.models import *
 from .build_client import BuildClient
 
 __all__ = [
     'AgentPoolQueue',
+    'AgentSpecification',
     'AggregatedResultsAnalysis',
     'AggregatedResultsByOutcome',
     'AggregatedResultsDifference',