Azure · AutorestCI · Jun 2, 2018 · Jun 2, 2018 · Jun 4, 2018
diff --git a/lib/services/mediaServicesManagement/README.md b/lib/services/mediaServicesManagement/README.md
@@ -1,3 +1,8 @@
+---
+uid: azure-arm-mediaservices
+summary: *content
+
+---
 # Microsoft Azure SDK for Node.js - AzureMediaServices
 This project provides a Node.js package for accessing Azure. Right now it supports:
 - **Node.js version 6.x.x or higher**

diff --git a/lib/services/mediaServicesManagement/lib/azureMediaServices.js b/lib/services/mediaServicesManagement/lib/azureMediaServices.js
@@ -50,7 +50,7 @@ class AzureMediaServices extends ServiceClient {
 
     super(credentials, options);
 
-    this.apiVersion = '2018-03-30-preview';
+    this.apiVersion = '2018-06-01-preview';
     this.acceptLanguage = 'en-US';
     this.longRunningOperationRetryTimeout = 30;
     this.generateClientRequestId = true;

diff --git a/lib/services/mediaServicesManagement/lib/models/aacAudio.js b/lib/services/mediaServicesManagement/lib/models/aacAudio.js
@@ -86,8 +86,7 @@ class AacAudio extends models['Audio'] {
             required: false,
             serializedName: 'profile',
             type: {
-              name: 'Enum',
-              allowedValues: [ 'AacLc', 'HeAacV1', 'HeAacV2' ]
+              name: 'String'
             }
           }
         }

diff --git a/lib/services/mediaServicesManagement/lib/models/apiError.js b/lib/services/mediaServicesManagement/lib/models/apiError.js
@@ -19,7 +19,7 @@ const models = require('./index');
 class ApiError {
   /**
    * Create a ApiError.
-   * @member {object} [error] ApiError. The error properties.
+   * @member {object} [error] The error properties.
    * @member {string} [error.code] A language-independent error name.
    * @member {string} [error.message] The error message.
    * @member {string} [error.target] The target of the error (for example, the

diff --git a/lib/services/mediaServicesManagement/lib/models/asset.js b/lib/services/mediaServicesManagement/lib/models/asset.js
@@ -130,8 +130,7 @@ class Asset extends models['ProxyResource'] {
             readOnly: true,
             serializedName: 'properties.storageEncryptionFormat',
             type: {
-              name: 'Enum',
-              allowedValues: [ 'None', 'MediaStorageClientEncryption' ]
+              name: 'String'
             }
           }
         }

diff --git a/lib/services/mediaServicesManagement/lib/models/builtInStandardEncoderPreset.js b/lib/services/mediaServicesManagement/lib/models/builtInStandardEncoderPreset.js
@@ -61,8 +61,7 @@ class BuiltInStandardEncoderPreset extends models['Preset'] {
             required: true,
             serializedName: 'presetName',
             type: {
-              name: 'Enum',
-              allowedValues: [ 'AdaptiveStreaming', 'AACGoodQualityAudio', 'H264MultipleBitrate1080p', 'H264MultipleBitrate720p', 'H264MultipleBitrateSD' ]
+              name: 'String'
             }
           }
         }

diff --git a/lib/services/mediaServicesManagement/lib/models/cbcsDrmConfiguration.js b/lib/services/mediaServicesManagement/lib/models/cbcsDrmConfiguration.js
@@ -13,14 +13,14 @@
 const models = require('./index');
 
 /**
- * Class to specify drm configurations of CommonEncryptionCbcs scheme in
+ * Class to specify DRM configurations of CommonEncryptionCbcs scheme in
  * Streaming Policy
  *
  */
 class CbcsDrmConfiguration {
   /**
    * Create a CbcsDrmConfiguration.
-   * @member {object} [fairPlay] Fairplay configurations
+   * @member {object} [fairPlay] FairPlay configurations
    * @member {string} [fairPlay.customLicenseAcquisitionUrlTemplate] The
    * template for a customer service to deliver keys to end users.  Not needed
    * when using Azure Media Services for issuing keys.

diff --git a/lib/services/mediaServicesManagement/lib/models/cencDrmConfiguration.js b/lib/services/mediaServicesManagement/lib/models/cencDrmConfiguration.js
@@ -13,7 +13,7 @@
 const models = require('./index');
 
 /**
- * Class to specify drm configurations of CommonEncryptionCenc scheme in
+ * Class to specify DRM configurations of CommonEncryptionCenc scheme in
  * Streaming Policy
  *
  */

diff --git a/lib/services/mediaServicesManagement/lib/models/commonEncryptionCbcs.js b/lib/services/mediaServicesManagement/lib/models/commonEncryptionCbcs.js
@@ -22,8 +22,8 @@ class CommonEncryptionCbcs {
    * @member {object} [enabledProtocols] Representing supported protocols
    * @member {boolean} [enabledProtocols.download] Enable Download protocol or
    * not
-   * @member {boolean} [enabledProtocols.dash] Enable Dash protocol or not
-   * @member {boolean} [enabledProtocols.hls] Enable Hls protocol or not
+   * @member {boolean} [enabledProtocols.dash] Enable DASH protocol or not
+   * @member {boolean} [enabledProtocols.hls] Enable HLS protocol or not
    * @member {boolean} [enabledProtocols.smoothStreaming] Enable
    * SmoothStreaming protocol or not
    * @member {array} [clearTracks] Representing which tracks should not be
@@ -33,13 +33,13 @@ class CommonEncryptionCbcs {
    * @member {object} [contentKeys.defaultKey] Default content key for an
    * encryption scheme
    * @member {string} [contentKeys.defaultKey.label] Label can be used to
-   * specify Content Key when creating Stremaing Locator
+   * specify Content Key when creating a Streaming Locator
    * @member {string} [contentKeys.defaultKey.policyName] Policy used by
    * Default Key
    * @member {array} [contentKeys.keyToTrackMappings] Representing tracks needs
-   * sepearete content key
+   * separate content key
    * @member {object} [drm] Configuration of DRMs for current encryption scheme
-   * @member {object} [drm.fairPlay] Fairplay configurations
+   * @member {object} [drm.fairPlay] FairPlay configurations
    * @member {string} [drm.fairPlay.customLicenseAcquisitionUrlTemplate] The
    * template for a customer service to deliver keys to end users.  Not needed
    * when using Azure Media Services for issuing keys.

diff --git a/lib/services/mediaServicesManagement/lib/models/commonEncryptionCenc.js b/lib/services/mediaServicesManagement/lib/models/commonEncryptionCenc.js
@@ -22,8 +22,8 @@ class CommonEncryptionCenc {
    * @member {object} [enabledProtocols] Representing supported protocols
    * @member {boolean} [enabledProtocols.download] Enable Download protocol or
    * not
-   * @member {boolean} [enabledProtocols.dash] Enable Dash protocol or not
-   * @member {boolean} [enabledProtocols.hls] Enable Hls protocol or not
+   * @member {boolean} [enabledProtocols.dash] Enable DASH protocol or not
+   * @member {boolean} [enabledProtocols.hls] Enable HLS protocol or not
    * @member {boolean} [enabledProtocols.smoothStreaming] Enable
    * SmoothStreaming protocol or not
    * @member {array} [clearTracks] Representing which tracks should not be
@@ -33,11 +33,11 @@ class CommonEncryptionCenc {
    * @member {object} [contentKeys.defaultKey] Default content key for an
    * encryption scheme
    * @member {string} [contentKeys.defaultKey.label] Label can be used to
-   * specify Content Key when creating Stremaing Locator
+   * specify Content Key when creating a Streaming Locator
    * @member {string} [contentKeys.defaultKey.policyName] Policy used by
    * Default Key
    * @member {array} [contentKeys.keyToTrackMappings] Representing tracks needs
-   * sepearete content key
+   * separate content key
    * @member {object} [drm] Configuration of DRMs for CommonEncryptionCenc
    * encryption scheme
    * @member {object} [drm.playReady] PlayReady configurations

diff --git a/lib/services/mediaServicesManagement/lib/models/contentKeyPolicyFairPlayConfiguration.js b/lib/services/mediaServicesManagement/lib/models/contentKeyPolicyFairPlayConfiguration.js
@@ -87,8 +87,7 @@ class ContentKeyPolicyFairPlayConfiguration extends models['ContentKeyPolicyConf
             required: true,
             serializedName: 'rentalAndLeaseKeyType',
             type: {
-              name: 'Enum',
-              allowedValues: [ 'Unknown', 'Undefined', 'PersistentUnlimited', 'PersistentLimited' ]
+              name: 'String'
             }
           },
           rentalDuration: {

diff --git a/lib/services/mediaServicesManagement/lib/models/contentKeyPolicyPlayReadyLicense.js b/lib/services/mediaServicesManagement/lib/models/contentKeyPolicyPlayReadyLicense.js
@@ -150,8 +150,7 @@ class ContentKeyPolicyPlayReadyLicense {
             required: true,
             serializedName: 'licenseType',
             type: {
-              name: 'Enum',
-              allowedValues: [ 'Unknown', 'NonPersistent', 'Persistent' ]
+              name: 'String'
             }
           },
           contentKeyLocation: {
@@ -171,8 +170,7 @@ class ContentKeyPolicyPlayReadyLicense {
             required: true,
             serializedName: 'contentType',
             type: {
-              name: 'Enum',
-              allowedValues: [ 'Unknown', 'Unspecified', 'UltraVioletDownload', 'UltraVioletStreaming' ]
+              name: 'String'
             }
           }
         }

diff --git a/lib/services/mediaServicesManagement/lib/models/contentKeyPolicyPlayReadyPlayRight.js b/lib/services/mediaServicesManagement/lib/models/contentKeyPolicyPlayReadyPlayRight.js
@@ -127,8 +127,7 @@ class ContentKeyPolicyPlayReadyPlayRight {
             required: true,
             serializedName: 'allowPassingVideoContentToUnknownOutput',
             type: {
-              name: 'Enum',
-              allowedValues: [ 'Unknown', 'NotAllowed', 'Allowed', 'AllowedWithVideoConstriction' ]
+              name: 'String'
             }
           },
           uncompressedDigitalVideoOpl: {

diff --git a/lib/services/mediaServicesManagement/lib/models/contentKeyPolicyTokenRestriction.js b/lib/services/mediaServicesManagement/lib/models/contentKeyPolicyTokenRestriction.js
@@ -131,8 +131,7 @@ class ContentKeyPolicyTokenRestriction extends models['ContentKeyPolicyRestricti
             required: true,
             serializedName: 'restrictionTokenType',
             type: {
-              name: 'Enum',
-              allowedValues: [ 'Unknown', 'Swt', 'Jwt' ]
+              name: 'String'
             }
           },
           openIdConnectDiscoveryDocument: {

diff --git a/lib/services/mediaServicesManagement/lib/models/defaultKey.js b/lib/services/mediaServicesManagement/lib/models/defaultKey.js
@@ -19,7 +19,7 @@ class DefaultKey {
   /**
    * Create a DefaultKey.
    * @member {string} [label] Label can be used to specify Content Key when
-   * creating Stremaing Locator
+   * creating a Streaming Locator
    * @member {string} [policyName] Policy used by Default Key
    */
   constructor() {

diff --git a/lib/services/mediaServicesManagement/lib/models/deinterlace.js b/lib/services/mediaServicesManagement/lib/models/deinterlace.js
@@ -43,16 +43,14 @@ class Deinterlace {
             required: false,
             serializedName: 'parity',
             type: {
-              name: 'Enum',
-              allowedValues: [ 'Auto', 'TopFieldFirst', 'BottomFieldFirst' ]
+              name: 'String'
             }
           },
           mode: {
             required: false,
             serializedName: 'mode',
             type: {
-              name: 'Enum',
-              allowedValues: [ 'Off', 'AutoPixelAdaptive' ]
+              name: 'String'
             }
           }
         }

diff --git a/lib/services/mediaServicesManagement/lib/models/enabledProtocols.js b/lib/services/mediaServicesManagement/lib/models/enabledProtocols.js
@@ -18,8 +18,8 @@ class EnabledProtocols {
   /**
    * Create a EnabledProtocols.
    * @member {boolean} download Enable Download protocol or not
-   * @member {boolean} dash Enable Dash protocol or not
-   * @member {boolean} hls Enable Hls protocol or not
+   * @member {boolean} dash Enable DASH protocol or not
+   * @member {boolean} hls Enable HLS protocol or not
    * @member {boolean} smoothStreaming Enable SmoothStreaming protocol or not
    */
   constructor() {

diff --git a/lib/services/mediaServicesManagement/lib/models/envelopeEncryption.js b/lib/services/mediaServicesManagement/lib/models/envelopeEncryption.js
@@ -22,8 +22,8 @@ class EnvelopeEncryption {
    * @member {object} [enabledProtocols] Representing supported protocols
    * @member {boolean} [enabledProtocols.download] Enable Download protocol or
    * not
-   * @member {boolean} [enabledProtocols.dash] Enable Dash protocol or not
-   * @member {boolean} [enabledProtocols.hls] Enable Hls protocol or not
+   * @member {boolean} [enabledProtocols.dash] Enable DASH protocol or not
+   * @member {boolean} [enabledProtocols.hls] Enable HLS protocol or not
    * @member {boolean} [enabledProtocols.smoothStreaming] Enable
    * SmoothStreaming protocol or not
    * @member {array} [clearTracks] Representing which tracks should not be
@@ -33,14 +33,14 @@ class EnvelopeEncryption {
    * @member {object} [contentKeys.defaultKey] Default content key for an
    * encryption scheme
    * @member {string} [contentKeys.defaultKey.label] Label can be used to
-   * specify Content Key when creating Stremaing Locator
+   * specify Content Key when creating a Streaming Locator
    * @member {string} [contentKeys.defaultKey.policyName] Policy used by
    * Default Key
    * @member {array} [contentKeys.keyToTrackMappings] Representing tracks needs
-   * sepearete content key
-   * @member {string} [customLicenseAcquisitionUrlTemplate]
-   * LicenseAcquistionUrlTemplate is used to point to user speicified service
-   * to delivery content keys
+   * separate content key
+   * @member {string} [customKeyAcquisitionUrlTemplate]
+   * KeyAcquistionUrlTemplate is used to point to user specified service to
+   * delivery content keys
    */
   constructor() {
   }
@@ -90,9 +90,9 @@ class EnvelopeEncryption {
               className: 'StreamingPolicyContentKeys'
             }
           },
-          customLicenseAcquisitionUrlTemplate: {
+          customKeyAcquisitionUrlTemplate: {
             required: false,
-            serializedName: 'customLicenseAcquisitionUrlTemplate',
+            serializedName: 'customKeyAcquisitionUrlTemplate',
             type: {
               name: 'String'
             }

diff --git a/lib/services/mediaServicesManagement/lib/models/filters.js b/lib/services/mediaServicesManagement/lib/models/filters.js
@@ -75,8 +75,7 @@ class Filters {
             required: false,
             serializedName: 'rotation',
             type: {
-              name: 'Enum',
-              allowedValues: [ 'Auto', 'None', 'Rotate0', 'Rotate90', 'Rotate180', 'Rotate270' ]
+              name: 'String'
             }
           },
           crop: {

diff --git a/lib/services/mediaServicesManagement/lib/models/h264Layer.js b/lib/services/mediaServicesManagement/lib/models/h264Layer.js
@@ -136,8 +136,7 @@ class H264Layer extends models['VideoLayer'] {
             required: false,
             serializedName: 'profile',
             type: {
-              name: 'Enum',
-              allowedValues: [ 'Auto', 'Baseline', 'Main', 'High', 'High422', 'High444' ]
+              name: 'String'
             }
           },
           level: {
@@ -165,8 +164,7 @@ class H264Layer extends models['VideoLayer'] {
             required: false,
             serializedName: 'entropyMode',
             type: {
-              name: 'Enum',
-              allowedValues: [ 'Cabac', 'Cavlc' ]
+              name: 'String'
             }
           }
         }

diff --git a/lib/services/mediaServicesManagement/lib/models/h264Video.js b/lib/services/mediaServicesManagement/lib/models/h264Video.js
@@ -79,8 +79,7 @@ class H264Video extends models['Video'] {
             required: false,
             serializedName: 'stretchMode',
             type: {
-              name: 'Enum',
-              allowedValues: [ 'None', 'AutoSize', 'AutoFit' ]
+              name: 'String'
             }
           },
           sceneChangeDetection: {
@@ -94,8 +93,7 @@ class H264Video extends models['Video'] {
             required: false,
             serializedName: 'complexity',
             type: {
-              name: 'Enum',
-              allowedValues: [ 'Speed', 'Balanced', 'Quality' ]
+              name: 'String'
             }
           },
           layers: {

diff --git a/lib/services/mediaServicesManagement/lib/models/image.js b/lib/services/mediaServicesManagement/lib/models/image.js
@@ -86,8 +86,7 @@ class Image extends models['Video'] {
             required: false,
             serializedName: 'stretchMode',
             type: {
-              name: 'Enum',
-              allowedValues: [ 'None', 'AutoSize', 'AutoFit' ]
+              name: 'String'
             }
           },
           start: {