Upadte vendored dependencies

vendor/github.com/Azure/azure-sdk-for-go/.travis.yml

@@ -2,6 +2,7 @@ sudo: false
 
 language: go
 go:
+  - 1.7
   - 1.8
   - 1.9
 

vendor/github.com/Azure/azure-sdk-for-go/CHANGELOG.md

@@ -1,5 +1,16 @@
 # CHANGELOG
 
+## `v11.1.0-beta`
+
+### ARM
+
+- trafficmanager and containerregistry SDKs now reflect the services faithfully
+- trafficmanager also has a new operation group: user metrics.
+
+### Generated code notes
+- [Azure REST API specs](https://github.com/Azure/azure-rest-api-specs) commit: c97a18ed775029207715b09c80761334724740b9
+- [AutoRest Go Generator](https://github.com/Azure/autorest.go) commit: 5d984152f2e9cff6878ea5060bed7e8d8a2ae1cc
+
 ## `v11.0.0-beta`
 
 ### ARM

vendor/github.com/Azure/azure-sdk-for-go/README.md

@@ -23,17 +23,30 @@ for Go uses [glide](https://github.com/Masterminds/glide).
 
 # Versioning
 ## SDK Versions
-The tags in this repository are based on, but do not conform to [SemVer.org's recommendations](http://semver.org/).
+The entire SDK will
+continue to be distributed as a single repository, and be labeled with version tags  that are applicable to the whole
+repository. The tags in this repository are based on, but do not conform to [SemVer.org's recommendations](http://semver.org/).
 For now, the "-beta" tag is an indicator that we are still in preview and still are planning on releasing some breaking
 changes.
 
+While in beta, we will only accept contributions to the `dev` or `master` branches. Once the `beta` tag is removed, we'll
+only contribute new features and Azure API surface space to the most recent major version of our SDK. However, pull requests
+to older major versions will be evaluated and accepted as appropriate. Any critical bugs will be fixed in old versions as well.
+To facilitate pull requests, a branch will be created for each of the major versions accepting support. For example,
+should we have tags denoting the versions, `v11.1.0`, `v11.2.0`, and `v12.0.0`, a branch `v11` would be present for submission
+of PRs.
+
 ## Azure Versions
-Azure services _mostly_ do not use SemVer based versions. Rather, they use profiles identified by dates. One will often
-see this casually referred to as an "APIVersion". At the moment, our SDK only supports the most recent profiles. In
-order to lock to an API version, one must also lock to an SDK version. However, as discussed in 
-[#517](https://github.com/Azure/azure-sdk-for-go/issues/517), our objective is to reorganize and publish independent
-packages for each profile. In that way, we'll be able to have parallel support in a single SDK version for all
-APIVersions supported by Azure.
+Azure services _mostly_ do not use SemVer based versions. Rather, they stamp a set of REST endpoints with a date identifier. One will often
+see these stamps casually referred to as "API Versions". At the moment, our SDK only supports the most recent stamp for each service. In
+order to lock to an API version, one must also lock to an SDK version. However, as discussed in [#517](https://github.com/Azure/azure-sdk-for-go/issues/517),
+our objective is to reorganize and publish an independent package for each stamped API version of each service. In that way, we'll be able to support all API Versions
+in a single SDK Version.
+
+Knowing which API Versions of services are compatbile with one another, and finding which API Versions are available in which environments
+has been a common source of frustration for users. Along with Azure Stack, these problems have led to the development of "Profiles" which are
+aggregations of multiple services at particular API Versions. Using profiles with our SDK will be optional, and to opt-in you will need to be
+running Go 1.9 or higher.
 
 # Documentation
 

vendor/github.com/Azure/azure-sdk-for-go/arm/containerregistry/models.go

@@ -66,24 +66,28 @@ const (
 type SkuName string
 
 const (
+	// Basic specifies the basic state for sku name.
+	Basic SkuName = "Basic"
 	// Classic specifies the classic state for sku name.
 	Classic SkuName = "Classic"
-	// ManagedBasic specifies the managed basic state for sku name.
-	ManagedBasic SkuName = "Managed_Basic"
-	// ManagedPremium specifies the managed premium state for sku name.
-	ManagedPremium SkuName = "Managed_Premium"
-	// ManagedStandard specifies the managed standard state for sku name.
-	ManagedStandard SkuName = "Managed_Standard"
+	// Premium specifies the premium state for sku name.
+	Premium SkuName = "Premium"
+	// Standard specifies the standard state for sku name.
+	Standard SkuName = "Standard"
 )
 
 // SkuTier enumerates the values for sku tier.
 type SkuTier string
 
 const (
+	// SkuTierBasic specifies the sku tier basic state for sku tier.
+	SkuTierBasic SkuTier = "Basic"
 	// SkuTierClassic specifies the sku tier classic state for sku tier.
 	SkuTierClassic SkuTier = "Classic"
-	// SkuTierManaged specifies the sku tier managed state for sku tier.
-	SkuTierManaged SkuTier = "Managed"
+	// SkuTierPremium specifies the sku tier premium state for sku tier.
+	SkuTierPremium SkuTier = "Premium"
+	// SkuTierStandard specifies the sku tier standard state for sku tier.
+	SkuTierStandard SkuTier = "Standard"
 )
 
 // WebhookAction enumerates the values for webhook action.

vendor/github.com/Azure/azure-sdk-for-go/arm/containerregistry/version.go

@@ -19,10 +19,10 @@ package containerregistry
 
 // UserAgent returns the UserAgent string to use when sending http.Requests.
 func UserAgent() string {
-	return "Azure-SDK-For-Go/v11.0.0-beta arm-containerregistry/2017-10-01"
+	return "Azure-SDK-For-Go/v11.1.0-beta arm-containerregistry/2017-10-01"
 }
 
 // Version returns the semantic version (see http://semver.org) of the client.
 func Version() string {
-	return "v11.0.0-beta"
+	return "v11.1.0-beta"
 }

vendor/github.com/Azure/azure-sdk-for-go/arm/trafficmanager/client.go

@@ -1,4 +1,4 @@
-// Package trafficmanager implements the Azure ARM Trafficmanager service API version 2017-09-01-preview.
+// Package trafficmanager implements the Azure ARM Trafficmanager service API version .
 //
 //
 package trafficmanager

vendor/github.com/Azure/azure-sdk-for-go/arm/trafficmanager/endpoints.go

@@ -76,7 +76,7 @@ func (client EndpointsClient) CreateOrUpdatePreparer(resourceGroupName string, p
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
 	}
 
-	const APIVersion = "2017-09-01-preview"
+	const APIVersion = "2017-05-01"
 	queryParameters := map[string]interface{}{
 		"api-version": APIVersion,
 	}
@@ -147,7 +147,7 @@ func (client EndpointsClient) DeletePreparer(resourceGroupName string, profileNa
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
 	}
 
-	const APIVersion = "2017-09-01-preview"
+	const APIVersion = "2017-05-01"
 	queryParameters := map[string]interface{}{
 		"api-version": APIVersion,
 	}
@@ -216,7 +216,7 @@ func (client EndpointsClient) GetPreparer(resourceGroupName string, profileName
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
 	}
 
-	const APIVersion = "2017-09-01-preview"
+	const APIVersion = "2017-05-01"
 	queryParameters := map[string]interface{}{
 		"api-version": APIVersion,
 	}
@@ -286,7 +286,7 @@ func (client EndpointsClient) UpdatePreparer(resourceGroupName string, profileNa
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
 	}
 
-	const APIVersion = "2017-09-01-preview"
+	const APIVersion = "2017-05-01"
 	queryParameters := map[string]interface{}{
 		"api-version": APIVersion,
 	}

vendor/github.com/Azure/azure-sdk-for-go/arm/trafficmanager/geographichierarchies.go

@@ -63,7 +63,7 @@ func (client GeographicHierarchiesClient) GetDefault() (result GeographicHierarc
 
 // GetDefaultPreparer prepares the GetDefault request.
 func (client GeographicHierarchiesClient) GetDefaultPreparer() (*http.Request, error) {
-	const APIVersion = "2017-09-01-preview"
+	const APIVersion = "2017-05-01"
 	queryParameters := map[string]interface{}{
 		"api-version": APIVersion,
 	}

vendor/github.com/Azure/azure-sdk-for-go/arm/trafficmanager/models.go

@@ -288,3 +288,17 @@ type TrafficFlow struct {
 	Longitude        *float64           `json:"longitude,omitempty"`
 	QueryExperiences *[]QueryExperience `json:"queryExperiences,omitempty"`
 }
+
+// UserMetricsKeyModel is class representing a Traffic Manager Real User Metrics key response.
+type UserMetricsKeyModel struct {
+	autorest.Response         `json:"-"`
+	ID                        *string `json:"id,omitempty"`
+	Name                      *string `json:"name,omitempty"`
+	Type                      *string `json:"type,omitempty"`
+	*UserMetricsKeyProperties `json:"properties,omitempty"`
+}
+
+// UserMetricsKeyProperties is class representing the properties of a Real User Metrics key operation response.
+type UserMetricsKeyProperties struct {
+	Key *string `json:"key,omitempty"`
+}

vendor/github.com/Azure/azure-sdk-for-go/arm/trafficmanager/profiles.go

@@ -65,7 +65,7 @@ func (client ProfilesClient) CheckTrafficManagerRelativeDNSNameAvailability(para
 
 // CheckTrafficManagerRelativeDNSNameAvailabilityPreparer prepares the CheckTrafficManagerRelativeDNSNameAvailability request.
 func (client ProfilesClient) CheckTrafficManagerRelativeDNSNameAvailabilityPreparer(parameters CheckTrafficManagerRelativeDNSNameAvailabilityParameters) (*http.Request, error) {
-	const APIVersion = "2017-09-01-preview"
+	const APIVersion = "2017-05-01"
 	queryParameters := map[string]interface{}{
 		"api-version": APIVersion,
 	}
@@ -134,7 +134,7 @@ func (client ProfilesClient) CreateOrUpdatePreparer(resourceGroupName string, pr
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
 	}
 
-	const APIVersion = "2017-09-01-preview"
+	const APIVersion = "2017-05-01"
 	queryParameters := map[string]interface{}{
 		"api-version": APIVersion,
 	}
@@ -202,7 +202,7 @@ func (client ProfilesClient) DeletePreparer(resourceGroupName string, profileNam
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
 	}
 
-	const APIVersion = "2017-09-01-preview"
+	const APIVersion = "2017-05-01"
 	queryParameters := map[string]interface{}{
 		"api-version": APIVersion,
 	}
@@ -268,7 +268,7 @@ func (client ProfilesClient) GetPreparer(resourceGroupName string, profileName s
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
 	}
 
-	const APIVersion = "2017-09-01-preview"
+	const APIVersion = "2017-05-01"
 	queryParameters := map[string]interface{}{
 		"api-version": APIVersion,
 	}
@@ -332,7 +332,7 @@ func (client ProfilesClient) ListByResourceGroupPreparer(resourceGroupName strin
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
 	}
 
-	const APIVersion = "2017-09-01-preview"
+	const APIVersion = "2017-05-01"
 	queryParameters := map[string]interface{}{
 		"api-version": APIVersion,
 	}
@@ -393,7 +393,7 @@ func (client ProfilesClient) ListBySubscriptionPreparer() (*http.Request, error)
 		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
 	}
 
-	const APIVersion = "2017-09-01-preview"
+	const APIVersion = "2017-05-01"
 	queryParameters := map[string]interface{}{
 		"api-version": APIVersion,
 	}
@@ -460,7 +460,7 @@ func (client ProfilesClient) UpdatePreparer(resourceGroupName string, profileNam
 		"subscriptionId":    autorest.Encode("path", client.SubscriptionID),
 	}
 
-	const APIVersion = "2017-09-01-preview"
+	const APIVersion = "2017-05-01"
 	queryParameters := map[string]interface{}{
 		"api-version": APIVersion,
 	}

vendor/github.com/Azure/azure-sdk-for-go/arm/trafficmanager/usermetricskeys.go

@@ -0,0 +1,222 @@
+package trafficmanager
+
+// Copyright (c) Microsoft and contributors.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+import (
+	"github.com/Azure/go-autorest/autorest"
+	"github.com/Azure/go-autorest/autorest/azure"
+	"net/http"
+)
+
+// UserMetricsKeysClient is the client for the UserMetricsKeys methods of the Trafficmanager service.
+type UserMetricsKeysClient struct {
+	ManagementClient
+}
+
+// NewUserMetricsKeysClient creates an instance of the UserMetricsKeysClient client.
+func NewUserMetricsKeysClient(subscriptionID string) UserMetricsKeysClient {
+	return NewUserMetricsKeysClientWithBaseURI(DefaultBaseURI, subscriptionID)
+}
+
+// NewUserMetricsKeysClientWithBaseURI creates an instance of the UserMetricsKeysClient client.
+func NewUserMetricsKeysClientWithBaseURI(baseURI string, subscriptionID string) UserMetricsKeysClient {
+	return UserMetricsKeysClient{NewWithBaseURI(baseURI, subscriptionID)}
+}
+
+// CreateOrUpdate create or update a subscription-level key used for Realtime User Metrics collection.
+func (client UserMetricsKeysClient) CreateOrUpdate() (result UserMetricsKeyModel, err error) {
+	req, err := client.CreateOrUpdatePreparer()
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "trafficmanager.UserMetricsKeysClient", "CreateOrUpdate", nil, "Failure preparing request")
+		return
+	}
+
+	resp, err := client.CreateOrUpdateSender(req)
+	if err != nil {
+		result.Response = autorest.Response{Response: resp}
+		err = autorest.NewErrorWithError(err, "trafficmanager.UserMetricsKeysClient", "CreateOrUpdate", resp, "Failure sending request")
+		return
+	}
+
+	result, err = client.CreateOrUpdateResponder(resp)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "trafficmanager.UserMetricsKeysClient", "CreateOrUpdate", resp, "Failure responding to request")
+	}
+
+	return
+}
+
+// CreateOrUpdatePreparer prepares the CreateOrUpdate request.
+func (client UserMetricsKeysClient) CreateOrUpdatePreparer() (*http.Request, error) {
+	pathParameters := map[string]interface{}{
+		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
+	}
+
+	const APIVersion = "2017-09-01-preview"
+	queryParameters := map[string]interface{}{
+		"api-version": APIVersion,
+	}
+
+	preparer := autorest.CreatePreparer(
+		autorest.AsPut(),
+		autorest.WithBaseURL(client.BaseURI),
+		autorest.WithPathParameters("/subscriptions/{subscriptionId}/providers/Microsoft.Network/trafficManagerUserMetricsKeys/default", pathParameters),
+		autorest.WithQueryParameters(queryParameters))
+	return preparer.Prepare(&http.Request{})
+}
+
+// CreateOrUpdateSender sends the CreateOrUpdate request. The method will close the
+// http.Response Body if it receives an error.
+func (client UserMetricsKeysClient) CreateOrUpdateSender(req *http.Request) (*http.Response, error) {
+	return autorest.SendWithSender(client, req)
+}
+
+// CreateOrUpdateResponder handles the response to the CreateOrUpdate request. The method always
+// closes the http.Response Body.
+func (client UserMetricsKeysClient) CreateOrUpdateResponder(resp *http.Response) (result UserMetricsKeyModel, err error) {
+	err = autorest.Respond(
+		resp,
+		client.ByInspecting(),
+		azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusCreated),
+		autorest.ByUnmarshallingJSON(&result),
+		autorest.ByClosing())
+	result.Response = autorest.Response{Response: resp}
+	return
+}
+
+// Delete delete a subscription-level key used for Realtime User Metrics collection.
+func (client UserMetricsKeysClient) Delete() (result DeleteOperationResult, err error) {
+	req, err := client.DeletePreparer()
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "trafficmanager.UserMetricsKeysClient", "Delete", nil, "Failure preparing request")
+		return
+	}
+
+	resp, err := client.DeleteSender(req)
+	if err != nil {
+		result.Response = autorest.Response{Response: resp}
+		err = autorest.NewErrorWithError(err, "trafficmanager.UserMetricsKeysClient", "Delete", resp, "Failure sending request")
+		return
+	}
+
+	result, err = client.DeleteResponder(resp)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "trafficmanager.UserMetricsKeysClient", "Delete", resp, "Failure responding to request")
+	}
+
+	return
+}
+
+// DeletePreparer prepares the Delete request.
+func (client UserMetricsKeysClient) DeletePreparer() (*http.Request, error) {
+	pathParameters := map[string]interface{}{
+		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
+	}
+
+	const APIVersion = "2017-09-01-preview"
+	queryParameters := map[string]interface{}{
+		"api-version": APIVersion,
+	}
+
+	preparer := autorest.CreatePreparer(
+		autorest.AsDelete(),
+		autorest.WithBaseURL(client.BaseURI),
+		autorest.WithPathParameters("/subscriptions/{subscriptionId}/providers/Microsoft.Network/trafficManagerUserMetricsKeys/default", pathParameters),
+		autorest.WithQueryParameters(queryParameters))
+	return preparer.Prepare(&http.Request{})
+}
+
+// DeleteSender sends the Delete request. The method will close the
+// http.Response Body if it receives an error.
+func (client UserMetricsKeysClient) DeleteSender(req *http.Request) (*http.Response, error) {
+	return autorest.SendWithSender(client, req)
+}
+
+// DeleteResponder handles the response to the Delete request. The method always
+// closes the http.Response Body.
+func (client UserMetricsKeysClient) DeleteResponder(resp *http.Response) (result DeleteOperationResult, err error) {
+	err = autorest.Respond(
+		resp,
+		client.ByInspecting(),
+		azure.WithErrorUnlessStatusCode(http.StatusOK),
+		autorest.ByUnmarshallingJSON(&result),
+		autorest.ByClosing())
+	result.Response = autorest.Response{Response: resp}
+	return
+}
+
+// GetDefault get the subscription-level key used for Realtime User Metrics collection.
+func (client UserMetricsKeysClient) GetDefault() (result UserMetricsKeyModel, err error) {
+	req, err := client.GetDefaultPreparer()
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "trafficmanager.UserMetricsKeysClient", "GetDefault", nil, "Failure preparing request")
+		return
+	}
+
+	resp, err := client.GetDefaultSender(req)
+	if err != nil {
+		result.Response = autorest.Response{Response: resp}
+		err = autorest.NewErrorWithError(err, "trafficmanager.UserMetricsKeysClient", "GetDefault", resp, "Failure sending request")
+		return
+	}
+
+	result, err = client.GetDefaultResponder(resp)
+	if err != nil {
+		err = autorest.NewErrorWithError(err, "trafficmanager.UserMetricsKeysClient", "GetDefault", resp, "Failure responding to request")
+	}
+
+	return
+}
+
+// GetDefaultPreparer prepares the GetDefault request.
+func (client UserMetricsKeysClient) GetDefaultPreparer() (*http.Request, error) {
+	pathParameters := map[string]interface{}{
+		"subscriptionId": autorest.Encode("path", client.SubscriptionID),
+	}
+
+	const APIVersion = "2017-09-01-preview"
+	queryParameters := map[string]interface{}{
+		"api-version": APIVersion,
+	}
+
+	preparer := autorest.CreatePreparer(
+		autorest.AsGet(),
+		autorest.WithBaseURL(client.BaseURI),
+		autorest.WithPathParameters("/subscriptions/{subscriptionId}/providers/Microsoft.Network/trafficManagerUserMetricsKeys/default", pathParameters),
+		autorest.WithQueryParameters(queryParameters))
+	return preparer.Prepare(&http.Request{})
+}
+
+// GetDefaultSender sends the GetDefault request. The method will close the
+// http.Response Body if it receives an error.
+func (client UserMetricsKeysClient) GetDefaultSender(req *http.Request) (*http.Response, error) {
+	return autorest.SendWithSender(client, req)
+}
+
+// GetDefaultResponder handles the response to the GetDefault request. The method always
+// closes the http.Response Body.
+func (client UserMetricsKeysClient) GetDefaultResponder(resp *http.Response) (result UserMetricsKeyModel, err error) {
+	err = autorest.Respond(
+		resp,
+		client.ByInspecting(),
+		azure.WithErrorUnlessStatusCode(http.StatusOK, http.StatusNoContent),
+		autorest.ByUnmarshallingJSON(&result),
+		autorest.ByClosing())
+	result.Response = autorest.Response{Response: resp}
+	return
+}

vendor/github.com/Azure/azure-sdk-for-go/arm/trafficmanager/version.go

@@ -19,10 +19,10 @@ package trafficmanager
 
 // UserAgent returns the UserAgent string to use when sending http.Requests.
 func UserAgent() string {
-	return "Azure-SDK-For-Go/v11.0.0-beta arm-trafficmanager/2017-09-01-preview"
+	return "Azure-SDK-For-Go/v11.1.0-beta arm-trafficmanager/"
 }
 
 // Version returns the semantic version (see http://semver.org) of the client.
 func Version() string {
-	return "v11.0.0-beta"
+	return "v11.1.0-beta"
 }

vendor/github.com/Azure/azure-sdk-for-go/management/version.go

@@ -17,5 +17,5 @@ package management
 //  limitations under the License.
 
 var (
-	sdkVersion = "v11.0.0-beta"
+	sdkVersion = "v11.1.0-beta"
 )

vendor/github.com/Azure/azure-sdk-for-go/storage/blob.go

@@ -104,7 +104,7 @@ type BlobProperties struct {
 	CacheControl          string      `xml:"Cache-Control" header:"x-ms-blob-cache-control"`
 	ContentLanguage       string      `xml:"Cache-Language" header:"x-ms-blob-content-language"`
 	ContentDisposition    string      `xml:"Content-Disposition" header:"x-ms-blob-content-disposition"`
-	BlobType              BlobType    `xml:"x-ms-blob-blob-type"`
+	BlobType              BlobType    `xml:"BlobType"`
 	SequenceNumber        int64       `xml:"x-ms-blob-sequence-number"`
 	CopyID                string      `xml:"CopyId"`
 	CopyStatus            string      `xml:"CopyStatus"`

vendor/github.com/Azure/azure-sdk-for-go/storage/blob_test.go

@@ -522,6 +522,7 @@ func (b *Blob) putSingleBlockBlob(chunk []byte) error {
 
 	uri := b.Container.bsc.client.getEndpoint(blobServiceName, b.buildPath(), nil)
 	headers := b.Container.bsc.client.getStandardHeaders()
+	b.Properties.BlobType = BlobTypeBlock
 	headers["x-ms-blob-type"] = string(BlobTypeBlock)
 	headers["Content-Length"] = strconv.Itoa(len(chunk))
 

vendor/github.com/Azure/azure-sdk-for-go/storage/container_test.go

@@ -230,6 +230,7 @@ func (s *ContainerSuite) TestListBlobsPagination(c *chk.C) {
 	c.Assert(err, chk.IsNil)
 
 	blobs := []string{}
+	types := []BlobType{}
 	const n = 5
 	const pageSize = 2
 	for i := 0; i < n; i++ {
@@ -237,10 +238,11 @@ func (s *ContainerSuite) TestListBlobsPagination(c *chk.C) {
 		b := cnt.GetBlobReference(name)
 		c.Assert(b.putSingleBlockBlob([]byte("Hello, world!")), chk.IsNil)
 		blobs = append(blobs, name)
+		types = append(types, b.Properties.BlobType)
 	}
 	sort.Strings(blobs)
 
-	listBlobsPagination(c, cnt, pageSize, blobs)
+	listBlobsPagination(c, cnt, pageSize, blobs, types)
 
 	// Service SAS test
 	sasuriOptions := ContainerSASOptions{}
@@ -260,7 +262,7 @@ func (s *ContainerSuite) TestListBlobsPagination(c *chk.C) {
 	c.Assert(err, chk.IsNil)
 	cntServiceSAS.Client().HTTPClient = cli.client.HTTPClient
 
-	listBlobsPagination(c, cntServiceSAS, pageSize, blobs)
+	listBlobsPagination(c, cntServiceSAS, pageSize, blobs, types)
 
 	// Account SAS test
 	token, err := cli.client.GetAccountSASToken(accountSASOptions)
@@ -270,12 +272,13 @@ func (s *ContainerSuite) TestListBlobsPagination(c *chk.C) {
 	cntAccountSAS := SAScli.GetContainerReference(cnt.Name)
 	cntAccountSAS.Client().HTTPClient = cli.client.HTTPClient
 
-	listBlobsPagination(c, cntAccountSAS, pageSize, blobs)
+	listBlobsPagination(c, cntAccountSAS, pageSize, blobs, types)
 }
 
-func listBlobsPagination(c *chk.C, cnt *Container, pageSize uint, blobs []string) {
+func listBlobsPagination(c *chk.C, cnt *Container, pageSize uint, blobs []string, types []BlobType) {
 	// Paginate
 	seen := []string{}
+	seenTypes := []BlobType{}
 	marker := ""
 	for {
 		resp, err := cnt.ListBlobs(ListBlobsParameters{
@@ -285,6 +288,7 @@ func listBlobsPagination(c *chk.C, cnt *Container, pageSize uint, blobs []string
 
 		for _, b := range resp.Blobs {
 			seen = append(seen, b.Name)
+			seenTypes = append(seenTypes, b.Properties.BlobType)
 			c.Assert(b.Container, chk.Equals, cnt)
 		}
 
@@ -296,6 +300,7 @@ func listBlobsPagination(c *chk.C, cnt *Container, pageSize uint, blobs []string
 
 	// Compare
 	c.Assert(seen, chk.DeepEquals, blobs)
+	c.Assert(seenTypes, chk.DeepEquals, types)
 }
 
 // listBlobsAsFiles is a helper function to list blobs as "folders" and "files".