Updating the Media Services SDK to support the 2018-06-01-preview ver…

src/SDKs/Media/AzSdk.RP.props

@@ -1,7 +1,7 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!--This file and it's contents are updated at build time moving or editing might result in build failure. Take due deligence while editing this file-->
   <PropertyGroup>
-    <AzureApiTag>Media_2018-03-30-preview;</AzureApiTag>
+    <AzureApiTag>Media_2018-06-01-preview;</AzureApiTag>
     <PackageTags>$(PackageTags);$(CommonTags);$(AzureApiTag);</PackageTags>
   </PropertyGroup>
 </Project>

src/SDKs/Media/Management.Media/Generated/AzureMediaServicesClient.cs

@@ -344,7 +344,7 @@ private void Initialize()
             LiveOutputs = new LiveOutputsOperations(this);
             StreamingEndpoints = new StreamingEndpointsOperations(this);
             BaseUri = new System.Uri("https://management.azure.com");
-            ApiVersion = "2018-03-30-preview";
+            ApiVersion = "2018-06-01-preview";
             AcceptLanguage = "en-US";
             LongRunningOperationRetryTimeout = 30;
             GenerateClientRequestId = true;

src/SDKs/Media/Management.Media/Generated/Models/ApiError.cs

@@ -29,7 +29,7 @@ public ApiError()
         /// <summary>
         /// Initializes a new instance of the ApiError class.
         /// </summary>
-        /// <param name="error">ApiError</param>
+        /// <param name="error">The error properties.</param>
         public ApiError(ODataError error = default(ODataError))
         {
             Error = error;
@@ -42,11 +42,8 @@ public ApiError()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets or sets apiError
+        /// Gets or sets the error properties.
         /// </summary>
-        /// <remarks>
-        /// The error properties.
-        /// </remarks>
         [JsonProperty(PropertyName = "error")]
         public ODataError Error { get; set; }
 

src/SDKs/Media/Management.Media/Generated/Models/CbcsDrmConfiguration.cs

@@ -14,7 +14,7 @@ namespace Microsoft.Azure.Management.Media.Models
     using System.Linq;
 
     /// <summary>
-    /// Class to specify drm configurations of CommonEncryptionCbcs scheme in
+    /// Class to specify DRM configurations of CommonEncryptionCbcs scheme in
     /// Streaming Policy
     /// </summary>
     public partial class CbcsDrmConfiguration
@@ -30,7 +30,7 @@ public CbcsDrmConfiguration()
         /// <summary>
         /// Initializes a new instance of the CbcsDrmConfiguration class.
         /// </summary>
-        /// <param name="fairPlay">Fairplay configurations</param>
+        /// <param name="fairPlay">FairPlay configurations</param>
         /// <param name="playReady">PlayReady configurations</param>
         /// <param name="widevine">Widevine configurations</param>
         public CbcsDrmConfiguration(StreamingPolicyFairPlayConfiguration fairPlay = default(StreamingPolicyFairPlayConfiguration), StreamingPolicyPlayReadyConfiguration playReady = default(StreamingPolicyPlayReadyConfiguration), StreamingPolicyWidevineConfiguration widevine = default(StreamingPolicyWidevineConfiguration))
@@ -47,7 +47,7 @@ public CbcsDrmConfiguration()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets or sets fairplay configurations
+        /// Gets or sets fairPlay configurations
         /// </summary>
         [JsonProperty(PropertyName = "fairPlay")]
         public StreamingPolicyFairPlayConfiguration FairPlay { get; set; }

src/SDKs/Media/Management.Media/Generated/Models/CencDrmConfiguration.cs

@@ -14,7 +14,7 @@ namespace Microsoft.Azure.Management.Media.Models
     using System.Linq;
 
     /// <summary>
-    /// Class to specify drm configurations of CommonEncryptionCenc scheme in
+    /// Class to specify DRM configurations of CommonEncryptionCenc scheme in
     /// Streaming Policy
     /// </summary>
     public partial class CencDrmConfiguration

src/SDKs/Media/Management.Media/Generated/Models/DefaultKey.cs

@@ -31,7 +31,7 @@ public DefaultKey()
         /// Initializes a new instance of the DefaultKey class.
         /// </summary>
         /// <param name="label">Label can be used to specify Content Key when
-        /// creating Stremaing Locator</param>
+        /// creating a Streaming Locator</param>
         /// <param name="policyName">Policy used by Default Key</param>
         public DefaultKey(string label = default(string), string policyName = default(string))
         {
@@ -47,7 +47,7 @@ public DefaultKey()
 
         /// <summary>
         /// Gets or sets label can be used to specify Content Key when creating
-        /// Stremaing Locator
+        /// a Streaming Locator
         /// </summary>
         [JsonProperty(PropertyName = "label")]
         public string Label { get; set; }

src/SDKs/Media/Management.Media/Generated/Models/EnabledProtocols.cs

@@ -30,8 +30,8 @@ public EnabledProtocols()
         /// Initializes a new instance of the EnabledProtocols class.
         /// </summary>
         /// <param name="download">Enable Download protocol or not</param>
-        /// <param name="dash">Enable Dash protocol or not</param>
-        /// <param name="hls">Enable Hls protocol or not</param>
+        /// <param name="dash">Enable DASH protocol or not</param>
+        /// <param name="hls">Enable HLS protocol or not</param>
         /// <param name="smoothStreaming">Enable SmoothStreaming protocol or
         /// not</param>
         public EnabledProtocols(bool download, bool dash, bool hls, bool smoothStreaming)
@@ -55,13 +55,13 @@ public EnabledProtocols(bool download, bool dash, bool hls, bool smoothStreaming
         public bool Download { get; set; }
 
         /// <summary>
-        /// Gets or sets enable Dash protocol or not
+        /// Gets or sets enable DASH protocol or not
         /// </summary>
         [JsonProperty(PropertyName = "dash")]
         public bool Dash { get; set; }
 
         /// <summary>
-        /// Gets or sets enable Hls protocol or not
+        /// Gets or sets enable HLS protocol or not
         /// </summary>
         [JsonProperty(PropertyName = "hls")]
         public bool Hls { get; set; }

src/SDKs/Media/Management.Media/Generated/Models/EnvelopeEncryption.cs

@@ -39,15 +39,15 @@ public EnvelopeEncryption()
         /// encryption scheme and separate content keys for specific
         /// tracks</param>
         /// <param
-        /// name="customLicenseAcquisitionUrlTemplate">LicenseAcquistionUrlTemplate
-        /// is used to point to user speicified service to delivery content
+        /// name="customKeyAcquisitionUrlTemplate">KeyAcquistionUrlTemplate is
+        /// used to point to user specified service to delivery content
         /// keys</param>
-        public EnvelopeEncryption(EnabledProtocols enabledProtocols = default(EnabledProtocols), IList<TrackSelection> clearTracks = default(IList<TrackSelection>), StreamingPolicyContentKeys contentKeys = default(StreamingPolicyContentKeys), string customLicenseAcquisitionUrlTemplate = default(string))
+        public EnvelopeEncryption(EnabledProtocols enabledProtocols = default(EnabledProtocols), IList<TrackSelection> clearTracks = default(IList<TrackSelection>), StreamingPolicyContentKeys contentKeys = default(StreamingPolicyContentKeys), string customKeyAcquisitionUrlTemplate = default(string))
         {
             EnabledProtocols = enabledProtocols;
             ClearTracks = clearTracks;
             ContentKeys = contentKeys;
-            CustomLicenseAcquisitionUrlTemplate = customLicenseAcquisitionUrlTemplate;
+            CustomKeyAcquisitionUrlTemplate = customKeyAcquisitionUrlTemplate;
             CustomInit();
         }
 
@@ -76,11 +76,11 @@ public EnvelopeEncryption()
         public StreamingPolicyContentKeys ContentKeys { get; set; }
 
         /// <summary>
-        /// Gets or sets licenseAcquistionUrlTemplate is used to point to user
-        /// speicified service to delivery content keys
+        /// Gets or sets keyAcquistionUrlTemplate is used to point to user
+        /// specified service to delivery content keys
         /// </summary>
-        [JsonProperty(PropertyName = "customLicenseAcquisitionUrlTemplate")]
-        public string CustomLicenseAcquisitionUrlTemplate { get; set; }
+        [JsonProperty(PropertyName = "customKeyAcquisitionUrlTemplate")]
+        public string CustomKeyAcquisitionUrlTemplate { get; set; }
 
         /// <summary>
         /// Validate the object.

src/SDKs/Media/Management.Media/Generated/Models/Job.cs

@@ -54,7 +54,9 @@ public Job()
         /// processed. Higher priority jobs are processed before lower priority
         /// jobs. If not set, the default is normal. Possible values include:
         /// 'Low', 'Normal', 'High'</param>
-        public Job(JobInput input, IList<JobOutput> outputs, string id = default(string), string name = default(string), string type = default(string), System.DateTime created = default(System.DateTime), JobState state = default(JobState), string description = default(string), System.DateTime lastModified = default(System.DateTime), Priority? priority = default(Priority?))
+        /// <param name="correlationData">Customer provided correlation data
+        /// that will be returned in Job completed events.</param>
+        public Job(JobInput input, IList<JobOutput> outputs, string id = default(string), string name = default(string), string type = default(string), System.DateTime created = default(System.DateTime), JobState state = default(JobState), string description = default(string), System.DateTime lastModified = default(System.DateTime), Priority? priority = default(Priority?), IDictionary<string, string> correlationData = default(IDictionary<string, string>))
             : base(id, name, type)
         {
             Created = created;
@@ -64,6 +66,7 @@ public Job()
             LastModified = lastModified;
             Outputs = outputs;
             Priority = priority;
+            CorrelationData = correlationData;
             CustomInit();
         }
 
@@ -121,6 +124,13 @@ public Job()
         [JsonProperty(PropertyName = "properties.priority")]
         public Priority? Priority { get; set; }
 
+        /// <summary>
+        /// Gets or sets customer provided correlation data that will be
+        /// returned in Job completed events.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.correlationData")]
+        public IDictionary<string, string> CorrelationData { get; set; }
+
         /// <summary>
         /// Validate the object.
         /// </summary>

src/SDKs/Media/Management.Media/Generated/Models/LiveEventPreview.cs

@@ -37,12 +37,19 @@ public LiveEventPreview()
         /// <param name="previewLocator">The preview locator Guid.</param>
         /// <param name="streamingPolicyName">The name of streaming policy used
         /// for LiveEvent preview</param>
-        public LiveEventPreview(IList<LiveEventEndpoint> endpoints = default(IList<LiveEventEndpoint>), LiveEventPreviewAccessControl accessControl = default(LiveEventPreviewAccessControl), string previewLocator = default(string), string streamingPolicyName = default(string))
+        /// <param name="alternativeMediaId">An Alternative Media Identifier
+        /// associated with the preview url.  This identifier can be used to
+        /// distinguish the preview of different live events for authorization
+        /// purposes in the CustomLicenseAcquisitionUrlTemplate or the
+        /// CustomKeyAcquisitionUrlTemplate of the StreamingPolicy specified in
+        /// the StreamingPolicyName field.</param>
+        public LiveEventPreview(IList<LiveEventEndpoint> endpoints = default(IList<LiveEventEndpoint>), LiveEventPreviewAccessControl accessControl = default(LiveEventPreviewAccessControl), string previewLocator = default(string), string streamingPolicyName = default(string), string alternativeMediaId = default(string))
         {
             Endpoints = endpoints;
             AccessControl = accessControl;
             PreviewLocator = previewLocator;
             StreamingPolicyName = streamingPolicyName;
+            AlternativeMediaId = alternativeMediaId;
             CustomInit();
         }
 
@@ -76,5 +83,16 @@ public LiveEventPreview()
         [JsonProperty(PropertyName = "streamingPolicyName")]
         public string StreamingPolicyName { get; set; }
 
+        /// <summary>
+        /// Gets or sets an Alternative Media Identifier associated with the
+        /// preview url.  This identifier can be used to distinguish the
+        /// preview of different live events for authorization purposes in the
+        /// CustomLicenseAcquisitionUrlTemplate or the
+        /// CustomKeyAcquisitionUrlTemplate of the StreamingPolicy specified in
+        /// the StreamingPolicyName field.
+        /// </summary>
+        [JsonProperty(PropertyName = "alternativeMediaId")]
+        public string AlternativeMediaId { get; set; }
+
     }
 }

src/SDKs/Media/Management.Media/Generated/Models/StreamingLocator.cs

@@ -56,7 +56,13 @@ public StreamingLocator()
         /// used by this Streaming Locator</param>
         /// <param name="contentKeys">ContentKeys used by this Streaming
         /// Locator</param>
-        public StreamingLocator(string assetName, string streamingPolicyName, string id = default(string), string name = default(string), string type = default(string), System.DateTime created = default(System.DateTime), System.DateTime? startTime = default(System.DateTime?), System.DateTime? endTime = default(System.DateTime?), System.Guid? streamingLocatorId = default(System.Guid?), string defaultContentKeyPolicyName = default(string), IList<StreamingLocatorUserDefinedContentKey> contentKeys = default(IList<StreamingLocatorUserDefinedContentKey>))
+        /// <param name="alternativeMediaId">An Alternative Media Identifier
+        /// associated with the StreamingLocator.  This identifier can be used
+        /// to distinguish different StreamingLocators for the same Asset for
+        /// authorization purposes in the CustomLicenseAcquisitionUrlTemplate
+        /// or the CustomKeyAcquisitionUrlTemplate of the StreamingPolicy
+        /// specified in the StreamingPolicyName field.</param>
+        public StreamingLocator(string assetName, string streamingPolicyName, string id = default(string), string name = default(string), string type = default(string), System.DateTime created = default(System.DateTime), System.DateTime? startTime = default(System.DateTime?), System.DateTime? endTime = default(System.DateTime?), System.Guid? streamingLocatorId = default(System.Guid?), string defaultContentKeyPolicyName = default(string), IList<StreamingLocatorContentKey> contentKeys = default(IList<StreamingLocatorContentKey>), string alternativeMediaId = default(string))
             : base(id, name, type)
         {
             AssetName = assetName;
@@ -67,6 +73,7 @@ public StreamingLocator()
             StreamingPolicyName = streamingPolicyName;
             DefaultContentKeyPolicyName = defaultContentKeyPolicyName;
             ContentKeys = contentKeys;
+            AlternativeMediaId = alternativeMediaId;
             CustomInit();
         }
 
@@ -129,7 +136,18 @@ public StreamingLocator()
         /// Gets or sets contentKeys used by this Streaming Locator
         /// </summary>
         [JsonProperty(PropertyName = "properties.contentKeys")]
-        public IList<StreamingLocatorUserDefinedContentKey> ContentKeys { get; set; }
+        public IList<StreamingLocatorContentKey> ContentKeys { get; set; }
+
+        /// <summary>
+        /// Gets or sets an Alternative Media Identifier associated with the
+        /// StreamingLocator.  This identifier can be used to distinguish
+        /// different StreamingLocators for the same Asset for authorization
+        /// purposes in the CustomLicenseAcquisitionUrlTemplate or the
+        /// CustomKeyAcquisitionUrlTemplate of the StreamingPolicy specified in
+        /// the StreamingPolicyName field.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.alternativeMediaId")]
+        public string AlternativeMediaId { get; set; }
 
         /// <summary>
         /// Validate the object.

src/SDKs/Media/Management.Media/Generated/Models/StreamingLocatorContentKey.cs

@@ -31,20 +31,20 @@ public StreamingLocatorContentKey()
         /// <summary>
         /// Initializes a new instance of the StreamingLocatorContentKey class.
         /// </summary>
+        /// <param name="id">ID of Content Key</param>
         /// <param name="type">Encryption type of Content Key. Possible values
         /// include: 'CommonEncryptionCenc', 'CommonEncryptionCbcs',
         /// 'EnvelopeEncryption'</param>
-        /// <param name="id">ID of Content Key</param>
         /// <param name="label">Label of Content Key</param>
         /// <param name="value">Value of  of Content Key</param>
         /// <param name="policyName">ContentKeyPolicy used by Content
         /// Key</param>
         /// <param name="tracks">Tracks which use this Content Key</param>
-        public StreamingLocatorContentKey(StreamingLocatorContentKeyType type, System.Guid id, string label = default(string), string value = default(string), string policyName = default(string), IList<TrackSelection> tracks = default(IList<TrackSelection>))
+        public StreamingLocatorContentKey(System.Guid id, StreamingLocatorContentKeyType type = default(StreamingLocatorContentKeyType), string label = default(string), string value = default(string), string policyName = default(string), IList<TrackSelection> tracks = default(IList<TrackSelection>))
         {
-            Label = label;
-            Type = type;
             Id = id;
+            Type = type;
+            Label = label;
             Value = value;
             PolicyName = policyName;
             Tracks = tracks;
@@ -57,24 +57,24 @@ public StreamingLocatorContentKey()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets or sets label of Content Key
+        /// Gets or sets ID of Content Key
         /// </summary>
-        [JsonProperty(PropertyName = "label")]
-        public string Label { get; set; }
+        [JsonProperty(PropertyName = "id")]
+        public System.Guid Id { get; set; }
 
         /// <summary>
-        /// Gets or sets encryption type of Content Key. Possible values
-        /// include: 'CommonEncryptionCenc', 'CommonEncryptionCbcs',
+        /// Gets encryption type of Content Key. Possible values include:
+        /// 'CommonEncryptionCenc', 'CommonEncryptionCbcs',
         /// 'EnvelopeEncryption'
         /// </summary>
         [JsonProperty(PropertyName = "type")]
-        public StreamingLocatorContentKeyType Type { get; set; }
+        public StreamingLocatorContentKeyType Type { get; private set; }
 
         /// <summary>
-        /// Gets or sets ID of Content Key
+        /// Gets or sets label of Content Key
         /// </summary>
-        [JsonProperty(PropertyName = "id")]
-        public System.Guid Id { get; set; }
+        [JsonProperty(PropertyName = "label")]
+        public string Label { get; set; }
 
         /// <summary>
         /// Gets or sets value of  of Content Key
@@ -83,10 +83,10 @@ public StreamingLocatorContentKey()
         public string Value { get; set; }
 
         /// <summary>
-        /// Gets or sets contentKeyPolicy used by Content Key
+        /// Gets contentKeyPolicy used by Content Key
         /// </summary>
         [JsonProperty(PropertyName = "policyName")]
-        public string PolicyName { get; set; }
+        public string PolicyName { get; private set; }
 
         /// <summary>
         /// Gets or sets tracks which use this Content Key