diff --git a/sdk/apimanagement/arm-apimanagement/package.json b/sdk/apimanagement/arm-apimanagement/package.json
index ea30e927e3eb..f6eb86739b51 100644
--- a/sdk/apimanagement/arm-apimanagement/package.json
+++ b/sdk/apimanagement/arm-apimanagement/package.json
@@ -27,7 +27,7 @@
     "rollup-plugin-sourcemaps": "^0.4.2",
     "uglify-js": "^3.6.0"
   },
-  "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/apimanagement/arm-apimanagement",
+  "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/apimanagement/arm-apimanagement",
   "repository": {
     "type": "git",
     "url": "https://github.com/Azure/azure-sdk-for-js.git"
diff --git a/sdk/apimanagement/arm-apimanagement/src/apiManagementClientContext.ts b/sdk/apimanagement/arm-apimanagement/src/apiManagementClientContext.ts
index 538906ef531e..862f585b2ca7 100644
--- a/sdk/apimanagement/arm-apimanagement/src/apiManagementClientContext.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/apiManagementClientContext.ts
@@ -50,7 +50,7 @@ export class ApiManagementClientContext extends msRestAzure.AzureServiceClient {
 
     super(credentials, options);
 
-    this.apiVersion = '2021-08-01';
+    this.apiVersion = '2021-04-01-preview';
     this.acceptLanguage = 'en-US';
     this.longRunningOperationRetryTimeout = 30;
     this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com";
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/index.ts b/sdk/apimanagement/arm-apimanagement/src/models/index.ts
index 4623e45c0280..7ad10b988112 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/index.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/index.ts
@@ -2321,210 +2321,6 @@ export interface CertificateCreateOrUpdateParameters {
   keyVault?: KeyVaultContractCreateProperties;
 }
 
-/**
- * Information about an issue encountered in the process of checking for connectivity.
- */
-export interface ConnectivityIssue {
-  /**
-   * The origin of the issue. Possible values include: 'Local', 'Inbound', 'Outbound'
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
-   */
-  readonly origin?: Origin;
-  /**
-   * The severity of the issue. Possible values include: 'Error', 'Warning'
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
-   */
-  readonly severity?: Severity;
-  /**
-   * The type of issue. Possible values include: 'Unknown', 'AgentStopped', 'GuestFirewall',
-   * 'DnsResolution', 'SocketBind', 'NetworkSecurityRule', 'UserDefinedRoute', 'PortThrottled',
-   * 'Platform'
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
-   */
-  readonly type?: IssueType;
-  /**
-   * Provides additional context on the issue.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
-   */
-  readonly context?: { [propertyName: string]: string }[];
-}
-
-/**
- * Information about a hop between the source and the destination.
- */
-export interface ConnectivityHop {
-  /**
-   * The type of the hop.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
-   */
-  readonly type?: string;
-  /**
-   * The ID of the hop.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
-   */
-  readonly id?: string;
-  /**
-   * The IP address of the hop.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
-   */
-  readonly address?: string;
-  /**
-   * The ID of the resource corresponding to this hop.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
-   */
-  readonly resourceId?: string;
-  /**
-   * List of next hop identifiers.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
-   */
-  readonly nextHopIds?: string[];
-  /**
-   * List of issues.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
-   */
-  readonly issues?: ConnectivityIssue[];
-}
-
-/**
- * Information on the connectivity status.
- */
-export interface ConnectivityCheckResponse {
-  /**
-   * List of hops between the source and the destination.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
-   */
-  readonly hops?: ConnectivityHop[];
-  /**
-   * The connection status. Possible values include: 'Unknown', 'Connected', 'Disconnected',
-   * 'Degraded'
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
-   */
-  readonly connectionStatus?: ConnectionStatus;
-  /**
-   * Average latency in milliseconds.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
-   */
-  readonly avgLatencyInMs?: number;
-  /**
-   * Minimum latency in milliseconds.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
-   */
-  readonly minLatencyInMs?: number;
-  /**
-   * Maximum latency in milliseconds.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
-   */
-  readonly maxLatencyInMs?: number;
-  /**
-   * Total number of probes sent.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
-   */
-  readonly probesSent?: number;
-  /**
-   * Number of failed probes.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
-   */
-  readonly probesFailed?: number;
-}
-
-/**
- * HTTP header and it's value.
- */
-export interface HTTPHeader {
-  /**
-   * Header name.
-   */
-  name: string;
-  /**
-   * Header value.
-   */
-  value: string;
-}
-
-/**
- * Definitions about the connectivity check origin.
- */
-export interface ConnectivityCheckRequestSource {
-  /**
-   * The API Management service region from where to start the connectivity check operation.
-   */
-  region: string;
-  /**
-   * The particular VMSS instance from which to fire the request.
-   */
-  instance?: number;
-}
-
-/**
- * The connectivity check operation destination.
- */
-export interface ConnectivityCheckRequestDestination {
-  /**
-   * Destination address. Can either be an IP address or a FQDN.
-   */
-  address: string;
-  /**
-   * Destination port.
-   */
-  port: number;
-}
-
-/**
- * Configuration for HTTP or HTTPS requests.
- */
-export interface ConnectivityCheckRequestProtocolConfigurationHTTPConfiguration {
-  /**
-   * The HTTP method to be used. Possible values include: 'GET', 'POST'
-   */
-  method?: Method;
-  /**
-   * List of HTTP status codes considered valid for the request response.
-   */
-  validStatusCodes?: number[];
-  /**
-   * List of headers to be included in the request.
-   */
-  headers?: HTTPHeader[];
-}
-
-/**
- * Protocol-specific configuration.
- */
-export interface ConnectivityCheckRequestProtocolConfiguration {
-  /**
-   * Configuration for HTTP or HTTPS requests.
-   */
-  hTTPConfiguration?: ConnectivityCheckRequestProtocolConfigurationHTTPConfiguration;
-}
-
-/**
- * A request to perform the connectivity check operation on a API Management service.
- */
-export interface ConnectivityCheckRequest {
-  /**
-   * Definitions about the connectivity check origin.
-   */
-  source: ConnectivityCheckRequestSource;
-  /**
-   * The connectivity check operation destination.
-   */
-  destination: ConnectivityCheckRequestDestination;
-  /**
-   * The IP version to be used. Only IPv4 is supported for now. Possible values include: 'IPv4'
-   */
-  preferredIPVersion?: PreferredIPVersion;
-  /**
-   * The request's protocol. Specific protocol configuration can be available based on this
-   * selection. The specified destination address must be coherent with this value. Possible values
-   * include: 'TCP', 'HTTP', 'HTTPS'
-   */
-  protocol?: ConnectivityCheckProtocol;
-  /**
-   * Protocol-specific configuration.
-   */
-  protocolConfiguration?: ConnectivityCheckRequestProtocolConfiguration;
-}
-
 /**
  * Content type contract details.
  */
@@ -6078,55 +5874,259 @@ export interface UserUpdateParameters {
    */
   firstName?: string;
   /**
-   * Last name.
+   * Last name.
+   */
+  lastName?: string;
+}
+
+/**
+ * User create details.
+ */
+export interface UserCreateParameters {
+  /**
+   * Account state. Specifies whether the user is active or not. Blocked users are unable to sign
+   * into the developer portal or call any APIs of subscribed products. Default state is Active.
+   * Possible values include: 'active', 'blocked', 'pending', 'deleted'. Default value: 'active'.
+   */
+  state?: UserState;
+  /**
+   * Optional note about a user set by the administrator.
+   */
+  note?: string;
+  /**
+   * Collection of user identities.
+   */
+  identities?: UserIdentityContract[];
+  /**
+   * Email address. Must not be empty and must be unique within the service instance.
+   */
+  email: string;
+  /**
+   * First name.
+   */
+  firstName: string;
+  /**
+   * Last name.
+   */
+  lastName: string;
+  /**
+   * User Password. If no value is provided, a default password is generated.
+   */
+  password?: string;
+  /**
+   * Determines the type of application which send the create user request. Default is legacy
+   * portal. Possible values include: 'portal', 'developerPortal'
+   */
+  appType?: AppType;
+  /**
+   * Determines the type of confirmation e-mail that will be sent to the newly created user.
+   * Possible values include: 'signup', 'invite'
+   */
+  confirmation?: Confirmation;
+}
+
+/**
+ * Information about an issue encountered in the process of checking for connectivity.
+ */
+export interface ConnectivityIssue {
+  /**
+   * The origin of the issue. Possible values include: 'Local', 'Inbound', 'Outbound'
+   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   */
+  readonly origin?: Origin;
+  /**
+   * The severity of the issue. Possible values include: 'Error', 'Warning'
+   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   */
+  readonly severity?: Severity;
+  /**
+   * The type of issue. Possible values include: 'Unknown', 'AgentStopped', 'GuestFirewall',
+   * 'DnsResolution', 'SocketBind', 'NetworkSecurityRule', 'UserDefinedRoute', 'PortThrottled',
+   * 'Platform'
+   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   */
+  readonly type?: IssueType;
+  /**
+   * Provides additional context on the issue.
+   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   */
+  readonly context?: { [propertyName: string]: string }[];
+}
+
+/**
+ * Information about a hop between the source and the destination.
+ */
+export interface ConnectivityHop {
+  /**
+   * The type of the hop.
+   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   */
+  readonly type?: string;
+  /**
+   * The ID of the hop.
+   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   */
+  readonly id?: string;
+  /**
+   * The IP address of the hop.
+   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   */
+  readonly address?: string;
+  /**
+   * The ID of the resource corresponding to this hop.
+   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   */
+  readonly resourceId?: string;
+  /**
+   * List of next hop identifiers.
+   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   */
+  readonly nextHopIds?: string[];
+  /**
+   * List of issues.
+   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   */
+  readonly issues?: ConnectivityIssue[];
+}
+
+/**
+ * Information on the connectivity status.
+ */
+export interface ConnectivityCheckResponse {
+  /**
+   * List of hops between the source and the destination.
+   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   */
+  readonly hops?: ConnectivityHop[];
+  /**
+   * The connection status. Possible values include: 'Unknown', 'Connected', 'Disconnected',
+   * 'Degraded'
+   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   */
+  readonly connectionStatus?: ConnectionStatus;
+  /**
+   * Average latency in milliseconds.
+   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   */
+  readonly avgLatencyInMs?: number;
+  /**
+   * Minimum latency in milliseconds.
+   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   */
+  readonly minLatencyInMs?: number;
+  /**
+   * Maximum latency in milliseconds.
+   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   */
+  readonly maxLatencyInMs?: number;
+  /**
+   * Total number of probes sent.
+   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   */
+  readonly probesSent?: number;
+  /**
+   * Number of failed probes.
+   * **NOTE: This property will not be serialized. It can only be populated by the server.**
+   */
+  readonly probesFailed?: number;
+}
+
+/**
+ * HTTP header and it's value.
+ */
+export interface HTTPHeader {
+  /**
+   * Header name.
+   */
+  name: string;
+  /**
+   * Header value.
+   */
+  value: string;
+}
+
+/**
+ * Definitions about the connectivity check origin.
+ */
+export interface ConnectivityCheckRequestSource {
+  /**
+   * The API Management service region from where to start the connectivity check operation.
+   */
+  region: string;
+  /**
+   * The particular VMSS instance from which to fire the request.
+   */
+  instance?: number;
+}
+
+/**
+ * The connectivity check operation destination.
+ */
+export interface ConnectivityCheckRequestDestination {
+  /**
+   * Destination address. Can either be an IP address or a FQDN.
+   */
+  address: string;
+  /**
+   * Destination port.
    */
-  lastName?: string;
+  port: number;
 }
 
 /**
- * User create details.
+ * Configuration for HTTP or HTTPS requests.
  */
-export interface UserCreateParameters {
+export interface ConnectivityCheckRequestProtocolConfigurationHTTPConfiguration {
   /**
-   * Account state. Specifies whether the user is active or not. Blocked users are unable to sign
-   * into the developer portal or call any APIs of subscribed products. Default state is Active.
-   * Possible values include: 'active', 'blocked', 'pending', 'deleted'. Default value: 'active'.
+   * The HTTP method to be used. Possible values include: 'GET', 'POST'
    */
-  state?: UserState;
+  method?: Method;
   /**
-   * Optional note about a user set by the administrator.
+   * List of HTTP status codes considered valid for the request response.
    */
-  note?: string;
+  validStatusCodes?: number[];
   /**
-   * Collection of user identities.
+   * List of headers to be included in the request.
    */
-  identities?: UserIdentityContract[];
+  headers?: HTTPHeader[];
+}
+
+/**
+ * Protocol-specific configuration.
+ */
+export interface ConnectivityCheckRequestProtocolConfiguration {
   /**
-   * Email address. Must not be empty and must be unique within the service instance.
+   * Configuration for HTTP or HTTPS requests.
    */
-  email: string;
+  hTTPConfiguration?: ConnectivityCheckRequestProtocolConfigurationHTTPConfiguration;
+}
+
+/**
+ * A request to perform the connectivity check operation on a API Management service.
+ */
+export interface ConnectivityCheckRequest {
   /**
-   * First name.
+   * Definitions about the connectivity check origin.
    */
-  firstName: string;
+  source: ConnectivityCheckRequestSource;
   /**
-   * Last name.
+   * The connectivity check operation destination.
    */
-  lastName: string;
+  destination: ConnectivityCheckRequestDestination;
   /**
-   * User Password. If no value is provided, a default password is generated.
+   * The IP version to be used. Only IPv4 is supported for now. Possible values include: 'IPv4'
    */
-  password?: string;
+  preferredIPVersion?: PreferredIPVersion;
   /**
-   * Determines the type of application which send the create user request. Default is legacy
-   * portal. Possible values include: 'portal', 'developerPortal'
+   * The request's protocol. Specific protocol configuration can be available based on this
+   * selection. The specified destination address must be coherent with this value. Possible values
+   * include: 'TCP', 'HTTP', 'HTTPS'
    */
-  appType?: AppType;
+  protocol?: ConnectivityCheckProtocol;
   /**
-   * Determines the type of confirmation e-mail that will be sent to the newly created user.
-   * Possible values include: 'signup', 'invite'
+   * Protocol-specific configuration.
    */
-  confirmation?: Confirmation;
+  protocolConfiguration?: ConnectivityCheckRequestProtocolConfiguration;
 }
 
 /**
@@ -11833,63 +11833,6 @@ export type BearerTokenSendingMethod = 'authorizationHeader' | 'query';
  */
 export type BackendProtocol = 'http' | 'soap';
 
-/**
- * Defines values for Origin.
- * Possible values include: 'Local', 'Inbound', 'Outbound'
- * @readonly
- * @enum {string}
- */
-export type Origin = 'Local' | 'Inbound' | 'Outbound';
-
-/**
- * Defines values for Severity.
- * Possible values include: 'Error', 'Warning'
- * @readonly
- * @enum {string}
- */
-export type Severity = 'Error' | 'Warning';
-
-/**
- * Defines values for IssueType.
- * Possible values include: 'Unknown', 'AgentStopped', 'GuestFirewall', 'DnsResolution',
- * 'SocketBind', 'NetworkSecurityRule', 'UserDefinedRoute', 'PortThrottled', 'Platform'
- * @readonly
- * @enum {string}
- */
-export type IssueType = 'Unknown' | 'AgentStopped' | 'GuestFirewall' | 'DnsResolution' | 'SocketBind' | 'NetworkSecurityRule' | 'UserDefinedRoute' | 'PortThrottled' | 'Platform';
-
-/**
- * Defines values for ConnectionStatus.
- * Possible values include: 'Unknown', 'Connected', 'Disconnected', 'Degraded'
- * @readonly
- * @enum {string}
- */
-export type ConnectionStatus = 'Unknown' | 'Connected' | 'Disconnected' | 'Degraded';
-
-/**
- * Defines values for PreferredIPVersion.
- * Possible values include: 'IPv4'
- * @readonly
- * @enum {string}
- */
-export type PreferredIPVersion = 'IPv4';
-
-/**
- * Defines values for ConnectivityCheckProtocol.
- * Possible values include: 'TCP', 'HTTP', 'HTTPS'
- * @readonly
- * @enum {string}
- */
-export type ConnectivityCheckProtocol = 'TCP' | 'HTTP' | 'HTTPS';
-
-/**
- * Defines values for Method.
- * Possible values include: 'GET', 'POST'
- * @readonly
- * @enum {string}
- */
-export type Method = 'GET' | 'POST';
-
 /**
  * Defines values for SkuType.
  * Possible values include: 'Developer', 'Standard', 'Premium', 'Basic', 'Consumption', 'Isolated'
@@ -12124,6 +12067,63 @@ export type ApiManagementSkuRestrictionsReasonCode = 'QuotaId' | 'NotAvailableFo
  */
 export type AsyncOperationStatus = 'Started' | 'InProgress' | 'Succeeded' | 'Failed';
 
+/**
+ * Defines values for Origin.
+ * Possible values include: 'Local', 'Inbound', 'Outbound'
+ * @readonly
+ * @enum {string}
+ */
+export type Origin = 'Local' | 'Inbound' | 'Outbound';
+
+/**
+ * Defines values for Severity.
+ * Possible values include: 'Error', 'Warning'
+ * @readonly
+ * @enum {string}
+ */
+export type Severity = 'Error' | 'Warning';
+
+/**
+ * Defines values for IssueType.
+ * Possible values include: 'Unknown', 'AgentStopped', 'GuestFirewall', 'DnsResolution',
+ * 'SocketBind', 'NetworkSecurityRule', 'UserDefinedRoute', 'PortThrottled', 'Platform'
+ * @readonly
+ * @enum {string}
+ */
+export type IssueType = 'Unknown' | 'AgentStopped' | 'GuestFirewall' | 'DnsResolution' | 'SocketBind' | 'NetworkSecurityRule' | 'UserDefinedRoute' | 'PortThrottled' | 'Platform';
+
+/**
+ * Defines values for ConnectionStatus.
+ * Possible values include: 'Unknown', 'Connected', 'Disconnected', 'Degraded'
+ * @readonly
+ * @enum {string}
+ */
+export type ConnectionStatus = 'Unknown' | 'Connected' | 'Disconnected' | 'Degraded';
+
+/**
+ * Defines values for PreferredIPVersion.
+ * Possible values include: 'IPv4'
+ * @readonly
+ * @enum {string}
+ */
+export type PreferredIPVersion = 'IPv4';
+
+/**
+ * Defines values for ConnectivityCheckProtocol.
+ * Possible values include: 'TCP', 'HTTP', 'HTTPS'
+ * @readonly
+ * @enum {string}
+ */
+export type ConnectivityCheckProtocol = 'TCP' | 'HTTP' | 'HTTPS';
+
+/**
+ * Defines values for Method.
+ * Possible values include: 'GET', 'POST'
+ * @readonly
+ * @enum {string}
+ */
+export type Method = 'GET' | 'POST';
+
 /**
  * Defines values for AccessIdName.
  * Possible values include: 'access', 'gitAccess'
@@ -14707,46 +14707,6 @@ export type CertificateListByServiceNextResponse = CertificateCollection & {
     };
 };
 
-/**
- * Contains response data for the performConnectivityCheckAsync operation.
- */
-export type PerformConnectivityCheckAsyncResponse = ConnectivityCheckResponse & {
-  /**
-   * The underlying HTTP response.
-   */
-  _response: msRest.HttpResponse & {
-      /**
-       * The response body as text (string format)
-       */
-      bodyAsText: string;
-
-      /**
-       * The response body as parsed JSON or XML
-       */
-      parsedBody: ConnectivityCheckResponse;
-    };
-};
-
-/**
- * Contains response data for the beginPerformConnectivityCheckAsync operation.
- */
-export type BeginPerformConnectivityCheckAsyncResponse = ConnectivityCheckResponse & {
-  /**
-   * The underlying HTTP response.
-   */
-  _response: msRest.HttpResponse & {
-      /**
-       * The response body as text (string format)
-       */
-      bodyAsText: string;
-
-      /**
-       * The response body as parsed JSON or XML
-       */
-      parsedBody: ConnectivityCheckResponse;
-    };
-};
-
 /**
  * Contains response data for the listByService operation.
  */
@@ -19727,6 +19687,46 @@ export type UserIdentitiesListNextResponse = UserIdentityCollection & {
     };
 };
 
+/**
+ * Contains response data for the performConnectivityCheckAsync operation.
+ */
+export type PerformConnectivityCheckAsyncResponse = ConnectivityCheckResponse & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: ConnectivityCheckResponse;
+    };
+};
+
+/**
+ * Contains response data for the beginPerformConnectivityCheckAsync operation.
+ */
+export type BeginPerformConnectivityCheckAsyncResponse = ConnectivityCheckResponse & {
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: ConnectivityCheckResponse;
+    };
+};
+
 /**
  * Contains response data for the get operation.
  */
diff --git a/sdk/apimanagement/arm-apimanagement/src/models/mappers.ts b/sdk/apimanagement/arm-apimanagement/src/models/mappers.ts
index 9ec9d159fed9..2f52ebe247b3 100644
--- a/sdk/apimanagement/arm-apimanagement/src/models/mappers.ts
+++ b/sdk/apimanagement/arm-apimanagement/src/models/mappers.ts
@@ -4094,198 +4094,215 @@ export const CertificateCreateOrUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const ConnectivityIssue: msRest.CompositeMapper = {
-  serializedName: "ConnectivityIssue",
+export const ContentItemContract: msRest.CompositeMapper = {
+  serializedName: "ContentItemContract",
   type: {
     name: "Composite",
-    className: "ConnectivityIssue",
+    className: "ContentItemContract",
     modelProperties: {
-      origin: {
-        readOnly: true,
-        serializedName: "origin",
+      ...Resource.type.modelProperties,
+      properties: {
+        serializedName: "properties",
+        type: {
+          name: "Dictionary",
+          value: {
+            type: {
+              name: "Object"
+            }
+          }
+        }
+      }
+    }
+  }
+};
+
+export const ContentTypeContract: msRest.CompositeMapper = {
+  serializedName: "ContentTypeContract",
+  type: {
+    name: "Composite",
+    className: "ContentTypeContract",
+    modelProperties: {
+      ...Resource.type.modelProperties,
+      contentTypeContractId: {
+        serializedName: "properties.id",
         type: {
           name: "String"
         }
       },
-      severity: {
-        readOnly: true,
-        serializedName: "severity",
+      contentTypeContractName: {
+        serializedName: "properties.name",
         type: {
           name: "String"
         }
       },
-      type: {
-        readOnly: true,
-        serializedName: "type",
+      description: {
+        serializedName: "properties.description",
         type: {
           name: "String"
         }
       },
-      context: {
-        readOnly: true,
-        serializedName: "context",
+      schema: {
+        serializedName: "properties.schema",
         type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Dictionary",
-              value: {
-                type: {
-                  name: "String"
-                }
-              }
-            }
-          }
+          name: "Object"
+        }
+      },
+      version: {
+        serializedName: "properties.version",
+        type: {
+          name: "String"
         }
       }
     }
   }
 };
 
-export const ConnectivityHop: msRest.CompositeMapper = {
-  serializedName: "ConnectivityHop",
+export const DeletedServiceContract: msRest.CompositeMapper = {
+  serializedName: "DeletedServiceContract",
   type: {
     name: "Composite",
-    className: "ConnectivityHop",
+    className: "DeletedServiceContract",
     modelProperties: {
-      type: {
-        readOnly: true,
-        serializedName: "type",
+      ...Resource.type.modelProperties,
+      serviceId: {
+        serializedName: "properties.serviceId",
         type: {
           name: "String"
         }
       },
-      id: {
-        readOnly: true,
-        serializedName: "id",
+      scheduledPurgeDate: {
+        serializedName: "properties.scheduledPurgeDate",
         type: {
-          name: "String"
+          name: "DateTime"
         }
       },
-      address: {
-        readOnly: true,
-        serializedName: "address",
+      deletionDate: {
+        serializedName: "properties.deletionDate",
         type: {
-          name: "String"
+          name: "DateTime"
         }
       },
-      resourceId: {
+      location: {
         readOnly: true,
-        serializedName: "resourceId",
+        serializedName: "location",
         type: {
           name: "String"
         }
-      },
-      nextHopIds: {
-        readOnly: true,
-        serializedName: "nextHopIds",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "String"
-            }
-          }
-        }
-      },
-      issues: {
-        readOnly: true,
-        serializedName: "issues",
+      }
+    }
+  }
+};
+
+export const ResourceSku: msRest.CompositeMapper = {
+  serializedName: "ResourceSku",
+  type: {
+    name: "Composite",
+    className: "ResourceSku",
+    modelProperties: {
+      name: {
+        serializedName: "name",
         type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "ConnectivityIssue"
-            }
-          }
+          name: "String"
         }
       }
     }
   }
 };
 
-export const ConnectivityCheckResponse: msRest.CompositeMapper = {
-  serializedName: "ConnectivityCheckResponse",
+export const ResourceSkuCapacity: msRest.CompositeMapper = {
+  serializedName: "ResourceSkuCapacity",
   type: {
     name: "Composite",
-    className: "ConnectivityCheckResponse",
+    className: "ResourceSkuCapacity",
     modelProperties: {
-      hops: {
+      minimum: {
         readOnly: true,
-        serializedName: "hops",
+        serializedName: "minimum",
         type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "ConnectivityHop"
-            }
-          }
+          name: "Number"
         }
       },
-      connectionStatus: {
+      maximum: {
         readOnly: true,
-        serializedName: "connectionStatus",
+        serializedName: "maximum",
         type: {
-          name: "String"
+          name: "Number"
         }
       },
-      avgLatencyInMs: {
+      default: {
         readOnly: true,
-        serializedName: "avgLatencyInMs",
+        serializedName: "default",
         type: {
           name: "Number"
         }
       },
-      minLatencyInMs: {
+      scaleType: {
         readOnly: true,
-        serializedName: "minLatencyInMs",
+        serializedName: "scaleType",
         type: {
-          name: "Number"
+          name: "String"
         }
-      },
-      maxLatencyInMs: {
+      }
+    }
+  }
+};
+
+export const ResourceSkuResult: msRest.CompositeMapper = {
+  serializedName: "ResourceSkuResult",
+  type: {
+    name: "Composite",
+    className: "ResourceSkuResult",
+    modelProperties: {
+      resourceType: {
         readOnly: true,
-        serializedName: "maxLatencyInMs",
+        serializedName: "resourceType",
         type: {
-          name: "Number"
+          name: "String"
         }
       },
-      probesSent: {
+      sku: {
         readOnly: true,
-        serializedName: "probesSent",
+        serializedName: "sku",
         type: {
-          name: "Number"
+          name: "Composite",
+          className: "ResourceSku"
         }
       },
-      probesFailed: {
+      capacity: {
         readOnly: true,
-        serializedName: "probesFailed",
+        serializedName: "capacity",
         type: {
-          name: "Number"
+          name: "Composite",
+          className: "ResourceSkuCapacity"
         }
       }
     }
   }
 };
 
-export const HTTPHeader: msRest.CompositeMapper = {
-  serializedName: "HTTPHeader",
+export const CertificateInformation: msRest.CompositeMapper = {
+  serializedName: "CertificateInformation",
   type: {
     name: "Composite",
-    className: "HTTPHeader",
+    className: "CertificateInformation",
     modelProperties: {
-      name: {
+      expiry: {
         required: true,
-        serializedName: "name",
+        serializedName: "expiry",
+        type: {
+          name: "DateTime"
+        }
+      },
+      thumbprint: {
+        required: true,
+        serializedName: "thumbprint",
         type: {
           name: "String"
         }
       },
-      value: {
+      subject: {
         required: true,
-        serializedName: "value",
+        serializedName: "subject",
         type: {
           name: "String"
         }
@@ -4294,209 +4311,266 @@ export const HTTPHeader: msRest.CompositeMapper = {
   }
 };
 
-export const ConnectivityCheckRequestSource: msRest.CompositeMapper = {
-  serializedName: "ConnectivityCheckRequest_source",
+export const CertificateConfiguration: msRest.CompositeMapper = {
+  serializedName: "CertificateConfiguration",
   type: {
     name: "Composite",
-    className: "ConnectivityCheckRequestSource",
+    className: "CertificateConfiguration",
     modelProperties: {
-      region: {
+      encodedCertificate: {
+        serializedName: "encodedCertificate",
+        type: {
+          name: "String"
+        }
+      },
+      certificatePassword: {
+        serializedName: "certificatePassword",
+        type: {
+          name: "String"
+        }
+      },
+      storeName: {
         required: true,
-        serializedName: "region",
+        serializedName: "storeName",
         type: {
           name: "String"
         }
       },
-      instance: {
-        serializedName: "instance",
+      certificate: {
+        serializedName: "certificate",
         type: {
-          name: "Number"
+          name: "Composite",
+          className: "CertificateInformation"
         }
       }
     }
   }
 };
 
-export const ConnectivityCheckRequestDestination: msRest.CompositeMapper = {
-  serializedName: "ConnectivityCheckRequest_destination",
+export const HostnameConfiguration: msRest.CompositeMapper = {
+  serializedName: "HostnameConfiguration",
   type: {
     name: "Composite",
-    className: "ConnectivityCheckRequestDestination",
+    className: "HostnameConfiguration",
     modelProperties: {
-      address: {
+      type: {
         required: true,
-        serializedName: "address",
+        serializedName: "type",
         type: {
           name: "String"
         }
       },
-      port: {
+      hostName: {
         required: true,
-        serializedName: "port",
+        serializedName: "hostName",
         type: {
-          name: "Number"
+          name: "String"
+        }
+      },
+      keyVaultId: {
+        serializedName: "keyVaultId",
+        type: {
+          name: "String"
+        }
+      },
+      identityClientId: {
+        serializedName: "identityClientId",
+        type: {
+          name: "String"
+        }
+      },
+      encodedCertificate: {
+        serializedName: "encodedCertificate",
+        type: {
+          name: "String"
+        }
+      },
+      certificatePassword: {
+        serializedName: "certificatePassword",
+        type: {
+          name: "String"
+        }
+      },
+      defaultSslBinding: {
+        serializedName: "defaultSslBinding",
+        defaultValue: false,
+        type: {
+          name: "Boolean"
+        }
+      },
+      negotiateClientCertificate: {
+        serializedName: "negotiateClientCertificate",
+        defaultValue: false,
+        type: {
+          name: "Boolean"
+        }
+      },
+      certificate: {
+        serializedName: "certificate",
+        type: {
+          name: "Composite",
+          className: "CertificateInformation"
+        }
+      },
+      certificateSource: {
+        serializedName: "certificateSource",
+        type: {
+          name: "String"
+        }
+      },
+      certificateStatus: {
+        serializedName: "certificateStatus",
+        type: {
+          name: "String"
         }
       }
     }
   }
 };
 
-export const ConnectivityCheckRequestProtocolConfigurationHTTPConfiguration: msRest.CompositeMapper = {
-  serializedName: "ConnectivityCheckRequest_protocolConfiguration_HTTPConfiguration",
+export const VirtualNetworkConfiguration: msRest.CompositeMapper = {
+  serializedName: "VirtualNetworkConfiguration",
   type: {
     name: "Composite",
-    className: "ConnectivityCheckRequestProtocolConfigurationHTTPConfiguration",
+    className: "VirtualNetworkConfiguration",
     modelProperties: {
-      method: {
-        serializedName: "method",
+      vnetid: {
+        readOnly: true,
+        serializedName: "vnetid",
         type: {
           name: "String"
         }
       },
-      validStatusCodes: {
-        serializedName: "validStatusCodes",
+      subnetname: {
+        readOnly: true,
+        serializedName: "subnetname",
         type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Number"
-            }
-          }
+          name: "String"
         }
       },
-      headers: {
-        serializedName: "headers",
+      subnetResourceId: {
+        serializedName: "subnetResourceId",
+        constraints: {
+          Pattern: /^\/subscriptions\/[^\/]*\/resourceGroups\/[^\/]*\/providers\/Microsoft.(ClassicNetwork|Network)\/virtualNetworks\/[^\/]*\/subnets\/[^\/]*$/
+        },
         type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "HTTPHeader"
-            }
-          }
+          name: "String"
         }
       }
     }
   }
 };
 
-export const ConnectivityCheckRequestProtocolConfiguration: msRest.CompositeMapper = {
-  serializedName: "ConnectivityCheckRequest_protocolConfiguration",
+export const ApiManagementServiceSkuProperties: msRest.CompositeMapper = {
+  serializedName: "ApiManagementServiceSkuProperties",
   type: {
     name: "Composite",
-    className: "ConnectivityCheckRequestProtocolConfiguration",
+    className: "ApiManagementServiceSkuProperties",
     modelProperties: {
-      hTTPConfiguration: {
-        serializedName: "HTTPConfiguration",
+      name: {
+        required: true,
+        serializedName: "name",
         type: {
-          name: "Composite",
-          className: "ConnectivityCheckRequestProtocolConfigurationHTTPConfiguration"
+          name: "String"
+        }
+      },
+      capacity: {
+        required: true,
+        serializedName: "capacity",
+        type: {
+          name: "Number"
         }
       }
     }
   }
 };
 
-export const ConnectivityCheckRequest: msRest.CompositeMapper = {
-  serializedName: "ConnectivityCheckRequest",
+export const AdditionalLocation: msRest.CompositeMapper = {
+  serializedName: "AdditionalLocation",
   type: {
     name: "Composite",
-    className: "ConnectivityCheckRequest",
+    className: "AdditionalLocation",
     modelProperties: {
-      source: {
+      location: {
         required: true,
-        serializedName: "source",
+        serializedName: "location",
         type: {
-          name: "Composite",
-          className: "ConnectivityCheckRequestSource"
+          name: "String"
         }
       },
-      destination: {
+      sku: {
         required: true,
-        serializedName: "destination",
+        serializedName: "sku",
         type: {
           name: "Composite",
-          className: "ConnectivityCheckRequestDestination"
+          className: "ApiManagementServiceSkuProperties"
         }
       },
-      preferredIPVersion: {
-        serializedName: "preferredIPVersion",
+      zones: {
+        serializedName: "zones",
         type: {
-          name: "String"
+          name: "Sequence",
+          element: {
+            type: {
+              name: "String"
+            }
+          }
         }
       },
-      protocol: {
-        serializedName: "protocol",
+      publicIPAddresses: {
+        readOnly: true,
+        serializedName: "publicIPAddresses",
         type: {
-          name: "String"
+          name: "Sequence",
+          element: {
+            type: {
+              name: "String"
+            }
+          }
         }
       },
-      protocolConfiguration: {
-        serializedName: "protocolConfiguration",
-        type: {
-          name: "Composite",
-          className: "ConnectivityCheckRequestProtocolConfiguration"
-        }
-      }
-    }
-  }
-};
-
-export const ContentItemContract: msRest.CompositeMapper = {
-  serializedName: "ContentItemContract",
-  type: {
-    name: "Composite",
-    className: "ContentItemContract",
-    modelProperties: {
-      ...Resource.type.modelProperties,
-      properties: {
-        serializedName: "properties",
+      privateIPAddresses: {
+        readOnly: true,
+        serializedName: "privateIPAddresses",
         type: {
-          name: "Dictionary",
-          value: {
+          name: "Sequence",
+          element: {
             type: {
-              name: "Object"
+              name: "String"
             }
           }
         }
-      }
-    }
-  }
-};
-
-export const ContentTypeContract: msRest.CompositeMapper = {
-  serializedName: "ContentTypeContract",
-  type: {
-    name: "Composite",
-    className: "ContentTypeContract",
-    modelProperties: {
-      ...Resource.type.modelProperties,
-      contentTypeContractId: {
-        serializedName: "properties.id",
+      },
+      publicIpAddressId: {
+        serializedName: "publicIpAddressId",
         type: {
           name: "String"
         }
       },
-      contentTypeContractName: {
-        serializedName: "properties.name",
+      virtualNetworkConfiguration: {
+        serializedName: "virtualNetworkConfiguration",
         type: {
-          name: "String"
+          name: "Composite",
+          className: "VirtualNetworkConfiguration"
         }
       },
-      description: {
-        serializedName: "properties.description",
+      gatewayRegionalUrl: {
+        readOnly: true,
+        serializedName: "gatewayRegionalUrl",
         type: {
           name: "String"
         }
       },
-      schema: {
-        serializedName: "properties.schema",
+      disableGateway: {
+        serializedName: "disableGateway",
+        defaultValue: false,
         type: {
-          name: "Object"
+          name: "Boolean"
         }
       },
-      version: {
-        serializedName: "properties.version",
+      platformVersion: {
+        readOnly: true,
+        serializedName: "platformVersion",
         type: {
           name: "String"
         }
@@ -4505,34 +4579,48 @@ export const ContentTypeContract: msRest.CompositeMapper = {
   }
 };
 
-export const DeletedServiceContract: msRest.CompositeMapper = {
-  serializedName: "DeletedServiceContract",
+export const ApiManagementServiceBackupRestoreParameters: msRest.CompositeMapper = {
+  serializedName: "ApiManagementServiceBackupRestoreParameters",
   type: {
     name: "Composite",
-    className: "DeletedServiceContract",
+    className: "ApiManagementServiceBackupRestoreParameters",
     modelProperties: {
-      ...Resource.type.modelProperties,
-      serviceId: {
-        serializedName: "properties.serviceId",
+      storageAccount: {
+        required: true,
+        serializedName: "storageAccount",
         type: {
           name: "String"
         }
       },
-      scheduledPurgeDate: {
-        serializedName: "properties.scheduledPurgeDate",
+      containerName: {
+        required: true,
+        serializedName: "containerName",
         type: {
-          name: "DateTime"
+          name: "String"
         }
       },
-      deletionDate: {
-        serializedName: "properties.deletionDate",
+      backupName: {
+        required: true,
+        serializedName: "backupName",
         type: {
-          name: "DateTime"
+          name: "String"
         }
       },
-      location: {
-        readOnly: true,
-        serializedName: "location",
+      accessType: {
+        serializedName: "accessType",
+        defaultValue: 'AccessKey',
+        type: {
+          name: "String"
+        }
+      },
+      accessKey: {
+        serializedName: "accessKey",
+        type: {
+          name: "String"
+        }
+      },
+      clientId: {
+        serializedName: "clientId",
         type: {
           name: "String"
         }
@@ -4541,14 +4629,14 @@ export const DeletedServiceContract: msRest.CompositeMapper = {
   }
 };
 
-export const ResourceSku: msRest.CompositeMapper = {
-  serializedName: "ResourceSku",
+export const ApiVersionConstraint: msRest.CompositeMapper = {
+  serializedName: "ApiVersionConstraint",
   type: {
     name: "Composite",
-    className: "ResourceSku",
+    className: "ApiVersionConstraint",
     modelProperties: {
-      name: {
-        serializedName: "name",
+      minApiVersion: {
+        serializedName: "minApiVersion",
         type: {
           name: "String"
         }
@@ -4557,36 +4645,15 @@ export const ResourceSku: msRest.CompositeMapper = {
   }
 };
 
-export const ResourceSkuCapacity: msRest.CompositeMapper = {
-  serializedName: "ResourceSkuCapacity",
+export const ArmIdWrapper: msRest.CompositeMapper = {
+  serializedName: "ArmIdWrapper",
   type: {
     name: "Composite",
-    className: "ResourceSkuCapacity",
+    className: "ArmIdWrapper",
     modelProperties: {
-      minimum: {
-        readOnly: true,
-        serializedName: "minimum",
-        type: {
-          name: "Number"
-        }
-      },
-      maximum: {
-        readOnly: true,
-        serializedName: "maximum",
-        type: {
-          name: "Number"
-        }
-      },
-      default: {
-        readOnly: true,
-        serializedName: "default",
-        type: {
-          name: "Number"
-        }
-      },
-      scaleType: {
+      id: {
         readOnly: true,
-        serializedName: "scaleType",
+        serializedName: "id",
         type: {
           name: "String"
         }
@@ -4595,272 +4662,182 @@ export const ResourceSkuCapacity: msRest.CompositeMapper = {
   }
 };
 
-export const ResourceSkuResult: msRest.CompositeMapper = {
-  serializedName: "ResourceSkuResult",
+export const PrivateLinkServiceConnectionState: msRest.CompositeMapper = {
+  serializedName: "PrivateLinkServiceConnectionState",
   type: {
     name: "Composite",
-    className: "ResourceSkuResult",
+    className: "PrivateLinkServiceConnectionState",
     modelProperties: {
-      resourceType: {
-        readOnly: true,
-        serializedName: "resourceType",
+      status: {
+        serializedName: "status",
         type: {
           name: "String"
         }
       },
-      sku: {
-        readOnly: true,
-        serializedName: "sku",
+      description: {
+        serializedName: "description",
         type: {
-          name: "Composite",
-          className: "ResourceSku"
+          name: "String"
         }
       },
-      capacity: {
-        readOnly: true,
-        serializedName: "capacity",
+      actionsRequired: {
+        serializedName: "actionsRequired",
         type: {
-          name: "Composite",
-          className: "ResourceSkuCapacity"
+          name: "String"
         }
       }
     }
   }
 };
 
-export const CertificateInformation: msRest.CompositeMapper = {
-  serializedName: "CertificateInformation",
+export const RemotePrivateEndpointConnectionWrapper: msRest.CompositeMapper = {
+  serializedName: "RemotePrivateEndpointConnectionWrapper",
   type: {
     name: "Composite",
-    className: "CertificateInformation",
+    className: "RemotePrivateEndpointConnectionWrapper",
     modelProperties: {
-      expiry: {
-        required: true,
-        serializedName: "expiry",
+      id: {
+        serializedName: "id",
         type: {
-          name: "DateTime"
+          name: "String"
         }
       },
-      thumbprint: {
-        required: true,
-        serializedName: "thumbprint",
+      name: {
+        serializedName: "name",
         type: {
           name: "String"
         }
       },
-      subject: {
-        required: true,
-        serializedName: "subject",
+      type: {
+        serializedName: "type",
         type: {
           name: "String"
         }
-      }
-    }
-  }
-};
-
-export const CertificateConfiguration: msRest.CompositeMapper = {
-  serializedName: "CertificateConfiguration",
-  type: {
-    name: "Composite",
-    className: "CertificateConfiguration",
-    modelProperties: {
-      encodedCertificate: {
-        serializedName: "encodedCertificate",
+      },
+      privateEndpoint: {
+        serializedName: "properties.privateEndpoint",
         type: {
-          name: "String"
+          name: "Composite",
+          className: "ArmIdWrapper"
         }
       },
-      certificatePassword: {
-        serializedName: "certificatePassword",
+      privateLinkServiceConnectionState: {
+        required: true,
+        serializedName: "properties.privateLinkServiceConnectionState",
         type: {
-          name: "String"
+          name: "Composite",
+          className: "PrivateLinkServiceConnectionState"
         }
       },
-      storeName: {
-        required: true,
-        serializedName: "storeName",
+      provisioningState: {
+        readOnly: true,
+        serializedName: "properties.provisioningState",
         type: {
           name: "String"
         }
       },
-      certificate: {
-        serializedName: "certificate",
+      groupIds: {
+        readOnly: true,
+        serializedName: "properties.groupIds",
         type: {
-          name: "Composite",
-          className: "CertificateInformation"
+          name: "Sequence",
+          element: {
+            type: {
+              name: "String"
+            }
+          }
         }
       }
     }
   }
 };
 
-export const HostnameConfiguration: msRest.CompositeMapper = {
-  serializedName: "HostnameConfiguration",
+export const ApiManagementServiceBaseProperties: msRest.CompositeMapper = {
+  serializedName: "ApiManagementServiceBaseProperties",
   type: {
     name: "Composite",
-    className: "HostnameConfiguration",
+    className: "ApiManagementServiceBaseProperties",
     modelProperties: {
-      type: {
-        required: true,
-        serializedName: "type",
+      notificationSenderEmail: {
+        serializedName: "notificationSenderEmail",
+        constraints: {
+          MaxLength: 100
+        },
         type: {
           name: "String"
         }
       },
-      hostName: {
-        required: true,
-        serializedName: "hostName",
+      provisioningState: {
+        readOnly: true,
+        serializedName: "provisioningState",
         type: {
           name: "String"
         }
       },
-      keyVaultId: {
-        serializedName: "keyVaultId",
+      targetProvisioningState: {
+        readOnly: true,
+        serializedName: "targetProvisioningState",
         type: {
           name: "String"
         }
       },
-      identityClientId: {
-        serializedName: "identityClientId",
+      createdAtUtc: {
+        readOnly: true,
+        serializedName: "createdAtUtc",
         type: {
-          name: "String"
+          name: "DateTime"
         }
       },
-      encodedCertificate: {
-        serializedName: "encodedCertificate",
+      gatewayUrl: {
+        readOnly: true,
+        serializedName: "gatewayUrl",
         type: {
           name: "String"
         }
       },
-      certificatePassword: {
-        serializedName: "certificatePassword",
+      gatewayRegionalUrl: {
+        readOnly: true,
+        serializedName: "gatewayRegionalUrl",
         type: {
           name: "String"
         }
       },
-      defaultSslBinding: {
-        serializedName: "defaultSslBinding",
-        defaultValue: false,
-        type: {
-          name: "Boolean"
-        }
-      },
-      negotiateClientCertificate: {
-        serializedName: "negotiateClientCertificate",
-        defaultValue: false,
-        type: {
-          name: "Boolean"
-        }
-      },
-      certificate: {
-        serializedName: "certificate",
-        type: {
-          name: "Composite",
-          className: "CertificateInformation"
-        }
-      },
-      certificateSource: {
-        serializedName: "certificateSource",
+      portalUrl: {
+        readOnly: true,
+        serializedName: "portalUrl",
         type: {
           name: "String"
         }
       },
-      certificateStatus: {
-        serializedName: "certificateStatus",
+      managementApiUrl: {
+        readOnly: true,
+        serializedName: "managementApiUrl",
         type: {
           name: "String"
         }
-      }
-    }
-  }
-};
-
-export const VirtualNetworkConfiguration: msRest.CompositeMapper = {
-  serializedName: "VirtualNetworkConfiguration",
-  type: {
-    name: "Composite",
-    className: "VirtualNetworkConfiguration",
-    modelProperties: {
-      vnetid: {
+      },
+      scmUrl: {
         readOnly: true,
-        serializedName: "vnetid",
+        serializedName: "scmUrl",
         type: {
           name: "String"
         }
       },
-      subnetname: {
+      developerPortalUrl: {
         readOnly: true,
-        serializedName: "subnetname",
+        serializedName: "developerPortalUrl",
         type: {
           name: "String"
         }
       },
-      subnetResourceId: {
-        serializedName: "subnetResourceId",
-        constraints: {
-          Pattern: /^\/subscriptions\/[^\/]*\/resourceGroups\/[^\/]*\/providers\/Microsoft.(ClassicNetwork|Network)\/virtualNetworks\/[^\/]*\/subnets\/[^\/]*$/
-        },
-        type: {
-          name: "String"
-        }
-      }
-    }
-  }
-};
-
-export const ApiManagementServiceSkuProperties: msRest.CompositeMapper = {
-  serializedName: "ApiManagementServiceSkuProperties",
-  type: {
-    name: "Composite",
-    className: "ApiManagementServiceSkuProperties",
-    modelProperties: {
-      name: {
-        required: true,
-        serializedName: "name",
-        type: {
-          name: "String"
-        }
-      },
-      capacity: {
-        required: true,
-        serializedName: "capacity",
-        type: {
-          name: "Number"
-        }
-      }
-    }
-  }
-};
-
-export const AdditionalLocation: msRest.CompositeMapper = {
-  serializedName: "AdditionalLocation",
-  type: {
-    name: "Composite",
-    className: "AdditionalLocation",
-    modelProperties: {
-      location: {
-        required: true,
-        serializedName: "location",
-        type: {
-          name: "String"
-        }
-      },
-      sku: {
-        required: true,
-        serializedName: "sku",
-        type: {
-          name: "Composite",
-          className: "ApiManagementServiceSkuProperties"
-        }
-      },
-      zones: {
-        serializedName: "zones",
+      hostnameConfigurations: {
+        serializedName: "hostnameConfigurations",
         type: {
           name: "Sequence",
           element: {
             type: {
-              name: "String"
+              name: "Composite",
+              className: "HostnameConfiguration"
             }
           }
         }
@@ -4895,6 +4872,12 @@ export const AdditionalLocation: msRest.CompositeMapper = {
           name: "String"
         }
       },
+      publicNetworkAccess: {
+        serializedName: "publicNetworkAccess",
+        type: {
+          name: "String"
+        }
+      },
       virtualNetworkConfiguration: {
         serializedName: "virtualNetworkConfiguration",
         type: {
@@ -4902,73 +4885,91 @@ export const AdditionalLocation: msRest.CompositeMapper = {
           className: "VirtualNetworkConfiguration"
         }
       },
-      gatewayRegionalUrl: {
-        readOnly: true,
-        serializedName: "gatewayRegionalUrl",
+      additionalLocations: {
+        serializedName: "additionalLocations",
         type: {
-          name: "String"
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "AdditionalLocation"
+            }
+          }
         }
       },
-      disableGateway: {
-        serializedName: "disableGateway",
-        defaultValue: false,
+      customProperties: {
+        serializedName: "customProperties",
         type: {
-          name: "Boolean"
+          name: "Dictionary",
+          value: {
+            type: {
+              name: "String"
+            }
+          }
         }
       },
-      platformVersion: {
-        readOnly: true,
-        serializedName: "platformVersion",
+      certificates: {
+        serializedName: "certificates",
         type: {
-          name: "String"
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "CertificateConfiguration"
+            }
+          }
         }
-      }
-    }
-  }
-};
-
-export const ApiManagementServiceBackupRestoreParameters: msRest.CompositeMapper = {
-  serializedName: "ApiManagementServiceBackupRestoreParameters",
-  type: {
-    name: "Composite",
-    className: "ApiManagementServiceBackupRestoreParameters",
-    modelProperties: {
-      storageAccount: {
-        required: true,
-        serializedName: "storageAccount",
+      },
+      enableClientCertificate: {
+        serializedName: "enableClientCertificate",
+        defaultValue: false,
         type: {
-          name: "String"
+          name: "Boolean"
         }
       },
-      containerName: {
-        required: true,
-        serializedName: "containerName",
+      disableGateway: {
+        serializedName: "disableGateway",
+        defaultValue: false,
         type: {
-          name: "String"
+          name: "Boolean"
         }
       },
-      backupName: {
-        required: true,
-        serializedName: "backupName",
+      virtualNetworkType: {
+        serializedName: "virtualNetworkType",
+        defaultValue: 'None',
         type: {
           name: "String"
         }
       },
-      accessType: {
-        serializedName: "accessType",
-        defaultValue: 'AccessKey',
+      apiVersionConstraint: {
+        serializedName: "apiVersionConstraint",
         type: {
-          name: "String"
+          name: "Composite",
+          className: "ApiVersionConstraint"
         }
       },
-      accessKey: {
-        serializedName: "accessKey",
+      restore: {
+        serializedName: "restore",
+        defaultValue: false,
         type: {
-          name: "String"
+          name: "Boolean"
         }
       },
-      clientId: {
-        serializedName: "clientId",
+      privateEndpointConnections: {
+        serializedName: "privateEndpointConnections",
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "RemotePrivateEndpointConnectionWrapper"
+            }
+          }
+        }
+      },
+      platformVersion: {
+        readOnly: true,
+        serializedName: "platformVersion",
         type: {
           name: "String"
         }
@@ -4977,31 +4978,20 @@ export const ApiManagementServiceBackupRestoreParameters: msRest.CompositeMapper
   }
 };
 
-export const ApiVersionConstraint: msRest.CompositeMapper = {
-  serializedName: "ApiVersionConstraint",
+export const UserIdentityProperties: msRest.CompositeMapper = {
+  serializedName: "UserIdentityProperties",
   type: {
     name: "Composite",
-    className: "ApiVersionConstraint",
+    className: "UserIdentityProperties",
     modelProperties: {
-      minApiVersion: {
-        serializedName: "minApiVersion",
+      principalId: {
+        serializedName: "principalId",
         type: {
           name: "String"
         }
-      }
-    }
-  }
-};
-
-export const ArmIdWrapper: msRest.CompositeMapper = {
-  serializedName: "ArmIdWrapper",
-  type: {
-    name: "Composite",
-    className: "ArmIdWrapper",
-    modelProperties: {
-      id: {
-        readOnly: true,
-        serializedName: "id",
+      },
+      clientId: {
+        serializedName: "clientId",
         type: {
           name: "String"
         }
@@ -5010,86 +5000,127 @@ export const ArmIdWrapper: msRest.CompositeMapper = {
   }
 };
 
-export const PrivateLinkServiceConnectionState: msRest.CompositeMapper = {
-  serializedName: "PrivateLinkServiceConnectionState",
+export const ApiManagementServiceIdentity: msRest.CompositeMapper = {
+  serializedName: "ApiManagementServiceIdentity",
   type: {
     name: "Composite",
-    className: "PrivateLinkServiceConnectionState",
+    className: "ApiManagementServiceIdentity",
     modelProperties: {
-      status: {
-        serializedName: "status",
+      type: {
+        required: true,
+        serializedName: "type",
         type: {
           name: "String"
         }
       },
-      description: {
-        serializedName: "description",
+      principalId: {
+        readOnly: true,
+        serializedName: "principalId",
         type: {
-          name: "String"
+          name: "Uuid"
         }
       },
-      actionsRequired: {
-        serializedName: "actionsRequired",
+      tenantId: {
+        readOnly: true,
+        serializedName: "tenantId",
         type: {
-          name: "String"
+          name: "Uuid"
+        }
+      },
+      userAssignedIdentities: {
+        serializedName: "userAssignedIdentities",
+        type: {
+          name: "Dictionary",
+          value: {
+            type: {
+              name: "Composite",
+              className: "UserIdentityProperties"
+            }
+          }
         }
       }
     }
   }
 };
 
-export const RemotePrivateEndpointConnectionWrapper: msRest.CompositeMapper = {
-  serializedName: "RemotePrivateEndpointConnectionWrapper",
+export const SystemData: msRest.CompositeMapper = {
+  serializedName: "systemData",
   type: {
     name: "Composite",
-    className: "RemotePrivateEndpointConnectionWrapper",
+    className: "SystemData",
     modelProperties: {
-      id: {
-        serializedName: "id",
+      createdBy: {
+        serializedName: "createdBy",
         type: {
           name: "String"
         }
       },
-      name: {
-        serializedName: "name",
+      createdByType: {
+        serializedName: "createdByType",
         type: {
           name: "String"
         }
       },
-      type: {
-        serializedName: "type",
-        type: {
+      createdAt: {
+        serializedName: "createdAt",
+        type: {
+          name: "DateTime"
+        }
+      },
+      lastModifiedBy: {
+        serializedName: "lastModifiedBy",
+        type: {
           name: "String"
         }
       },
-      privateEndpoint: {
-        serializedName: "properties.privateEndpoint",
+      lastModifiedByType: {
+        serializedName: "lastModifiedByType",
         type: {
-          name: "Composite",
-          className: "ArmIdWrapper"
+          name: "String"
         }
       },
-      privateLinkServiceConnectionState: {
-        required: true,
-        serializedName: "properties.privateLinkServiceConnectionState",
+      lastModifiedAt: {
+        serializedName: "lastModifiedAt",
         type: {
-          name: "Composite",
-          className: "PrivateLinkServiceConnectionState"
+          name: "DateTime"
+        }
+      }
+    }
+  }
+};
+
+export const ApimResource: msRest.CompositeMapper = {
+  serializedName: "ApimResource",
+  type: {
+    name: "Composite",
+    className: "ApimResource",
+    modelProperties: {
+      id: {
+        readOnly: true,
+        serializedName: "id",
+        type: {
+          name: "String"
         }
       },
-      provisioningState: {
+      name: {
         readOnly: true,
-        serializedName: "properties.provisioningState",
+        serializedName: "name",
         type: {
           name: "String"
         }
       },
-      groupIds: {
+      type: {
         readOnly: true,
-        serializedName: "properties.groupIds",
+        serializedName: "type",
         type: {
-          name: "Sequence",
-          element: {
+          name: "String"
+        }
+      },
+      tags: {
+        serializedName: "tags",
+        type: {
+          name: "Dictionary",
+          value: {
             type: {
               name: "String"
             }
@@ -5100,14 +5131,15 @@ export const RemotePrivateEndpointConnectionWrapper: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceBaseProperties: msRest.CompositeMapper = {
-  serializedName: "ApiManagementServiceBaseProperties",
+export const ApiManagementServiceResource: msRest.CompositeMapper = {
+  serializedName: "ApiManagementServiceResource",
   type: {
     name: "Composite",
-    className: "ApiManagementServiceBaseProperties",
+    className: "ApiManagementServiceResource",
     modelProperties: {
+      ...ApimResource.type.modelProperties,
       notificationSenderEmail: {
-        serializedName: "notificationSenderEmail",
+        serializedName: "properties.notificationSenderEmail",
         constraints: {
           MaxLength: 100
         },
@@ -5117,69 +5149,69 @@ export const ApiManagementServiceBaseProperties: msRest.CompositeMapper = {
       },
       provisioningState: {
         readOnly: true,
-        serializedName: "provisioningState",
+        serializedName: "properties.provisioningState",
         type: {
           name: "String"
         }
       },
       targetProvisioningState: {
         readOnly: true,
-        serializedName: "targetProvisioningState",
+        serializedName: "properties.targetProvisioningState",
         type: {
           name: "String"
         }
       },
       createdAtUtc: {
         readOnly: true,
-        serializedName: "createdAtUtc",
+        serializedName: "properties.createdAtUtc",
         type: {
           name: "DateTime"
         }
       },
       gatewayUrl: {
         readOnly: true,
-        serializedName: "gatewayUrl",
+        serializedName: "properties.gatewayUrl",
         type: {
           name: "String"
         }
       },
       gatewayRegionalUrl: {
         readOnly: true,
-        serializedName: "gatewayRegionalUrl",
+        serializedName: "properties.gatewayRegionalUrl",
         type: {
           name: "String"
         }
       },
       portalUrl: {
         readOnly: true,
-        serializedName: "portalUrl",
+        serializedName: "properties.portalUrl",
         type: {
           name: "String"
         }
       },
       managementApiUrl: {
         readOnly: true,
-        serializedName: "managementApiUrl",
+        serializedName: "properties.managementApiUrl",
         type: {
           name: "String"
         }
       },
       scmUrl: {
         readOnly: true,
-        serializedName: "scmUrl",
+        serializedName: "properties.scmUrl",
         type: {
           name: "String"
         }
       },
       developerPortalUrl: {
         readOnly: true,
-        serializedName: "developerPortalUrl",
+        serializedName: "properties.developerPortalUrl",
         type: {
           name: "String"
         }
       },
       hostnameConfigurations: {
-        serializedName: "hostnameConfigurations",
+        serializedName: "properties.hostnameConfigurations",
         type: {
           name: "Sequence",
           element: {
@@ -5192,7 +5224,7 @@ export const ApiManagementServiceBaseProperties: msRest.CompositeMapper = {
       },
       publicIPAddresses: {
         readOnly: true,
-        serializedName: "publicIPAddresses",
+        serializedName: "properties.publicIPAddresses",
         type: {
           name: "Sequence",
           element: {
@@ -5204,7 +5236,7 @@ export const ApiManagementServiceBaseProperties: msRest.CompositeMapper = {
       },
       privateIPAddresses: {
         readOnly: true,
-        serializedName: "privateIPAddresses",
+        serializedName: "properties.privateIPAddresses",
         type: {
           name: "Sequence",
           element: {
@@ -5215,26 +5247,26 @@ export const ApiManagementServiceBaseProperties: msRest.CompositeMapper = {
         }
       },
       publicIpAddressId: {
-        serializedName: "publicIpAddressId",
+        serializedName: "properties.publicIpAddressId",
         type: {
           name: "String"
         }
       },
       publicNetworkAccess: {
-        serializedName: "publicNetworkAccess",
+        serializedName: "properties.publicNetworkAccess",
         type: {
           name: "String"
         }
       },
       virtualNetworkConfiguration: {
-        serializedName: "virtualNetworkConfiguration",
+        serializedName: "properties.virtualNetworkConfiguration",
         type: {
           name: "Composite",
           className: "VirtualNetworkConfiguration"
         }
       },
       additionalLocations: {
-        serializedName: "additionalLocations",
+        serializedName: "properties.additionalLocations",
         type: {
           name: "Sequence",
           element: {
@@ -5246,7 +5278,7 @@ export const ApiManagementServiceBaseProperties: msRest.CompositeMapper = {
         }
       },
       customProperties: {
-        serializedName: "customProperties",
+        serializedName: "properties.customProperties",
         type: {
           name: "Dictionary",
           value: {
@@ -5257,7 +5289,7 @@ export const ApiManagementServiceBaseProperties: msRest.CompositeMapper = {
         }
       },
       certificates: {
-        serializedName: "certificates",
+        serializedName: "properties.certificates",
         type: {
           name: "Sequence",
           element: {
@@ -5269,42 +5301,42 @@ export const ApiManagementServiceBaseProperties: msRest.CompositeMapper = {
         }
       },
       enableClientCertificate: {
-        serializedName: "enableClientCertificate",
+        serializedName: "properties.enableClientCertificate",
         defaultValue: false,
         type: {
           name: "Boolean"
         }
       },
       disableGateway: {
-        serializedName: "disableGateway",
+        serializedName: "properties.disableGateway",
         defaultValue: false,
         type: {
           name: "Boolean"
         }
       },
       virtualNetworkType: {
-        serializedName: "virtualNetworkType",
+        serializedName: "properties.virtualNetworkType",
         defaultValue: 'None',
         type: {
           name: "String"
         }
       },
       apiVersionConstraint: {
-        serializedName: "apiVersionConstraint",
+        serializedName: "properties.apiVersionConstraint",
         type: {
           name: "Composite",
           className: "ApiVersionConstraint"
         }
       },
       restore: {
-        serializedName: "restore",
+        serializedName: "properties.restore",
         defaultValue: false,
         type: {
           name: "Boolean"
         }
       },
       privateEndpointConnections: {
-        serializedName: "privateEndpointConnections",
+        serializedName: "properties.privateEndpointConnections",
         type: {
           name: "Sequence",
           element: {
@@ -5317,72 +5349,75 @@ export const ApiManagementServiceBaseProperties: msRest.CompositeMapper = {
       },
       platformVersion: {
         readOnly: true,
-        serializedName: "platformVersion",
+        serializedName: "properties.platformVersion",
         type: {
           name: "String"
         }
-      }
-    }
-  }
-};
-
-export const UserIdentityProperties: msRest.CompositeMapper = {
-  serializedName: "UserIdentityProperties",
-  type: {
-    name: "Composite",
-    className: "UserIdentityProperties",
-    modelProperties: {
-      principalId: {
-        serializedName: "principalId",
+      },
+      publisherEmail: {
+        required: true,
+        serializedName: "properties.publisherEmail",
+        constraints: {
+          MaxLength: 100
+        },
         type: {
           name: "String"
         }
       },
-      clientId: {
-        serializedName: "clientId",
+      publisherName: {
+        required: true,
+        serializedName: "properties.publisherName",
+        constraints: {
+          MaxLength: 100
+        },
         type: {
           name: "String"
         }
-      }
-    }
-  }
-};
-
-export const ApiManagementServiceIdentity: msRest.CompositeMapper = {
-  serializedName: "ApiManagementServiceIdentity",
-  type: {
-    name: "Composite",
-    className: "ApiManagementServiceIdentity",
-    modelProperties: {
-      type: {
+      },
+      sku: {
         required: true,
-        serializedName: "type",
+        serializedName: "sku",
         type: {
-          name: "String"
+          name: "Composite",
+          className: "ApiManagementServiceSkuProperties"
         }
       },
-      principalId: {
+      identity: {
+        serializedName: "identity",
+        type: {
+          name: "Composite",
+          className: "ApiManagementServiceIdentity"
+        }
+      },
+      systemData: {
         readOnly: true,
-        serializedName: "principalId",
+        serializedName: "systemData",
         type: {
-          name: "Uuid"
+          name: "Composite",
+          className: "SystemData"
         }
       },
-      tenantId: {
+      location: {
+        required: true,
+        serializedName: "location",
+        type: {
+          name: "String"
+        }
+      },
+      etag: {
         readOnly: true,
-        serializedName: "tenantId",
+        serializedName: "etag",
         type: {
-          name: "Uuid"
+          name: "String"
         }
       },
-      userAssignedIdentities: {
-        serializedName: "userAssignedIdentities",
+      zones: {
+        serializedName: "zones",
         type: {
-          name: "Dictionary",
-          value: {
+          name: "Sequence",
+          element: {
             type: {
-              name: "Composite",
-              className: "UserIdentityProperties"
+              name: "String"
             }
           }
         }
@@ -5391,150 +5426,62 @@ export const ApiManagementServiceIdentity: msRest.CompositeMapper = {
   }
 };
 
-export const SystemData: msRest.CompositeMapper = {
-  serializedName: "systemData",
+export const ApiManagementServiceUpdateParameters: msRest.CompositeMapper = {
+  serializedName: "ApiManagementServiceUpdateParameters",
   type: {
     name: "Composite",
-    className: "SystemData",
+    className: "ApiManagementServiceUpdateParameters",
     modelProperties: {
-      createdBy: {
-        serializedName: "createdBy",
+      ...ApimResource.type.modelProperties,
+      notificationSenderEmail: {
+        serializedName: "properties.notificationSenderEmail",
+        constraints: {
+          MaxLength: 100
+        },
         type: {
           name: "String"
         }
       },
-      createdByType: {
-        serializedName: "createdByType",
+      provisioningState: {
+        readOnly: true,
+        serializedName: "properties.provisioningState",
         type: {
           name: "String"
         }
       },
-      createdAt: {
-        serializedName: "createdAt",
+      targetProvisioningState: {
+        readOnly: true,
+        serializedName: "properties.targetProvisioningState",
+        type: {
+          name: "String"
+        }
+      },
+      createdAtUtc: {
+        readOnly: true,
+        serializedName: "properties.createdAtUtc",
         type: {
           name: "DateTime"
         }
       },
-      lastModifiedBy: {
-        serializedName: "lastModifiedBy",
+      gatewayUrl: {
+        readOnly: true,
+        serializedName: "properties.gatewayUrl",
         type: {
           name: "String"
         }
       },
-      lastModifiedByType: {
-        serializedName: "lastModifiedByType",
+      gatewayRegionalUrl: {
+        readOnly: true,
+        serializedName: "properties.gatewayRegionalUrl",
         type: {
           name: "String"
         }
       },
-      lastModifiedAt: {
-        serializedName: "lastModifiedAt",
+      portalUrl: {
+        readOnly: true,
+        serializedName: "properties.portalUrl",
         type: {
-          name: "DateTime"
-        }
-      }
-    }
-  }
-};
-
-export const ApimResource: msRest.CompositeMapper = {
-  serializedName: "ApimResource",
-  type: {
-    name: "Composite",
-    className: "ApimResource",
-    modelProperties: {
-      id: {
-        readOnly: true,
-        serializedName: "id",
-        type: {
-          name: "String"
-        }
-      },
-      name: {
-        readOnly: true,
-        serializedName: "name",
-        type: {
-          name: "String"
-        }
-      },
-      type: {
-        readOnly: true,
-        serializedName: "type",
-        type: {
-          name: "String"
-        }
-      },
-      tags: {
-        serializedName: "tags",
-        type: {
-          name: "Dictionary",
-          value: {
-            type: {
-              name: "String"
-            }
-          }
-        }
-      }
-    }
-  }
-};
-
-export const ApiManagementServiceResource: msRest.CompositeMapper = {
-  serializedName: "ApiManagementServiceResource",
-  type: {
-    name: "Composite",
-    className: "ApiManagementServiceResource",
-    modelProperties: {
-      ...ApimResource.type.modelProperties,
-      notificationSenderEmail: {
-        serializedName: "properties.notificationSenderEmail",
-        constraints: {
-          MaxLength: 100
-        },
-        type: {
-          name: "String"
-        }
-      },
-      provisioningState: {
-        readOnly: true,
-        serializedName: "properties.provisioningState",
-        type: {
-          name: "String"
-        }
-      },
-      targetProvisioningState: {
-        readOnly: true,
-        serializedName: "properties.targetProvisioningState",
-        type: {
-          name: "String"
-        }
-      },
-      createdAtUtc: {
-        readOnly: true,
-        serializedName: "properties.createdAtUtc",
-        type: {
-          name: "DateTime"
-        }
-      },
-      gatewayUrl: {
-        readOnly: true,
-        serializedName: "properties.gatewayUrl",
-        type: {
-          name: "String"
-        }
-      },
-      gatewayRegionalUrl: {
-        readOnly: true,
-        serializedName: "properties.gatewayRegionalUrl",
-        type: {
-          name: "String"
-        }
-      },
-      portalUrl: {
-        readOnly: true,
-        serializedName: "properties.portalUrl",
-        type: {
-          name: "String"
+          name: "String"
         }
       },
       managementApiUrl: {
@@ -5703,7 +5650,6 @@ export const ApiManagementServiceResource: msRest.CompositeMapper = {
         }
       },
       publisherEmail: {
-        required: true,
         serializedName: "properties.publisherEmail",
         constraints: {
           MaxLength: 100
@@ -5713,7 +5659,6 @@ export const ApiManagementServiceResource: msRest.CompositeMapper = {
         }
       },
       publisherName: {
-        required: true,
         serializedName: "properties.publisherName",
         constraints: {
           MaxLength: 100
@@ -5723,7 +5668,6 @@ export const ApiManagementServiceResource: msRest.CompositeMapper = {
         }
       },
       sku: {
-        required: true,
         serializedName: "sku",
         type: {
           name: "Composite",
@@ -5737,21 +5681,6 @@ export const ApiManagementServiceResource: msRest.CompositeMapper = {
           className: "ApiManagementServiceIdentity"
         }
       },
-      systemData: {
-        readOnly: true,
-        serializedName: "systemData",
-        type: {
-          name: "Composite",
-          className: "SystemData"
-        }
-      },
-      location: {
-        required: true,
-        serializedName: "location",
-        type: {
-          name: "String"
-        }
-      },
       etag: {
         readOnly: true,
         serializedName: "etag",
@@ -5774,275 +5703,326 @@ export const ApiManagementServiceResource: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceUpdateParameters: msRest.CompositeMapper = {
-  serializedName: "ApiManagementServiceUpdateParameters",
+export const ApiManagementServiceGetSsoTokenResult: msRest.CompositeMapper = {
+  serializedName: "ApiManagementServiceGetSsoTokenResult",
   type: {
     name: "Composite",
-    className: "ApiManagementServiceUpdateParameters",
+    className: "ApiManagementServiceGetSsoTokenResult",
     modelProperties: {
-      ...ApimResource.type.modelProperties,
-      notificationSenderEmail: {
-        serializedName: "properties.notificationSenderEmail",
-        constraints: {
-          MaxLength: 100
-        },
+      redirectUri: {
+        serializedName: "redirectUri",
         type: {
           name: "String"
         }
-      },
-      provisioningState: {
-        readOnly: true,
-        serializedName: "properties.provisioningState",
+      }
+    }
+  }
+};
+
+export const ApiManagementServiceCheckNameAvailabilityParameters: msRest.CompositeMapper = {
+  serializedName: "ApiManagementServiceCheckNameAvailabilityParameters",
+  type: {
+    name: "Composite",
+    className: "ApiManagementServiceCheckNameAvailabilityParameters",
+    modelProperties: {
+      name: {
+        required: true,
+        serializedName: "name",
         type: {
           name: "String"
         }
-      },
-      targetProvisioningState: {
+      }
+    }
+  }
+};
+
+export const ApiManagementServiceNameAvailabilityResult: msRest.CompositeMapper = {
+  serializedName: "ApiManagementServiceNameAvailabilityResult",
+  type: {
+    name: "Composite",
+    className: "ApiManagementServiceNameAvailabilityResult",
+    modelProperties: {
+      nameAvailable: {
         readOnly: true,
-        serializedName: "properties.targetProvisioningState",
+        serializedName: "nameAvailable",
         type: {
-          name: "String"
+          name: "Boolean"
         }
       },
-      createdAtUtc: {
+      message: {
         readOnly: true,
-        serializedName: "properties.createdAtUtc",
+        serializedName: "message",
         type: {
-          name: "DateTime"
+          name: "String"
         }
       },
-      gatewayUrl: {
-        readOnly: true,
-        serializedName: "properties.gatewayUrl",
+      reason: {
+        serializedName: "reason",
         type: {
-          name: "String"
+          name: "Enum",
+          allowedValues: [
+            "Valid",
+            "Invalid",
+            "AlreadyExists"
+          ]
         }
-      },
-      gatewayRegionalUrl: {
+      }
+    }
+  }
+};
+
+export const ApiManagementServiceGetDomainOwnershipIdentifierResult: msRest.CompositeMapper = {
+  serializedName: "ApiManagementServiceGetDomainOwnershipIdentifierResult",
+  type: {
+    name: "Composite",
+    className: "ApiManagementServiceGetDomainOwnershipIdentifierResult",
+    modelProperties: {
+      domainOwnershipIdentifier: {
         readOnly: true,
-        serializedName: "properties.gatewayRegionalUrl",
+        serializedName: "domainOwnershipIdentifier",
         type: {
           name: "String"
         }
-      },
-      portalUrl: {
-        readOnly: true,
-        serializedName: "properties.portalUrl",
+      }
+    }
+  }
+};
+
+export const ApiManagementServiceApplyNetworkConfigurationParameters: msRest.CompositeMapper = {
+  serializedName: "ApiManagementServiceApplyNetworkConfigurationParameters",
+  type: {
+    name: "Composite",
+    className: "ApiManagementServiceApplyNetworkConfigurationParameters",
+    modelProperties: {
+      location: {
+        serializedName: "location",
         type: {
           name: "String"
         }
-      },
-      managementApiUrl: {
-        readOnly: true,
-        serializedName: "properties.managementApiUrl",
+      }
+    }
+  }
+};
+
+export const OperationDisplay: msRest.CompositeMapper = {
+  serializedName: "Operation_display",
+  type: {
+    name: "Composite",
+    className: "OperationDisplay",
+    modelProperties: {
+      provider: {
+        serializedName: "provider",
         type: {
           name: "String"
         }
       },
-      scmUrl: {
-        readOnly: true,
-        serializedName: "properties.scmUrl",
+      operation: {
+        serializedName: "operation",
         type: {
           name: "String"
         }
       },
-      developerPortalUrl: {
-        readOnly: true,
-        serializedName: "properties.developerPortalUrl",
+      resource: {
+        serializedName: "resource",
         type: {
           name: "String"
         }
       },
-      hostnameConfigurations: {
-        serializedName: "properties.hostnameConfigurations",
+      description: {
+        serializedName: "description",
         type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "HostnameConfiguration"
-            }
-          }
-        }
-      },
-      publicIPAddresses: {
-        readOnly: true,
-        serializedName: "properties.publicIPAddresses",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "String"
-            }
-          }
+          name: "String"
         }
-      },
-      privateIPAddresses: {
-        readOnly: true,
-        serializedName: "properties.privateIPAddresses",
+      }
+    }
+  }
+};
+
+export const Operation: msRest.CompositeMapper = {
+  serializedName: "Operation",
+  type: {
+    name: "Composite",
+    className: "Operation",
+    modelProperties: {
+      name: {
+        serializedName: "name",
         type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "String"
-            }
-          }
+          name: "String"
         }
       },
-      publicIpAddressId: {
-        serializedName: "properties.publicIpAddressId",
+      display: {
+        serializedName: "display",
         type: {
-          name: "String"
+          name: "Composite",
+          className: "OperationDisplay"
         }
       },
-      publicNetworkAccess: {
-        serializedName: "properties.publicNetworkAccess",
+      origin: {
+        serializedName: "origin",
         type: {
           name: "String"
         }
       },
-      virtualNetworkConfiguration: {
-        serializedName: "properties.virtualNetworkConfiguration",
+      properties: {
+        serializedName: "properties",
         type: {
-          name: "Composite",
-          className: "VirtualNetworkConfiguration"
+          name: "Object"
         }
-      },
-      additionalLocations: {
-        serializedName: "properties.additionalLocations",
+      }
+    }
+  }
+};
+
+export const EmailTemplateParametersContractProperties: msRest.CompositeMapper = {
+  serializedName: "EmailTemplateParametersContractProperties",
+  type: {
+    name: "Composite",
+    className: "EmailTemplateParametersContractProperties",
+    modelProperties: {
+      name: {
+        serializedName: "name",
+        constraints: {
+          MaxLength: 256,
+          MinLength: 1,
+          Pattern: /^[A-Za-z0-9-._]+$/
+        },
         type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "AdditionalLocation"
-            }
-          }
+          name: "String"
         }
       },
-      customProperties: {
-        serializedName: "properties.customProperties",
+      title: {
+        serializedName: "title",
+        constraints: {
+          MaxLength: 4096,
+          MinLength: 1
+        },
         type: {
-          name: "Dictionary",
-          value: {
-            type: {
-              name: "String"
-            }
-          }
+          name: "String"
         }
       },
-      certificates: {
-        serializedName: "properties.certificates",
+      description: {
+        serializedName: "description",
+        constraints: {
+          MaxLength: 256,
+          MinLength: 1,
+          Pattern: /^[A-Za-z0-9-._]+$/
+        },
         type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "CertificateConfiguration"
-            }
-          }
+          name: "String"
         }
-      },
-      enableClientCertificate: {
-        serializedName: "properties.enableClientCertificate",
-        defaultValue: false,
+      }
+    }
+  }
+};
+
+export const EmailTemplateContract: msRest.CompositeMapper = {
+  serializedName: "EmailTemplateContract",
+  type: {
+    name: "Composite",
+    className: "EmailTemplateContract",
+    modelProperties: {
+      ...Resource.type.modelProperties,
+      subject: {
+        required: true,
+        serializedName: "properties.subject",
+        constraints: {
+          MaxLength: 1000,
+          MinLength: 1
+        },
         type: {
-          name: "Boolean"
+          name: "String"
         }
       },
-      disableGateway: {
-        serializedName: "properties.disableGateway",
-        defaultValue: false,
+      body: {
+        required: true,
+        serializedName: "properties.body",
+        constraints: {
+          MinLength: 1
+        },
         type: {
-          name: "Boolean"
+          name: "String"
         }
       },
-      virtualNetworkType: {
-        serializedName: "properties.virtualNetworkType",
-        defaultValue: 'None',
+      title: {
+        serializedName: "properties.title",
         type: {
           name: "String"
         }
       },
-      apiVersionConstraint: {
-        serializedName: "properties.apiVersionConstraint",
+      description: {
+        serializedName: "properties.description",
         type: {
-          name: "Composite",
-          className: "ApiVersionConstraint"
+          name: "String"
         }
       },
-      restore: {
-        serializedName: "properties.restore",
-        defaultValue: false,
+      isDefault: {
+        readOnly: true,
+        serializedName: "properties.isDefault",
         type: {
           name: "Boolean"
         }
       },
-      privateEndpointConnections: {
-        serializedName: "properties.privateEndpointConnections",
+      parameters: {
+        serializedName: "properties.parameters",
         type: {
           name: "Sequence",
           element: {
             type: {
               name: "Composite",
-              className: "RemotePrivateEndpointConnectionWrapper"
+              className: "EmailTemplateParametersContractProperties"
             }
           }
         }
-      },
-      platformVersion: {
-        readOnly: true,
-        serializedName: "properties.platformVersion",
-        type: {
-          name: "String"
-        }
-      },
-      publisherEmail: {
-        serializedName: "properties.publisherEmail",
+      }
+    }
+  }
+};
+
+export const EmailTemplateUpdateParameters: msRest.CompositeMapper = {
+  serializedName: "EmailTemplateUpdateParameters",
+  type: {
+    name: "Composite",
+    className: "EmailTemplateUpdateParameters",
+    modelProperties: {
+      subject: {
+        serializedName: "properties.subject",
         constraints: {
-          MaxLength: 100
+          MaxLength: 1000,
+          MinLength: 1
         },
         type: {
           name: "String"
         }
       },
-      publisherName: {
-        serializedName: "properties.publisherName",
-        constraints: {
-          MaxLength: 100
-        },
+      title: {
+        serializedName: "properties.title",
         type: {
           name: "String"
         }
       },
-      sku: {
-        serializedName: "sku",
-        type: {
-          name: "Composite",
-          className: "ApiManagementServiceSkuProperties"
-        }
-      },
-      identity: {
-        serializedName: "identity",
+      description: {
+        serializedName: "properties.description",
         type: {
-          name: "Composite",
-          className: "ApiManagementServiceIdentity"
+          name: "String"
         }
       },
-      etag: {
-        readOnly: true,
-        serializedName: "etag",
+      body: {
+        serializedName: "properties.body",
+        constraints: {
+          MinLength: 1
+        },
         type: {
           name: "String"
         }
       },
-      zones: {
-        serializedName: "zones",
+      parameters: {
+        serializedName: "properties.parameters",
         type: {
           name: "Sequence",
           element: {
             type: {
-              name: "String"
+              name: "Composite",
+              className: "EmailTemplateParametersContractProperties"
             }
           }
         }
@@ -6051,83 +6031,98 @@ export const ApiManagementServiceUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const ApiManagementServiceGetSsoTokenResult: msRest.CompositeMapper = {
-  serializedName: "ApiManagementServiceGetSsoTokenResult",
+export const GatewayCertificateAuthorityContract: msRest.CompositeMapper = {
+  serializedName: "GatewayCertificateAuthorityContract",
   type: {
     name: "Composite",
-    className: "ApiManagementServiceGetSsoTokenResult",
+    className: "GatewayCertificateAuthorityContract",
     modelProperties: {
-      redirectUri: {
-        serializedName: "redirectUri",
+      ...Resource.type.modelProperties,
+      isTrusted: {
+        serializedName: "properties.isTrusted",
         type: {
-          name: "String"
+          name: "Boolean"
         }
       }
     }
   }
 };
 
-export const ApiManagementServiceCheckNameAvailabilityParameters: msRest.CompositeMapper = {
-  serializedName: "ApiManagementServiceCheckNameAvailabilityParameters",
+export const AssociationContract: msRest.CompositeMapper = {
+  serializedName: "AssociationContract",
   type: {
     name: "Composite",
-    className: "ApiManagementServiceCheckNameAvailabilityParameters",
+    className: "AssociationContract",
     modelProperties: {
-      name: {
-        required: true,
-        serializedName: "name",
+      ...Resource.type.modelProperties,
+      provisioningState: {
+        serializedName: "properties.provisioningState",
         type: {
-          name: "String"
+          name: "Enum",
+          allowedValues: [
+            "created"
+          ]
         }
       }
     }
   }
 };
 
-export const ApiManagementServiceNameAvailabilityResult: msRest.CompositeMapper = {
-  serializedName: "ApiManagementServiceNameAvailabilityResult",
+export const GatewayHostnameConfigurationContract: msRest.CompositeMapper = {
+  serializedName: "GatewayHostnameConfigurationContract",
   type: {
     name: "Composite",
-    className: "ApiManagementServiceNameAvailabilityResult",
+    className: "GatewayHostnameConfigurationContract",
     modelProperties: {
-      nameAvailable: {
-        readOnly: true,
-        serializedName: "nameAvailable",
+      ...Resource.type.modelProperties,
+      hostname: {
+        serializedName: "properties.hostname",
         type: {
-          name: "Boolean"
+          name: "String"
         }
       },
-      message: {
-        readOnly: true,
-        serializedName: "message",
+      certificateId: {
+        serializedName: "properties.certificateId",
         type: {
           name: "String"
         }
       },
-      reason: {
-        serializedName: "reason",
+      negotiateClientCertificate: {
+        serializedName: "properties.negotiateClientCertificate",
         type: {
-          name: "Enum",
-          allowedValues: [
-            "Valid",
-            "Invalid",
-            "AlreadyExists"
-          ]
+          name: "Boolean"
+        }
+      },
+      tls10Enabled: {
+        serializedName: "properties.tls10Enabled",
+        type: {
+          name: "Boolean"
+        }
+      },
+      tls11Enabled: {
+        serializedName: "properties.tls11Enabled",
+        type: {
+          name: "Boolean"
+        }
+      },
+      http2Enabled: {
+        serializedName: "properties.http2Enabled",
+        type: {
+          name: "Boolean"
         }
       }
     }
   }
 };
 
-export const ApiManagementServiceGetDomainOwnershipIdentifierResult: msRest.CompositeMapper = {
-  serializedName: "ApiManagementServiceGetDomainOwnershipIdentifierResult",
+export const GatewayTokenContract: msRest.CompositeMapper = {
+  serializedName: "GatewayTokenContract",
   type: {
     name: "Composite",
-    className: "ApiManagementServiceGetDomainOwnershipIdentifierResult",
+    className: "GatewayTokenContract",
     modelProperties: {
-      domainOwnershipIdentifier: {
-        readOnly: true,
-        serializedName: "domainOwnershipIdentifier",
+      value: {
+        serializedName: "value",
         type: {
           name: "String"
         }
@@ -6136,48 +6131,70 @@ export const ApiManagementServiceGetDomainOwnershipIdentifierResult: msRest.Comp
   }
 };
 
-export const ApiManagementServiceApplyNetworkConfigurationParameters: msRest.CompositeMapper = {
-  serializedName: "ApiManagementServiceApplyNetworkConfigurationParameters",
+export const GatewayTokenRequestContract: msRest.CompositeMapper = {
+  serializedName: "GatewayTokenRequestContract",
   type: {
     name: "Composite",
-    className: "ApiManagementServiceApplyNetworkConfigurationParameters",
+    className: "GatewayTokenRequestContract",
     modelProperties: {
-      location: {
-        serializedName: "location",
+      keyType: {
+        required: true,
+        serializedName: "keyType",
+        defaultValue: 'primary',
         type: {
-          name: "String"
+          name: "Enum",
+          allowedValues: [
+            "primary",
+            "secondary"
+          ]
+        }
+      },
+      expiry: {
+        required: true,
+        serializedName: "expiry",
+        type: {
+          name: "DateTime"
         }
       }
     }
   }
 };
 
-export const OperationDisplay: msRest.CompositeMapper = {
-  serializedName: "Operation_display",
+export const GatewayKeyRegenerationRequestContract: msRest.CompositeMapper = {
+  serializedName: "GatewayKeyRegenerationRequestContract",
   type: {
     name: "Composite",
-    className: "OperationDisplay",
+    className: "GatewayKeyRegenerationRequestContract",
     modelProperties: {
-      provider: {
-        serializedName: "provider",
-        type: {
-          name: "String"
-        }
-      },
-      operation: {
-        serializedName: "operation",
+      keyType: {
+        required: true,
+        serializedName: "keyType",
         type: {
-          name: "String"
+          name: "Enum",
+          allowedValues: [
+            "primary",
+            "secondary"
+          ]
         }
-      },
-      resource: {
-        serializedName: "resource",
+      }
+    }
+  }
+};
+
+export const GatewayKeysContract: msRest.CompositeMapper = {
+  serializedName: "GatewayKeysContract",
+  type: {
+    name: "Composite",
+    className: "GatewayKeysContract",
+    modelProperties: {
+      primary: {
+        serializedName: "primary",
         type: {
           name: "String"
         }
       },
-      description: {
-        serializedName: "description",
+      secondary: {
+        serializedName: "secondary",
         type: {
           name: "String"
         }
@@ -6186,74 +6203,71 @@ export const OperationDisplay: msRest.CompositeMapper = {
   }
 };
 
-export const Operation: msRest.CompositeMapper = {
-  serializedName: "Operation",
+export const ResourceLocationDataContract: msRest.CompositeMapper = {
+  serializedName: "ResourceLocationDataContract",
   type: {
     name: "Composite",
-    className: "Operation",
+    className: "ResourceLocationDataContract",
     modelProperties: {
       name: {
+        required: true,
         serializedName: "name",
+        constraints: {
+          MaxLength: 256
+        },
         type: {
           name: "String"
         }
       },
-      display: {
-        serializedName: "display",
+      city: {
+        serializedName: "city",
+        constraints: {
+          MaxLength: 256
+        },
         type: {
-          name: "Composite",
-          className: "OperationDisplay"
+          name: "String"
         }
       },
-      origin: {
-        serializedName: "origin",
+      district: {
+        serializedName: "district",
+        constraints: {
+          MaxLength: 256
+        },
         type: {
           name: "String"
         }
       },
-      properties: {
-        serializedName: "properties",
+      countryOrRegion: {
+        serializedName: "countryOrRegion",
+        constraints: {
+          MaxLength: 256
+        },
         type: {
-          name: "Object"
+          name: "String"
         }
       }
     }
   }
 };
 
-export const EmailTemplateParametersContractProperties: msRest.CompositeMapper = {
-  serializedName: "EmailTemplateParametersContractProperties",
+export const GatewayContract: msRest.CompositeMapper = {
+  serializedName: "GatewayContract",
   type: {
     name: "Composite",
-    className: "EmailTemplateParametersContractProperties",
+    className: "GatewayContract",
     modelProperties: {
-      name: {
-        serializedName: "name",
-        constraints: {
-          MaxLength: 256,
-          MinLength: 1,
-          Pattern: /^[A-Za-z0-9-._]+$/
-        },
-        type: {
-          name: "String"
-        }
-      },
-      title: {
-        serializedName: "title",
-        constraints: {
-          MaxLength: 4096,
-          MinLength: 1
-        },
+      ...Resource.type.modelProperties,
+      locationData: {
+        serializedName: "properties.locationData",
         type: {
-          name: "String"
+          name: "Composite",
+          className: "ResourceLocationDataContract"
         }
       },
       description: {
-        serializedName: "description",
+        serializedName: "properties.description",
         constraints: {
-          MaxLength: 256,
-          MinLength: 1,
-          Pattern: /^[A-Za-z0-9-._]+$/
+          MaxLength: 1000
         },
         type: {
           name: "String"
@@ -6263,61 +6277,55 @@ export const EmailTemplateParametersContractProperties: msRest.CompositeMapper =
   }
 };
 
-export const EmailTemplateContract: msRest.CompositeMapper = {
-  serializedName: "EmailTemplateContract",
+export const UserIdentityContract: msRest.CompositeMapper = {
+  serializedName: "UserIdentityContract",
   type: {
     name: "Composite",
-    className: "EmailTemplateContract",
+    className: "UserIdentityContract",
     modelProperties: {
-      ...Resource.type.modelProperties,
-      subject: {
-        required: true,
-        serializedName: "properties.subject",
-        constraints: {
-          MaxLength: 1000,
-          MinLength: 1
-        },
+      provider: {
+        serializedName: "provider",
         type: {
           name: "String"
         }
       },
-      body: {
-        required: true,
-        serializedName: "properties.body",
-        constraints: {
-          MinLength: 1
-        },
+      id: {
+        serializedName: "id",
         type: {
           name: "String"
         }
-      },
-      title: {
-        serializedName: "properties.title",
+      }
+    }
+  }
+};
+
+export const UserEntityBaseParameters: msRest.CompositeMapper = {
+  serializedName: "UserEntityBaseParameters",
+  type: {
+    name: "Composite",
+    className: "UserEntityBaseParameters",
+    modelProperties: {
+      state: {
+        serializedName: "state",
+        defaultValue: 'active',
         type: {
           name: "String"
         }
       },
-      description: {
-        serializedName: "properties.description",
+      note: {
+        serializedName: "note",
         type: {
           name: "String"
         }
       },
-      isDefault: {
-        readOnly: true,
-        serializedName: "properties.isDefault",
-        type: {
-          name: "Boolean"
-        }
-      },
-      parameters: {
-        serializedName: "properties.parameters",
+      identities: {
+        serializedName: "identities",
         type: {
           name: "Sequence",
           element: {
             type: {
               name: "Composite",
-              className: "EmailTemplateParametersContractProperties"
+              className: "UserIdentityContract"
             }
           }
         }
@@ -6326,151 +6334,180 @@ export const EmailTemplateContract: msRest.CompositeMapper = {
   }
 };
 
-export const EmailTemplateUpdateParameters: msRest.CompositeMapper = {
-  serializedName: "EmailTemplateUpdateParameters",
+export const GroupContractProperties: msRest.CompositeMapper = {
+  serializedName: "GroupContractProperties",
   type: {
     name: "Composite",
-    className: "EmailTemplateUpdateParameters",
+    className: "GroupContractProperties",
     modelProperties: {
-      subject: {
-        serializedName: "properties.subject",
+      displayName: {
+        required: true,
+        serializedName: "displayName",
         constraints: {
-          MaxLength: 1000,
+          MaxLength: 300,
           MinLength: 1
         },
         type: {
           name: "String"
         }
       },
-      title: {
-        serializedName: "properties.title",
-        type: {
-          name: "String"
-        }
-      },
       description: {
-        serializedName: "properties.description",
-        type: {
-          name: "String"
-        }
-      },
-      body: {
-        serializedName: "properties.body",
+        serializedName: "description",
         constraints: {
-          MinLength: 1
+          MaxLength: 1000
         },
         type: {
           name: "String"
         }
       },
-      parameters: {
-        serializedName: "properties.parameters",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "EmailTemplateParametersContractProperties"
-            }
-          }
-        }
-      }
-    }
-  }
-};
-
-export const GatewayCertificateAuthorityContract: msRest.CompositeMapper = {
-  serializedName: "GatewayCertificateAuthorityContract",
-  type: {
-    name: "Composite",
-    className: "GatewayCertificateAuthorityContract",
-    modelProperties: {
-      ...Resource.type.modelProperties,
-      isTrusted: {
-        serializedName: "properties.isTrusted",
+      builtIn: {
+        readOnly: true,
+        serializedName: "builtIn",
         type: {
           name: "Boolean"
         }
-      }
-    }
-  }
-};
-
-export const AssociationContract: msRest.CompositeMapper = {
-  serializedName: "AssociationContract",
-  type: {
-    name: "Composite",
-    className: "AssociationContract",
-    modelProperties: {
-      ...Resource.type.modelProperties,
-      provisioningState: {
-        serializedName: "properties.provisioningState",
+      },
+      type: {
+        serializedName: "type",
         type: {
           name: "Enum",
           allowedValues: [
-            "created"
+            "custom",
+            "system",
+            "external"
           ]
         }
+      },
+      externalId: {
+        serializedName: "externalId",
+        type: {
+          name: "String"
+        }
       }
     }
   }
 };
 
-export const GatewayHostnameConfigurationContract: msRest.CompositeMapper = {
-  serializedName: "GatewayHostnameConfigurationContract",
+export const UserContract: msRest.CompositeMapper = {
+  serializedName: "UserContract",
   type: {
     name: "Composite",
-    className: "GatewayHostnameConfigurationContract",
+    className: "UserContract",
     modelProperties: {
       ...Resource.type.modelProperties,
-      hostname: {
-        serializedName: "properties.hostname",
+      state: {
+        serializedName: "properties.state",
+        defaultValue: 'active',
         type: {
           name: "String"
         }
       },
-      certificateId: {
-        serializedName: "properties.certificateId",
+      note: {
+        serializedName: "properties.note",
         type: {
           name: "String"
         }
       },
-      negotiateClientCertificate: {
-        serializedName: "properties.negotiateClientCertificate",
+      identities: {
+        serializedName: "properties.identities",
         type: {
-          name: "Boolean"
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "UserIdentityContract"
+            }
+          }
         }
       },
-      tls10Enabled: {
-        serializedName: "properties.tls10Enabled",
+      firstName: {
+        serializedName: "properties.firstName",
         type: {
-          name: "Boolean"
+          name: "String"
         }
       },
-      tls11Enabled: {
-        serializedName: "properties.tls11Enabled",
+      lastName: {
+        serializedName: "properties.lastName",
         type: {
-          name: "Boolean"
+          name: "String"
         }
       },
-      http2Enabled: {
-        serializedName: "properties.http2Enabled",
+      email: {
+        serializedName: "properties.email",
         type: {
-          name: "Boolean"
+          name: "String"
+        }
+      },
+      registrationDate: {
+        serializedName: "properties.registrationDate",
+        type: {
+          name: "DateTime"
+        }
+      },
+      groups: {
+        readOnly: true,
+        serializedName: "properties.groups",
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "GroupContractProperties"
+            }
+          }
         }
       }
     }
   }
 };
 
-export const GatewayTokenContract: msRest.CompositeMapper = {
-  serializedName: "GatewayTokenContract",
+export const GroupContract: msRest.CompositeMapper = {
+  serializedName: "GroupContract",
   type: {
     name: "Composite",
-    className: "GatewayTokenContract",
+    className: "GroupContract",
     modelProperties: {
-      value: {
-        serializedName: "value",
+      ...Resource.type.modelProperties,
+      displayName: {
+        required: true,
+        serializedName: "properties.displayName",
+        constraints: {
+          MaxLength: 300,
+          MinLength: 1
+        },
+        type: {
+          name: "String"
+        }
+      },
+      description: {
+        serializedName: "properties.description",
+        constraints: {
+          MaxLength: 1000
+        },
+        type: {
+          name: "String"
+        }
+      },
+      builtIn: {
+        readOnly: true,
+        serializedName: "properties.builtIn",
+        type: {
+          name: "Boolean"
+        }
+      },
+      groupContractType: {
+        serializedName: "properties.type",
+        type: {
+          name: "Enum",
+          allowedValues: [
+            "custom",
+            "system",
+            "external"
+          ]
+        }
+      },
+      externalId: {
+        serializedName: "properties.externalId",
         type: {
           name: "String"
         }
@@ -6479,70 +6516,101 @@ export const GatewayTokenContract: msRest.CompositeMapper = {
   }
 };
 
-export const GatewayTokenRequestContract: msRest.CompositeMapper = {
-  serializedName: "GatewayTokenRequestContract",
+export const GroupUpdateParameters: msRest.CompositeMapper = {
+  serializedName: "GroupUpdateParameters",
   type: {
     name: "Composite",
-    className: "GatewayTokenRequestContract",
+    className: "GroupUpdateParameters",
     modelProperties: {
-      keyType: {
-        required: true,
-        serializedName: "keyType",
-        defaultValue: 'primary',
+      displayName: {
+        serializedName: "properties.displayName",
+        constraints: {
+          MaxLength: 300,
+          MinLength: 1
+        },
+        type: {
+          name: "String"
+        }
+      },
+      description: {
+        serializedName: "properties.description",
+        type: {
+          name: "String"
+        }
+      },
+      type: {
+        serializedName: "properties.type",
         type: {
           name: "Enum",
           allowedValues: [
-            "primary",
-            "secondary"
+            "custom",
+            "system",
+            "external"
           ]
         }
       },
-      expiry: {
-        required: true,
-        serializedName: "expiry",
+      externalId: {
+        serializedName: "properties.externalId",
         type: {
-          name: "DateTime"
+          name: "String"
         }
       }
     }
   }
 };
 
-export const GatewayKeyRegenerationRequestContract: msRest.CompositeMapper = {
-  serializedName: "GatewayKeyRegenerationRequestContract",
+export const GroupCreateParameters: msRest.CompositeMapper = {
+  serializedName: "GroupCreateParameters",
   type: {
     name: "Composite",
-    className: "GatewayKeyRegenerationRequestContract",
+    className: "GroupCreateParameters",
     modelProperties: {
-      keyType: {
+      displayName: {
         required: true,
-        serializedName: "keyType",
+        serializedName: "properties.displayName",
+        constraints: {
+          MaxLength: 300,
+          MinLength: 1
+        },
+        type: {
+          name: "String"
+        }
+      },
+      description: {
+        serializedName: "properties.description",
+        type: {
+          name: "String"
+        }
+      },
+      type: {
+        serializedName: "properties.type",
         type: {
           name: "Enum",
           allowedValues: [
-            "primary",
-            "secondary"
+            "custom",
+            "system",
+            "external"
           ]
         }
+      },
+      externalId: {
+        serializedName: "properties.externalId",
+        type: {
+          name: "String"
+        }
       }
     }
   }
 };
 
-export const GatewayKeysContract: msRest.CompositeMapper = {
-  serializedName: "GatewayKeysContract",
+export const ClientSecretContract: msRest.CompositeMapper = {
+  serializedName: "ClientSecretContract",
   type: {
     name: "Composite",
-    className: "GatewayKeysContract",
+    className: "ClientSecretContract",
     modelProperties: {
-      primary: {
-        serializedName: "primary",
-        type: {
-          name: "String"
-        }
-      },
-      secondary: {
-        serializedName: "secondary",
+      clientSecret: {
+        serializedName: "clientSecret",
         type: {
           name: "String"
         }
@@ -6551,94 +6619,76 @@ export const GatewayKeysContract: msRest.CompositeMapper = {
   }
 };
 
-export const ResourceLocationDataContract: msRest.CompositeMapper = {
-  serializedName: "ResourceLocationDataContract",
+export const IdentityProviderBaseParameters: msRest.CompositeMapper = {
+  serializedName: "IdentityProviderBaseParameters",
   type: {
     name: "Composite",
-    className: "ResourceLocationDataContract",
+    className: "IdentityProviderBaseParameters",
     modelProperties: {
-      name: {
-        required: true,
-        serializedName: "name",
-        constraints: {
-          MaxLength: 256
-        },
+      type: {
+        serializedName: "type",
         type: {
           name: "String"
         }
       },
-      city: {
-        serializedName: "city",
-        constraints: {
-          MaxLength: 256
-        },
+      signinTenant: {
+        serializedName: "signinTenant",
         type: {
           name: "String"
         }
       },
-      district: {
-        serializedName: "district",
+      allowedTenants: {
+        serializedName: "allowedTenants",
         constraints: {
-          MaxLength: 256
+          MaxItems: 32
         },
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "String"
+            }
+          }
+        }
+      },
+      authority: {
+        serializedName: "authority",
         type: {
           name: "String"
         }
       },
-      countryOrRegion: {
-        serializedName: "countryOrRegion",
+      signupPolicyName: {
+        serializedName: "signupPolicyName",
         constraints: {
-          MaxLength: 256
+          MinLength: 1
         },
         type: {
           name: "String"
         }
-      }
-    }
-  }
-};
-
-export const GatewayContract: msRest.CompositeMapper = {
-  serializedName: "GatewayContract",
-  type: {
-    name: "Composite",
-    className: "GatewayContract",
-    modelProperties: {
-      ...Resource.type.modelProperties,
-      locationData: {
-        serializedName: "properties.locationData",
-        type: {
-          name: "Composite",
-          className: "ResourceLocationDataContract"
-        }
       },
-      description: {
-        serializedName: "properties.description",
+      signinPolicyName: {
+        serializedName: "signinPolicyName",
         constraints: {
-          MaxLength: 1000
+          MinLength: 1
         },
         type: {
           name: "String"
         }
-      }
-    }
-  }
-};
-
-export const UserIdentityContract: msRest.CompositeMapper = {
-  serializedName: "UserIdentityContract",
-  type: {
-    name: "Composite",
-    className: "UserIdentityContract",
-    modelProperties: {
-      provider: {
-        serializedName: "provider",
+      },
+      profileEditingPolicyName: {
+        serializedName: "profileEditingPolicyName",
+        constraints: {
+          MinLength: 1
+        },
         type: {
           name: "String"
         }
       },
-      id: {
-        serializedName: "id",
+      passwordResetPolicyName: {
+        serializedName: "passwordResetPolicyName",
+        constraints: {
+          MinLength: 1
+        },
         type: {
           name: "String"
         }
@@ -6647,87 +6697,96 @@ export const UserIdentityContract: msRest.CompositeMapper = {
   }
 };
 
-export const UserEntityBaseParameters: msRest.CompositeMapper = {
-  serializedName: "UserEntityBaseParameters",
+export const IdentityProviderContract: msRest.CompositeMapper = {
+  serializedName: "IdentityProviderContract",
   type: {
     name: "Composite",
-    className: "UserEntityBaseParameters",
+    className: "IdentityProviderContract",
     modelProperties: {
-      state: {
-        serializedName: "state",
-        defaultValue: 'active',
+      ...Resource.type.modelProperties,
+      identityProviderContractType: {
+        serializedName: "properties.type",
         type: {
           name: "String"
         }
       },
-      note: {
-        serializedName: "note",
+      signinTenant: {
+        serializedName: "properties.signinTenant",
         type: {
           name: "String"
         }
       },
-      identities: {
-        serializedName: "identities",
+      allowedTenants: {
+        serializedName: "properties.allowedTenants",
+        constraints: {
+          MaxItems: 32
+        },
         type: {
           name: "Sequence",
           element: {
             type: {
-              name: "Composite",
-              className: "UserIdentityContract"
+              name: "String"
             }
           }
         }
-      }
-    }
-  }
-};
-
-export const GroupContractProperties: msRest.CompositeMapper = {
-  serializedName: "GroupContractProperties",
-  type: {
-    name: "Composite",
-    className: "GroupContractProperties",
-    modelProperties: {
-      displayName: {
-        required: true,
-        serializedName: "displayName",
+      },
+      authority: {
+        serializedName: "properties.authority",
+        type: {
+          name: "String"
+        }
+      },
+      signupPolicyName: {
+        serializedName: "properties.signupPolicyName",
         constraints: {
-          MaxLength: 300,
           MinLength: 1
         },
         type: {
           name: "String"
         }
       },
-      description: {
-        serializedName: "description",
+      signinPolicyName: {
+        serializedName: "properties.signinPolicyName",
         constraints: {
-          MaxLength: 1000
+          MinLength: 1
         },
         type: {
           name: "String"
         }
       },
-      builtIn: {
-        readOnly: true,
-        serializedName: "builtIn",
+      profileEditingPolicyName: {
+        serializedName: "properties.profileEditingPolicyName",
+        constraints: {
+          MinLength: 1
+        },
         type: {
-          name: "Boolean"
+          name: "String"
         }
       },
-      type: {
-        serializedName: "type",
+      passwordResetPolicyName: {
+        serializedName: "properties.passwordResetPolicyName",
+        constraints: {
+          MinLength: 1
+        },
         type: {
-          name: "Enum",
-          allowedValues: [
-            "custom",
-            "system",
-            "external"
-          ]
+          name: "String"
         }
       },
-      externalId: {
-        serializedName: "externalId",
+      clientId: {
+        required: true,
+        serializedName: "properties.clientId",
+        constraints: {
+          MinLength: 1
+        },
+        type: {
+          name: "String"
+        }
+      },
+      clientSecret: {
+        serializedName: "properties.clientSecret",
+        constraints: {
+          MinLength: 1
+        },
         type: {
           name: "String"
         }
@@ -6736,277 +6795,64 @@ export const GroupContractProperties: msRest.CompositeMapper = {
   }
 };
 
-export const UserContract: msRest.CompositeMapper = {
-  serializedName: "UserContract",
+export const IdentityProviderUpdateParameters: msRest.CompositeMapper = {
+  serializedName: "IdentityProviderUpdateParameters",
   type: {
     name: "Composite",
-    className: "UserContract",
+    className: "IdentityProviderUpdateParameters",
     modelProperties: {
-      ...Resource.type.modelProperties,
-      state: {
-        serializedName: "properties.state",
-        defaultValue: 'active',
+      type: {
+        serializedName: "properties.type",
         type: {
           name: "String"
         }
       },
-      note: {
-        serializedName: "properties.note",
+      signinTenant: {
+        serializedName: "properties.signinTenant",
         type: {
           name: "String"
         }
       },
-      identities: {
-        serializedName: "properties.identities",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "UserIdentityContract"
-            }
-          }
-        }
-      },
-      firstName: {
-        serializedName: "properties.firstName",
-        type: {
-          name: "String"
-        }
-      },
-      lastName: {
-        serializedName: "properties.lastName",
-        type: {
-          name: "String"
-        }
-      },
-      email: {
-        serializedName: "properties.email",
-        type: {
-          name: "String"
-        }
-      },
-      registrationDate: {
-        serializedName: "properties.registrationDate",
-        type: {
-          name: "DateTime"
-        }
-      },
-      groups: {
-        readOnly: true,
-        serializedName: "properties.groups",
+      allowedTenants: {
+        serializedName: "properties.allowedTenants",
+        constraints: {
+          MaxItems: 32
+        },
         type: {
           name: "Sequence",
           element: {
             type: {
-              name: "Composite",
-              className: "GroupContractProperties"
+              name: "String"
             }
           }
         }
-      }
-    }
-  }
-};
-
-export const GroupContract: msRest.CompositeMapper = {
-  serializedName: "GroupContract",
-  type: {
-    name: "Composite",
-    className: "GroupContract",
-    modelProperties: {
-      ...Resource.type.modelProperties,
-      displayName: {
-        required: true,
-        serializedName: "properties.displayName",
-        constraints: {
-          MaxLength: 300,
-          MinLength: 1
-        },
-        type: {
-          name: "String"
-        }
       },
-      description: {
-        serializedName: "properties.description",
-        constraints: {
-          MaxLength: 1000
-        },
+      authority: {
+        serializedName: "properties.authority",
         type: {
           name: "String"
         }
       },
-      builtIn: {
-        readOnly: true,
-        serializedName: "properties.builtIn",
-        type: {
-          name: "Boolean"
-        }
-      },
-      groupContractType: {
-        serializedName: "properties.type",
-        type: {
-          name: "Enum",
-          allowedValues: [
-            "custom",
-            "system",
-            "external"
-          ]
-        }
-      },
-      externalId: {
-        serializedName: "properties.externalId",
-        type: {
-          name: "String"
-        }
-      }
-    }
-  }
-};
-
-export const GroupUpdateParameters: msRest.CompositeMapper = {
-  serializedName: "GroupUpdateParameters",
-  type: {
-    name: "Composite",
-    className: "GroupUpdateParameters",
-    modelProperties: {
-      displayName: {
-        serializedName: "properties.displayName",
+      signupPolicyName: {
+        serializedName: "properties.signupPolicyName",
         constraints: {
-          MaxLength: 300,
           MinLength: 1
         },
         type: {
           name: "String"
         }
       },
-      description: {
-        serializedName: "properties.description",
-        type: {
-          name: "String"
-        }
-      },
-      type: {
-        serializedName: "properties.type",
-        type: {
-          name: "Enum",
-          allowedValues: [
-            "custom",
-            "system",
-            "external"
-          ]
-        }
-      },
-      externalId: {
-        serializedName: "properties.externalId",
-        type: {
-          name: "String"
-        }
-      }
-    }
-  }
-};
-
-export const GroupCreateParameters: msRest.CompositeMapper = {
-  serializedName: "GroupCreateParameters",
-  type: {
-    name: "Composite",
-    className: "GroupCreateParameters",
-    modelProperties: {
-      displayName: {
-        required: true,
-        serializedName: "properties.displayName",
+      signinPolicyName: {
+        serializedName: "properties.signinPolicyName",
         constraints: {
-          MaxLength: 300,
           MinLength: 1
         },
         type: {
           name: "String"
         }
       },
-      description: {
-        serializedName: "properties.description",
-        type: {
-          name: "String"
-        }
-      },
-      type: {
-        serializedName: "properties.type",
-        type: {
-          name: "Enum",
-          allowedValues: [
-            "custom",
-            "system",
-            "external"
-          ]
-        }
-      },
-      externalId: {
-        serializedName: "properties.externalId",
-        type: {
-          name: "String"
-        }
-      }
-    }
-  }
-};
-
-export const ClientSecretContract: msRest.CompositeMapper = {
-  serializedName: "ClientSecretContract",
-  type: {
-    name: "Composite",
-    className: "ClientSecretContract",
-    modelProperties: {
-      clientSecret: {
-        serializedName: "clientSecret",
-        type: {
-          name: "String"
-        }
-      }
-    }
-  }
-};
-
-export const IdentityProviderBaseParameters: msRest.CompositeMapper = {
-  serializedName: "IdentityProviderBaseParameters",
-  type: {
-    name: "Composite",
-    className: "IdentityProviderBaseParameters",
-    modelProperties: {
-      type: {
-        serializedName: "type",
-        type: {
-          name: "String"
-        }
-      },
-      signinTenant: {
-        serializedName: "signinTenant",
-        type: {
-          name: "String"
-        }
-      },
-      allowedTenants: {
-        serializedName: "allowedTenants",
-        constraints: {
-          MaxItems: 32
-        },
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "String"
-            }
-          }
-        }
-      },
-      authority: {
-        serializedName: "authority",
-        type: {
-          name: "String"
-        }
-      },
-      signupPolicyName: {
-        serializedName: "signupPolicyName",
+      profileEditingPolicyName: {
+        serializedName: "properties.profileEditingPolicyName",
         constraints: {
           MinLength: 1
         },
@@ -7014,8 +6860,8 @@ export const IdentityProviderBaseParameters: msRest.CompositeMapper = {
           name: "String"
         }
       },
-      signinPolicyName: {
-        serializedName: "signinPolicyName",
+      passwordResetPolicyName: {
+        serializedName: "properties.passwordResetPolicyName",
         constraints: {
           MinLength: 1
         },
@@ -7023,8 +6869,8 @@ export const IdentityProviderBaseParameters: msRest.CompositeMapper = {
           name: "String"
         }
       },
-      profileEditingPolicyName: {
-        serializedName: "profileEditingPolicyName",
+      clientId: {
+        serializedName: "properties.clientId",
         constraints: {
           MinLength: 1
         },
@@ -7032,8 +6878,8 @@ export const IdentityProviderBaseParameters: msRest.CompositeMapper = {
           name: "String"
         }
       },
-      passwordResetPolicyName: {
-        serializedName: "passwordResetPolicyName",
+      clientSecret: {
+        serializedName: "properties.clientSecret",
         constraints: {
           MinLength: 1
         },
@@ -7045,208 +6891,14 @@ export const IdentityProviderBaseParameters: msRest.CompositeMapper = {
   }
 };
 
-export const IdentityProviderContract: msRest.CompositeMapper = {
-  serializedName: "IdentityProviderContract",
+export const IdentityProviderCreateContract: msRest.CompositeMapper = {
+  serializedName: "IdentityProviderCreateContract",
   type: {
     name: "Composite",
-    className: "IdentityProviderContract",
+    className: "IdentityProviderCreateContract",
     modelProperties: {
       ...Resource.type.modelProperties,
-      identityProviderContractType: {
-        serializedName: "properties.type",
-        type: {
-          name: "String"
-        }
-      },
-      signinTenant: {
-        serializedName: "properties.signinTenant",
-        type: {
-          name: "String"
-        }
-      },
-      allowedTenants: {
-        serializedName: "properties.allowedTenants",
-        constraints: {
-          MaxItems: 32
-        },
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "String"
-            }
-          }
-        }
-      },
-      authority: {
-        serializedName: "properties.authority",
-        type: {
-          name: "String"
-        }
-      },
-      signupPolicyName: {
-        serializedName: "properties.signupPolicyName",
-        constraints: {
-          MinLength: 1
-        },
-        type: {
-          name: "String"
-        }
-      },
-      signinPolicyName: {
-        serializedName: "properties.signinPolicyName",
-        constraints: {
-          MinLength: 1
-        },
-        type: {
-          name: "String"
-        }
-      },
-      profileEditingPolicyName: {
-        serializedName: "properties.profileEditingPolicyName",
-        constraints: {
-          MinLength: 1
-        },
-        type: {
-          name: "String"
-        }
-      },
-      passwordResetPolicyName: {
-        serializedName: "properties.passwordResetPolicyName",
-        constraints: {
-          MinLength: 1
-        },
-        type: {
-          name: "String"
-        }
-      },
-      clientId: {
-        required: true,
-        serializedName: "properties.clientId",
-        constraints: {
-          MinLength: 1
-        },
-        type: {
-          name: "String"
-        }
-      },
-      clientSecret: {
-        serializedName: "properties.clientSecret",
-        constraints: {
-          MinLength: 1
-        },
-        type: {
-          name: "String"
-        }
-      }
-    }
-  }
-};
-
-export const IdentityProviderUpdateParameters: msRest.CompositeMapper = {
-  serializedName: "IdentityProviderUpdateParameters",
-  type: {
-    name: "Composite",
-    className: "IdentityProviderUpdateParameters",
-    modelProperties: {
-      type: {
-        serializedName: "properties.type",
-        type: {
-          name: "String"
-        }
-      },
-      signinTenant: {
-        serializedName: "properties.signinTenant",
-        type: {
-          name: "String"
-        }
-      },
-      allowedTenants: {
-        serializedName: "properties.allowedTenants",
-        constraints: {
-          MaxItems: 32
-        },
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "String"
-            }
-          }
-        }
-      },
-      authority: {
-        serializedName: "properties.authority",
-        type: {
-          name: "String"
-        }
-      },
-      signupPolicyName: {
-        serializedName: "properties.signupPolicyName",
-        constraints: {
-          MinLength: 1
-        },
-        type: {
-          name: "String"
-        }
-      },
-      signinPolicyName: {
-        serializedName: "properties.signinPolicyName",
-        constraints: {
-          MinLength: 1
-        },
-        type: {
-          name: "String"
-        }
-      },
-      profileEditingPolicyName: {
-        serializedName: "properties.profileEditingPolicyName",
-        constraints: {
-          MinLength: 1
-        },
-        type: {
-          name: "String"
-        }
-      },
-      passwordResetPolicyName: {
-        serializedName: "properties.passwordResetPolicyName",
-        constraints: {
-          MinLength: 1
-        },
-        type: {
-          name: "String"
-        }
-      },
-      clientId: {
-        serializedName: "properties.clientId",
-        constraints: {
-          MinLength: 1
-        },
-        type: {
-          name: "String"
-        }
-      },
-      clientSecret: {
-        serializedName: "properties.clientSecret",
-        constraints: {
-          MinLength: 1
-        },
-        type: {
-          name: "String"
-        }
-      }
-    }
-  }
-};
-
-export const IdentityProviderCreateContract: msRest.CompositeMapper = {
-  serializedName: "IdentityProviderCreateContract",
-  type: {
-    name: "Composite",
-    className: "IdentityProviderCreateContract",
-    modelProperties: {
-      ...Resource.type.modelProperties,
-      identityProviderCreateContractType: {
+      identityProviderCreateContractType: {
         serializedName: "properties.type",
         type: {
           name: "String"
@@ -9424,218 +9076,577 @@ export const ApiManagementSkuRestrictions: msRest.CompositeMapper = {
         readOnly: true,
         serializedName: "type",
         type: {
-          name: "Enum",
-          allowedValues: [
-            "Location",
-            "Zone"
-          ]
+          name: "Enum",
+          allowedValues: [
+            "Location",
+            "Zone"
+          ]
+        }
+      },
+      values: {
+        readOnly: true,
+        serializedName: "values",
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "String"
+            }
+          }
+        }
+      },
+      restrictionInfo: {
+        readOnly: true,
+        serializedName: "restrictionInfo",
+        type: {
+          name: "Composite",
+          className: "ApiManagementSkuRestrictionInfo"
+        }
+      },
+      reasonCode: {
+        readOnly: true,
+        serializedName: "reasonCode",
+        type: {
+          name: "Enum",
+          allowedValues: [
+            "QuotaId",
+            "NotAvailableForSubscription"
+          ]
+        }
+      }
+    }
+  }
+};
+
+export const ApiManagementSkuLocationInfo: msRest.CompositeMapper = {
+  serializedName: "ApiManagementSkuLocationInfo",
+  type: {
+    name: "Composite",
+    className: "ApiManagementSkuLocationInfo",
+    modelProperties: {
+      location: {
+        readOnly: true,
+        serializedName: "location",
+        type: {
+          name: "String"
+        }
+      },
+      zones: {
+        readOnly: true,
+        serializedName: "zones",
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "String"
+            }
+          }
+        }
+      },
+      zoneDetails: {
+        readOnly: true,
+        serializedName: "zoneDetails",
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "ApiManagementSkuZoneDetails"
+            }
+          }
+        }
+      }
+    }
+  }
+};
+
+export const ApiManagementSku: msRest.CompositeMapper = {
+  serializedName: "ApiManagementSku",
+  type: {
+    name: "Composite",
+    className: "ApiManagementSku",
+    modelProperties: {
+      resourceType: {
+        readOnly: true,
+        serializedName: "resourceType",
+        type: {
+          name: "String"
+        }
+      },
+      name: {
+        readOnly: true,
+        serializedName: "name",
+        type: {
+          name: "String"
+        }
+      },
+      tier: {
+        readOnly: true,
+        serializedName: "tier",
+        type: {
+          name: "String"
+        }
+      },
+      size: {
+        readOnly: true,
+        serializedName: "size",
+        type: {
+          name: "String"
+        }
+      },
+      family: {
+        readOnly: true,
+        serializedName: "family",
+        type: {
+          name: "String"
+        }
+      },
+      kind: {
+        readOnly: true,
+        serializedName: "kind",
+        type: {
+          name: "String"
+        }
+      },
+      capacity: {
+        readOnly: true,
+        serializedName: "capacity",
+        type: {
+          name: "Composite",
+          className: "ApiManagementSkuCapacity"
+        }
+      },
+      locations: {
+        readOnly: true,
+        serializedName: "locations",
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "String"
+            }
+          }
+        }
+      },
+      locationInfo: {
+        readOnly: true,
+        serializedName: "locationInfo",
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "ApiManagementSkuLocationInfo"
+            }
+          }
+        }
+      },
+      apiVersions: {
+        readOnly: true,
+        serializedName: "apiVersions",
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "String"
+            }
+          }
+        }
+      },
+      costs: {
+        readOnly: true,
+        serializedName: "costs",
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "ApiManagementSkuCosts"
+            }
+          }
+        }
+      },
+      capabilities: {
+        readOnly: true,
+        serializedName: "capabilities",
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "ApiManagementSkuCapabilities"
+            }
+          }
+        }
+      },
+      restrictions: {
+        readOnly: true,
+        serializedName: "restrictions",
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "ApiManagementSkuRestrictions"
+            }
+          }
+        }
+      }
+    }
+  }
+};
+
+export const SubscriptionKeysContract: msRest.CompositeMapper = {
+  serializedName: "SubscriptionKeysContract",
+  type: {
+    name: "Composite",
+    className: "SubscriptionKeysContract",
+    modelProperties: {
+      primaryKey: {
+        serializedName: "primaryKey",
+        constraints: {
+          MaxLength: 256,
+          MinLength: 1
+        },
+        type: {
+          name: "String"
+        }
+      },
+      secondaryKey: {
+        serializedName: "secondaryKey",
+        constraints: {
+          MaxLength: 256,
+          MinLength: 1
+        },
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
+export const SubscriptionUpdateParameters: msRest.CompositeMapper = {
+  serializedName: "SubscriptionUpdateParameters",
+  type: {
+    name: "Composite",
+    className: "SubscriptionUpdateParameters",
+    modelProperties: {
+      ownerId: {
+        serializedName: "properties.ownerId",
+        type: {
+          name: "String"
+        }
+      },
+      scope: {
+        serializedName: "properties.scope",
+        type: {
+          name: "String"
+        }
+      },
+      expirationDate: {
+        serializedName: "properties.expirationDate",
+        type: {
+          name: "DateTime"
+        }
+      },
+      displayName: {
+        serializedName: "properties.displayName",
+        type: {
+          name: "String"
+        }
+      },
+      primaryKey: {
+        serializedName: "properties.primaryKey",
+        constraints: {
+          MaxLength: 256,
+          MinLength: 1
+        },
+        type: {
+          name: "String"
+        }
+      },
+      secondaryKey: {
+        serializedName: "properties.secondaryKey",
+        constraints: {
+          MaxLength: 256,
+          MinLength: 1
+        },
+        type: {
+          name: "String"
+        }
+      },
+      state: {
+        serializedName: "properties.state",
+        type: {
+          name: "Enum",
+          allowedValues: [
+            "suspended",
+            "active",
+            "expired",
+            "submitted",
+            "rejected",
+            "cancelled"
+          ]
+        }
+      },
+      stateComment: {
+        serializedName: "properties.stateComment",
+        type: {
+          name: "String"
+        }
+      },
+      allowTracing: {
+        serializedName: "properties.allowTracing",
+        type: {
+          name: "Boolean"
+        }
+      }
+    }
+  }
+};
+
+export const SubscriptionCreateParameters: msRest.CompositeMapper = {
+  serializedName: "SubscriptionCreateParameters",
+  type: {
+    name: "Composite",
+    className: "SubscriptionCreateParameters",
+    modelProperties: {
+      ownerId: {
+        serializedName: "properties.ownerId",
+        type: {
+          name: "String"
+        }
+      },
+      scope: {
+        required: true,
+        serializedName: "properties.scope",
+        type: {
+          name: "String"
+        }
+      },
+      displayName: {
+        required: true,
+        serializedName: "properties.displayName",
+        constraints: {
+          MaxLength: 100,
+          MinLength: 1
+        },
+        type: {
+          name: "String"
+        }
+      },
+      primaryKey: {
+        serializedName: "properties.primaryKey",
+        constraints: {
+          MaxLength: 256,
+          MinLength: 1
+        },
+        type: {
+          name: "String"
+        }
+      },
+      secondaryKey: {
+        serializedName: "properties.secondaryKey",
+        constraints: {
+          MaxLength: 256,
+          MinLength: 1
+        },
+        type: {
+          name: "String"
+        }
+      },
+      state: {
+        serializedName: "properties.state",
+        type: {
+          name: "Enum",
+          allowedValues: [
+            "suspended",
+            "active",
+            "expired",
+            "submitted",
+            "rejected",
+            "cancelled"
+          ]
+        }
+      },
+      allowTracing: {
+        serializedName: "properties.allowTracing",
+        type: {
+          name: "Boolean"
+        }
+      }
+    }
+  }
+};
+
+export const TagCreateUpdateParameters: msRest.CompositeMapper = {
+  serializedName: "TagCreateUpdateParameters",
+  type: {
+    name: "Composite",
+    className: "TagCreateUpdateParameters",
+    modelProperties: {
+      displayName: {
+        required: true,
+        serializedName: "properties.displayName",
+        constraints: {
+          MaxLength: 160,
+          MinLength: 1
+        },
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
+export const TenantConfigurationSyncStateContract: msRest.CompositeMapper = {
+  serializedName: "TenantConfigurationSyncStateContract",
+  type: {
+    name: "Composite",
+    className: "TenantConfigurationSyncStateContract",
+    modelProperties: {
+      ...Resource.type.modelProperties,
+      branch: {
+        serializedName: "properties.branch",
+        type: {
+          name: "String"
+        }
+      },
+      commitId: {
+        serializedName: "properties.commitId",
+        type: {
+          name: "String"
+        }
+      },
+      isExport: {
+        serializedName: "properties.isExport",
+        type: {
+          name: "Boolean"
+        }
+      },
+      isSynced: {
+        serializedName: "properties.isSynced",
+        type: {
+          name: "Boolean"
+        }
+      },
+      isGitEnabled: {
+        serializedName: "properties.isGitEnabled",
+        type: {
+          name: "Boolean"
         }
       },
-      values: {
-        readOnly: true,
-        serializedName: "values",
+      syncDate: {
+        serializedName: "properties.syncDate",
         type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "String"
-            }
-          }
+          name: "DateTime"
         }
       },
-      restrictionInfo: {
-        readOnly: true,
-        serializedName: "restrictionInfo",
+      configurationChangeDate: {
+        serializedName: "properties.configurationChangeDate",
         type: {
-          name: "Composite",
-          className: "ApiManagementSkuRestrictionInfo"
+          name: "DateTime"
         }
       },
-      reasonCode: {
-        readOnly: true,
-        serializedName: "reasonCode",
+      lastOperationId: {
+        serializedName: "properties.lastOperationId",
         type: {
-          name: "Enum",
-          allowedValues: [
-            "QuotaId",
-            "NotAvailableForSubscription"
-          ]
+          name: "String"
         }
       }
     }
   }
 };
 
-export const ApiManagementSkuLocationInfo: msRest.CompositeMapper = {
-  serializedName: "ApiManagementSkuLocationInfo",
+export const OperationResultLogItemContract: msRest.CompositeMapper = {
+  serializedName: "OperationResultLogItemContract",
   type: {
     name: "Composite",
-    className: "ApiManagementSkuLocationInfo",
+    className: "OperationResultLogItemContract",
     modelProperties: {
-      location: {
-        readOnly: true,
-        serializedName: "location",
+      objectType: {
+        serializedName: "objectType",
         type: {
           name: "String"
         }
       },
-      zones: {
-        readOnly: true,
-        serializedName: "zones",
+      action: {
+        serializedName: "action",
         type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "String"
-            }
-          }
+          name: "String"
         }
       },
-      zoneDetails: {
-        readOnly: true,
-        serializedName: "zoneDetails",
+      objectKey: {
+        serializedName: "objectKey",
         type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "ApiManagementSkuZoneDetails"
-            }
-          }
+          name: "String"
         }
       }
     }
   }
 };
 
-export const ApiManagementSku: msRest.CompositeMapper = {
-  serializedName: "ApiManagementSku",
+export const OperationResultContract: msRest.CompositeMapper = {
+  serializedName: "OperationResultContract",
   type: {
     name: "Composite",
-    className: "ApiManagementSku",
+    className: "OperationResultContract",
     modelProperties: {
-      resourceType: {
-        readOnly: true,
-        serializedName: "resourceType",
-        type: {
-          name: "String"
-        }
-      },
-      name: {
-        readOnly: true,
-        serializedName: "name",
+      ...Resource.type.modelProperties,
+      operationResultContractId: {
+        serializedName: "properties.id",
         type: {
           name: "String"
         }
       },
-      tier: {
-        readOnly: true,
-        serializedName: "tier",
+      status: {
+        serializedName: "properties.status",
         type: {
-          name: "String"
+          name: "Enum",
+          allowedValues: [
+            "Started",
+            "InProgress",
+            "Succeeded",
+            "Failed"
+          ]
         }
       },
-      size: {
-        readOnly: true,
-        serializedName: "size",
+      started: {
+        serializedName: "properties.started",
         type: {
-          name: "String"
+          name: "DateTime"
         }
       },
-      family: {
-        readOnly: true,
-        serializedName: "family",
+      updated: {
+        serializedName: "properties.updated",
         type: {
-          name: "String"
+          name: "DateTime"
         }
       },
-      kind: {
-        readOnly: true,
-        serializedName: "kind",
+      resultInfo: {
+        serializedName: "properties.resultInfo",
         type: {
           name: "String"
         }
       },
-      capacity: {
-        readOnly: true,
-        serializedName: "capacity",
+      error: {
+        serializedName: "properties.error",
         type: {
           name: "Composite",
-          className: "ApiManagementSkuCapacity"
-        }
-      },
-      locations: {
-        readOnly: true,
-        serializedName: "locations",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "String"
-            }
-          }
-        }
-      },
-      locationInfo: {
-        readOnly: true,
-        serializedName: "locationInfo",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "ApiManagementSkuLocationInfo"
-            }
-          }
-        }
-      },
-      apiVersions: {
-        readOnly: true,
-        serializedName: "apiVersions",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "String"
-            }
-          }
-        }
-      },
-      costs: {
-        readOnly: true,
-        serializedName: "costs",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "ApiManagementSkuCosts"
-            }
-          }
-        }
-      },
-      capabilities: {
-        readOnly: true,
-        serializedName: "capabilities",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "ApiManagementSkuCapabilities"
-            }
-          }
+          className: "ErrorResponseBody"
         }
       },
-      restrictions: {
+      actionLog: {
         readOnly: true,
-        serializedName: "restrictions",
+        serializedName: "properties.actionLog",
         type: {
           name: "Sequence",
           element: {
             type: {
               name: "Composite",
-              className: "ApiManagementSkuRestrictions"
+              className: "OperationResultLogItemContract"
             }
           }
         }
@@ -9644,108 +9655,113 @@ export const ApiManagementSku: msRest.CompositeMapper = {
   }
 };
 
-export const SubscriptionKeysContract: msRest.CompositeMapper = {
-  serializedName: "SubscriptionKeysContract",
+export const DeployConfigurationParameters: msRest.CompositeMapper = {
+  serializedName: "DeployConfigurationParameters",
   type: {
     name: "Composite",
-    className: "SubscriptionKeysContract",
+    className: "DeployConfigurationParameters",
     modelProperties: {
-      primaryKey: {
-        serializedName: "primaryKey",
-        constraints: {
-          MaxLength: 256,
-          MinLength: 1
-        },
+      branch: {
+        required: true,
+        serializedName: "properties.branch",
         type: {
           name: "String"
         }
       },
-      secondaryKey: {
-        serializedName: "secondaryKey",
-        constraints: {
-          MaxLength: 256,
-          MinLength: 1
-        },
+      force: {
+        serializedName: "properties.force",
         type: {
-          name: "String"
+          name: "Boolean"
         }
       }
     }
   }
 };
 
-export const SubscriptionUpdateParameters: msRest.CompositeMapper = {
-  serializedName: "SubscriptionUpdateParameters",
+export const SaveConfigurationParameter: msRest.CompositeMapper = {
+  serializedName: "SaveConfigurationParameter",
   type: {
     name: "Composite",
-    className: "SubscriptionUpdateParameters",
+    className: "SaveConfigurationParameter",
     modelProperties: {
-      ownerId: {
-        serializedName: "properties.ownerId",
+      branch: {
+        required: true,
+        serializedName: "properties.branch",
         type: {
           name: "String"
         }
       },
-      scope: {
-        serializedName: "properties.scope",
+      force: {
+        serializedName: "properties.force",
+        type: {
+          name: "Boolean"
+        }
+      }
+    }
+  }
+};
+
+export const AccessInformationSecretsContract: msRest.CompositeMapper = {
+  serializedName: "AccessInformationSecretsContract",
+  type: {
+    name: "Composite",
+    className: "AccessInformationSecretsContract",
+    modelProperties: {
+      id: {
+        serializedName: "id",
         type: {
           name: "String"
         }
       },
-      expirationDate: {
-        serializedName: "properties.expirationDate",
-        type: {
-          name: "DateTime"
-        }
-      },
-      displayName: {
-        serializedName: "properties.displayName",
+      principalId: {
+        serializedName: "principalId",
         type: {
           name: "String"
         }
       },
       primaryKey: {
-        serializedName: "properties.primaryKey",
-        constraints: {
-          MaxLength: 256,
-          MinLength: 1
-        },
+        serializedName: "primaryKey",
         type: {
           name: "String"
         }
       },
       secondaryKey: {
-        serializedName: "properties.secondaryKey",
-        constraints: {
-          MaxLength: 256,
-          MinLength: 1
-        },
+        serializedName: "secondaryKey",
         type: {
           name: "String"
         }
       },
-      state: {
-        serializedName: "properties.state",
+      enabled: {
+        serializedName: "enabled",
         type: {
-          name: "Enum",
-          allowedValues: [
-            "suspended",
-            "active",
-            "expired",
-            "submitted",
-            "rejected",
-            "cancelled"
-          ]
+          name: "Boolean"
+        }
+      }
+    }
+  }
+};
+
+export const AccessInformationContract: msRest.CompositeMapper = {
+  serializedName: "AccessInformationContract",
+  type: {
+    name: "Composite",
+    className: "AccessInformationContract",
+    modelProperties: {
+      ...Resource.type.modelProperties,
+      accessInformationContractId: {
+        serializedName: "properties.id",
+        type: {
+          name: "String"
         }
       },
-      stateComment: {
-        serializedName: "properties.stateComment",
+      principalId: {
+        serializedName: "properties.principalId",
         type: {
           name: "String"
         }
       },
-      allowTracing: {
-        serializedName: "properties.allowTracing",
+      enabled: {
+        serializedName: "properties.enabled",
         type: {
           name: "Boolean"
         }
@@ -9754,72 +9770,48 @@ export const SubscriptionUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const SubscriptionCreateParameters: msRest.CompositeMapper = {
-  serializedName: "SubscriptionCreateParameters",
+export const AccessInformationUpdateParameters: msRest.CompositeMapper = {
+  serializedName: "AccessInformationUpdateParameters",
   type: {
     name: "Composite",
-    className: "SubscriptionCreateParameters",
+    className: "AccessInformationUpdateParameters",
     modelProperties: {
-      ownerId: {
-        serializedName: "properties.ownerId",
-        type: {
-          name: "String"
-        }
-      },
-      scope: {
-        required: true,
-        serializedName: "properties.scope",
+      enabled: {
+        serializedName: "properties.enabled",
         type: {
-          name: "String"
+          name: "Boolean"
         }
-      },
-      displayName: {
-        required: true,
-        serializedName: "properties.displayName",
-        constraints: {
-          MaxLength: 100,
-          MinLength: 1
-        },
+      }
+    }
+  }
+};
+
+export const AccessInformationCreateParameters: msRest.CompositeMapper = {
+  serializedName: "AccessInformationCreateParameters",
+  type: {
+    name: "Composite",
+    className: "AccessInformationCreateParameters",
+    modelProperties: {
+      principalId: {
+        serializedName: "properties.principalId",
         type: {
           name: "String"
         }
       },
       primaryKey: {
         serializedName: "properties.primaryKey",
-        constraints: {
-          MaxLength: 256,
-          MinLength: 1
-        },
         type: {
           name: "String"
         }
       },
       secondaryKey: {
         serializedName: "properties.secondaryKey",
-        constraints: {
-          MaxLength: 256,
-          MinLength: 1
-        },
         type: {
           name: "String"
         }
       },
-      state: {
-        serializedName: "properties.state",
-        type: {
-          name: "Enum",
-          allowedValues: [
-            "suspended",
-            "active",
-            "expired",
-            "submitted",
-            "rejected",
-            "cancelled"
-          ]
-        }
-      },
-      allowTracing: {
-        serializedName: "properties.allowTracing",
+      enabled: {
+        serializedName: "properties.enabled",
         type: {
           name: "Boolean"
         }
@@ -9828,19 +9820,14 @@ export const SubscriptionCreateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const TagCreateUpdateParameters: msRest.CompositeMapper = {
-  serializedName: "TagCreateUpdateParameters",
+export const UserTokenResult: msRest.CompositeMapper = {
+  serializedName: "UserTokenResult",
   type: {
     name: "Composite",
-    className: "TagCreateUpdateParameters",
+    className: "UserTokenResult",
     modelProperties: {
-      displayName: {
-        required: true,
-        serializedName: "properties.displayName",
-        constraints: {
-          MaxLength: 160,
-          MinLength: 1
-        },
+      value: {
+        serializedName: "value",
         type: {
           name: "String"
         }
@@ -9849,85 +9836,114 @@ export const TagCreateUpdateParameters: msRest.CompositeMapper = {
   }
 };
 
-export const TenantConfigurationSyncStateContract: msRest.CompositeMapper = {
-  serializedName: "TenantConfigurationSyncStateContract",
+export const UserTokenParameters: msRest.CompositeMapper = {
+  serializedName: "UserTokenParameters",
   type: {
     name: "Composite",
-    className: "TenantConfigurationSyncStateContract",
+    className: "UserTokenParameters",
     modelProperties: {
-      ...Resource.type.modelProperties,
-      branch: {
-        serializedName: "properties.branch",
-        type: {
-          name: "String"
-        }
-      },
-      commitId: {
-        serializedName: "properties.commitId",
+      keyType: {
+        required: true,
+        serializedName: "properties.keyType",
+        defaultValue: 'primary',
         type: {
-          name: "String"
+          name: "Enum",
+          allowedValues: [
+            "primary",
+            "secondary"
+          ]
         }
       },
-      isExport: {
-        serializedName: "properties.isExport",
+      expiry: {
+        required: true,
+        serializedName: "properties.expiry",
         type: {
-          name: "Boolean"
+          name: "DateTime"
         }
-      },
-      isSynced: {
-        serializedName: "properties.isSynced",
+      }
+    }
+  }
+};
+
+export const GenerateSsoUrlResult: msRest.CompositeMapper = {
+  serializedName: "GenerateSsoUrlResult",
+  type: {
+    name: "Composite",
+    className: "GenerateSsoUrlResult",
+    modelProperties: {
+      value: {
+        serializedName: "value",
         type: {
-          name: "Boolean"
+          name: "String"
         }
-      },
-      isGitEnabled: {
-        serializedName: "properties.isGitEnabled",
+      }
+    }
+  }
+};
+
+export const UserUpdateParameters: msRest.CompositeMapper = {
+  serializedName: "UserUpdateParameters",
+  type: {
+    name: "Composite",
+    className: "UserUpdateParameters",
+    modelProperties: {
+      state: {
+        serializedName: "properties.state",
+        defaultValue: 'active',
         type: {
-          name: "Boolean"
+          name: "String"
         }
       },
-      syncDate: {
-        serializedName: "properties.syncDate",
+      note: {
+        serializedName: "properties.note",
         type: {
-          name: "DateTime"
+          name: "String"
         }
       },
-      configurationChangeDate: {
-        serializedName: "properties.configurationChangeDate",
+      identities: {
+        serializedName: "properties.identities",
         type: {
-          name: "DateTime"
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "UserIdentityContract"
+            }
+          }
         }
       },
-      lastOperationId: {
-        serializedName: "properties.lastOperationId",
+      email: {
+        serializedName: "properties.email",
+        constraints: {
+          MaxLength: 254,
+          MinLength: 1
+        },
         type: {
           name: "String"
         }
-      }
-    }
-  }
-};
-
-export const OperationResultLogItemContract: msRest.CompositeMapper = {
-  serializedName: "OperationResultLogItemContract",
-  type: {
-    name: "Composite",
-    className: "OperationResultLogItemContract",
-    modelProperties: {
-      objectType: {
-        serializedName: "objectType",
+      },
+      password: {
+        serializedName: "properties.password",
         type: {
           name: "String"
         }
       },
-      action: {
-        serializedName: "action",
+      firstName: {
+        serializedName: "properties.firstName",
+        constraints: {
+          MaxLength: 100,
+          MinLength: 1
+        },
         type: {
           name: "String"
         }
       },
-      objectKey: {
-        serializedName: "objectKey",
+      lastName: {
+        serializedName: "properties.lastName",
+        constraints: {
+          MaxLength: 100,
+          MinLength: 1
+        },
         type: {
           name: "String"
         }
@@ -9936,245 +9952,283 @@ export const OperationResultLogItemContract: msRest.CompositeMapper = {
   }
 };
 
-export const OperationResultContract: msRest.CompositeMapper = {
-  serializedName: "OperationResultContract",
+export const UserCreateParameters: msRest.CompositeMapper = {
+  serializedName: "UserCreateParameters",
   type: {
     name: "Composite",
-    className: "OperationResultContract",
+    className: "UserCreateParameters",
     modelProperties: {
-      ...Resource.type.modelProperties,
-      operationResultContractId: {
-        serializedName: "properties.id",
+      state: {
+        serializedName: "properties.state",
+        defaultValue: 'active',
         type: {
           name: "String"
         }
       },
-      status: {
-        serializedName: "properties.status",
+      note: {
+        serializedName: "properties.note",
         type: {
-          name: "Enum",
-          allowedValues: [
-            "Started",
-            "InProgress",
-            "Succeeded",
-            "Failed"
-          ]
+          name: "String"
         }
       },
-      started: {
-        serializedName: "properties.started",
+      identities: {
+        serializedName: "properties.identities",
         type: {
-          name: "DateTime"
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "UserIdentityContract"
+            }
+          }
         }
       },
-      updated: {
-        serializedName: "properties.updated",
+      email: {
+        required: true,
+        serializedName: "properties.email",
+        constraints: {
+          MaxLength: 254,
+          MinLength: 1
+        },
         type: {
-          name: "DateTime"
+          name: "String"
         }
       },
-      resultInfo: {
-        serializedName: "properties.resultInfo",
+      firstName: {
+        required: true,
+        serializedName: "properties.firstName",
+        constraints: {
+          MaxLength: 100,
+          MinLength: 1
+        },
         type: {
           name: "String"
         }
       },
-      error: {
-        serializedName: "properties.error",
+      lastName: {
+        required: true,
+        serializedName: "properties.lastName",
+        constraints: {
+          MaxLength: 100,
+          MinLength: 1
+        },
         type: {
-          name: "Composite",
-          className: "ErrorResponseBody"
+          name: "String"
         }
       },
-      actionLog: {
-        readOnly: true,
-        serializedName: "properties.actionLog",
+      password: {
+        serializedName: "properties.password",
         type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "OperationResultLogItemContract"
-            }
-          }
+          name: "String"
         }
-      }
-    }
-  }
-};
-
-export const DeployConfigurationParameters: msRest.CompositeMapper = {
-  serializedName: "DeployConfigurationParameters",
-  type: {
-    name: "Composite",
-    className: "DeployConfigurationParameters",
-    modelProperties: {
-      branch: {
-        required: true,
-        serializedName: "properties.branch",
+      },
+      appType: {
+        serializedName: "properties.appType",
         type: {
           name: "String"
         }
       },
-      force: {
-        serializedName: "properties.force",
+      confirmation: {
+        serializedName: "properties.confirmation",
         type: {
-          name: "Boolean"
+          name: "String"
         }
       }
     }
   }
 };
 
-export const SaveConfigurationParameter: msRest.CompositeMapper = {
-  serializedName: "SaveConfigurationParameter",
+export const ConnectivityIssue: msRest.CompositeMapper = {
+  serializedName: "ConnectivityIssue",
   type: {
     name: "Composite",
-    className: "SaveConfigurationParameter",
+    className: "ConnectivityIssue",
     modelProperties: {
-      branch: {
-        required: true,
-        serializedName: "properties.branch",
+      origin: {
+        readOnly: true,
+        serializedName: "origin",
         type: {
           name: "String"
         }
       },
-      force: {
-        serializedName: "properties.force",
+      severity: {
+        readOnly: true,
+        serializedName: "severity",
         type: {
-          name: "Boolean"
+          name: "String"
+        }
+      },
+      type: {
+        readOnly: true,
+        serializedName: "type",
+        type: {
+          name: "String"
+        }
+      },
+      context: {
+        readOnly: true,
+        serializedName: "context",
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Dictionary",
+              value: {
+                type: {
+                  name: "String"
+                }
+              }
+            }
+          }
         }
       }
     }
   }
 };
 
-export const AccessInformationSecretsContract: msRest.CompositeMapper = {
-  serializedName: "AccessInformationSecretsContract",
+export const ConnectivityHop: msRest.CompositeMapper = {
+  serializedName: "ConnectivityHop",
   type: {
     name: "Composite",
-    className: "AccessInformationSecretsContract",
+    className: "ConnectivityHop",
     modelProperties: {
+      type: {
+        readOnly: true,
+        serializedName: "type",
+        type: {
+          name: "String"
+        }
+      },
       id: {
+        readOnly: true,
         serializedName: "id",
         type: {
           name: "String"
         }
       },
-      principalId: {
-        serializedName: "principalId",
+      address: {
+        readOnly: true,
+        serializedName: "address",
         type: {
           name: "String"
         }
       },
-      primaryKey: {
-        serializedName: "primaryKey",
+      resourceId: {
+        readOnly: true,
+        serializedName: "resourceId",
         type: {
           name: "String"
         }
       },
-      secondaryKey: {
-        serializedName: "secondaryKey",
+      nextHopIds: {
+        readOnly: true,
+        serializedName: "nextHopIds",
         type: {
-          name: "String"
+          name: "Sequence",
+          element: {
+            type: {
+              name: "String"
+            }
+          }
         }
       },
-      enabled: {
-        serializedName: "enabled",
+      issues: {
+        readOnly: true,
+        serializedName: "issues",
         type: {
-          name: "Boolean"
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "ConnectivityIssue"
+            }
+          }
         }
       }
     }
   }
 };
 
-export const AccessInformationContract: msRest.CompositeMapper = {
-  serializedName: "AccessInformationContract",
+export const ConnectivityCheckResponse: msRest.CompositeMapper = {
+  serializedName: "ConnectivityCheckResponse",
   type: {
     name: "Composite",
-    className: "AccessInformationContract",
+    className: "ConnectivityCheckResponse",
     modelProperties: {
-      ...Resource.type.modelProperties,
-      accessInformationContractId: {
-        serializedName: "properties.id",
+      hops: {
+        readOnly: true,
+        serializedName: "hops",
         type: {
-          name: "String"
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "ConnectivityHop"
+            }
+          }
         }
       },
-      principalId: {
-        serializedName: "properties.principalId",
+      connectionStatus: {
+        readOnly: true,
+        serializedName: "connectionStatus",
         type: {
           name: "String"
         }
       },
-      enabled: {
-        serializedName: "properties.enabled",
-        type: {
-          name: "Boolean"
-        }
-      }
-    }
-  }
-};
-
-export const AccessInformationUpdateParameters: msRest.CompositeMapper = {
-  serializedName: "AccessInformationUpdateParameters",
-  type: {
-    name: "Composite",
-    className: "AccessInformationUpdateParameters",
-    modelProperties: {
-      enabled: {
-        serializedName: "properties.enabled",
+      avgLatencyInMs: {
+        readOnly: true,
+        serializedName: "avgLatencyInMs",
         type: {
-          name: "Boolean"
+          name: "Number"
         }
-      }
-    }
-  }
-};
-
-export const AccessInformationCreateParameters: msRest.CompositeMapper = {
-  serializedName: "AccessInformationCreateParameters",
-  type: {
-    name: "Composite",
-    className: "AccessInformationCreateParameters",
-    modelProperties: {
-      principalId: {
-        serializedName: "properties.principalId",
+      },
+      minLatencyInMs: {
+        readOnly: true,
+        serializedName: "minLatencyInMs",
         type: {
-          name: "String"
+          name: "Number"
         }
       },
-      primaryKey: {
-        serializedName: "properties.primaryKey",
+      maxLatencyInMs: {
+        readOnly: true,
+        serializedName: "maxLatencyInMs",
         type: {
-          name: "String"
+          name: "Number"
         }
       },
-      secondaryKey: {
-        serializedName: "properties.secondaryKey",
+      probesSent: {
+        readOnly: true,
+        serializedName: "probesSent",
         type: {
-          name: "String"
+          name: "Number"
         }
       },
-      enabled: {
-        serializedName: "properties.enabled",
+      probesFailed: {
+        readOnly: true,
+        serializedName: "probesFailed",
         type: {
-          name: "Boolean"
+          name: "Number"
         }
       }
     }
   }
 };
 
-export const UserTokenResult: msRest.CompositeMapper = {
-  serializedName: "UserTokenResult",
+export const HTTPHeader: msRest.CompositeMapper = {
+  serializedName: "HTTPHeader",
   type: {
     name: "Composite",
-    className: "UserTokenResult",
+    className: "HTTPHeader",
     modelProperties: {
+      name: {
+        required: true,
+        serializedName: "name",
+        type: {
+          name: "String"
+        }
+      },
       value: {
+        required: true,
         serializedName: "value",
         type: {
           name: "String"
@@ -10184,202 +10238,148 @@ export const UserTokenResult: msRest.CompositeMapper = {
   }
 };
 
-export const UserTokenParameters: msRest.CompositeMapper = {
-  serializedName: "UserTokenParameters",
+export const ConnectivityCheckRequestSource: msRest.CompositeMapper = {
+  serializedName: "ConnectivityCheckRequest_source",
   type: {
     name: "Composite",
-    className: "UserTokenParameters",
+    className: "ConnectivityCheckRequestSource",
     modelProperties: {
-      keyType: {
+      region: {
         required: true,
-        serializedName: "properties.keyType",
-        defaultValue: 'primary',
+        serializedName: "region",
         type: {
-          name: "Enum",
-          allowedValues: [
-            "primary",
-            "secondary"
-          ]
+          name: "String"
         }
       },
-      expiry: {
-        required: true,
-        serializedName: "properties.expiry",
+      instance: {
+        serializedName: "instance",
         type: {
-          name: "DateTime"
+          name: "Number"
         }
       }
     }
   }
 };
 
-export const GenerateSsoUrlResult: msRest.CompositeMapper = {
-  serializedName: "GenerateSsoUrlResult",
+export const ConnectivityCheckRequestDestination: msRest.CompositeMapper = {
+  serializedName: "ConnectivityCheckRequest_destination",
   type: {
     name: "Composite",
-    className: "GenerateSsoUrlResult",
+    className: "ConnectivityCheckRequestDestination",
     modelProperties: {
-      value: {
-        serializedName: "value",
+      address: {
+        required: true,
+        serializedName: "address",
         type: {
           name: "String"
         }
+      },
+      port: {
+        required: true,
+        serializedName: "port",
+        type: {
+          name: "Number"
+        }
       }
     }
   }
 };
 
-export const UserUpdateParameters: msRest.CompositeMapper = {
-  serializedName: "UserUpdateParameters",
+export const ConnectivityCheckRequestProtocolConfigurationHTTPConfiguration: msRest.CompositeMapper = {
+  serializedName: "ConnectivityCheckRequest_protocolConfiguration_HTTPConfiguration",
   type: {
     name: "Composite",
-    className: "UserUpdateParameters",
+    className: "ConnectivityCheckRequestProtocolConfigurationHTTPConfiguration",
     modelProperties: {
-      state: {
-        serializedName: "properties.state",
-        defaultValue: 'active',
+      method: {
+        serializedName: "method",
         type: {
           name: "String"
         }
       },
-      note: {
-        serializedName: "properties.note",
+      validStatusCodes: {
+        serializedName: "validStatusCodes",
         type: {
-          name: "String"
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Number"
+            }
+          }
         }
       },
-      identities: {
-        serializedName: "properties.identities",
+      headers: {
+        serializedName: "headers",
         type: {
           name: "Sequence",
           element: {
             type: {
               name: "Composite",
-              className: "UserIdentityContract"
+              className: "HTTPHeader"
             }
           }
         }
-      },
-      email: {
-        serializedName: "properties.email",
-        constraints: {
-          MaxLength: 254,
-          MinLength: 1
-        },
-        type: {
-          name: "String"
-        }
-      },
-      password: {
-        serializedName: "properties.password",
-        type: {
-          name: "String"
-        }
-      },
-      firstName: {
-        serializedName: "properties.firstName",
-        constraints: {
-          MaxLength: 100,
-          MinLength: 1
-        },
-        type: {
-          name: "String"
-        }
-      },
-      lastName: {
-        serializedName: "properties.lastName",
-        constraints: {
-          MaxLength: 100,
-          MinLength: 1
-        },
-        type: {
-          name: "String"
-        }
       }
     }
   }
 };
 
-export const UserCreateParameters: msRest.CompositeMapper = {
-  serializedName: "UserCreateParameters",
+export const ConnectivityCheckRequestProtocolConfiguration: msRest.CompositeMapper = {
+  serializedName: "ConnectivityCheckRequest_protocolConfiguration",
   type: {
     name: "Composite",
-    className: "UserCreateParameters",
+    className: "ConnectivityCheckRequestProtocolConfiguration",
     modelProperties: {
-      state: {
-        serializedName: "properties.state",
-        defaultValue: 'active',
-        type: {
-          name: "String"
-        }
-      },
-      note: {
-        serializedName: "properties.note",
-        type: {
-          name: "String"
-        }
-      },
-      identities: {
-        serializedName: "properties.identities",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "UserIdentityContract"
-            }
-          }
-        }
-      },
-      email: {
-        required: true,
-        serializedName: "properties.email",
-        constraints: {
-          MaxLength: 254,
-          MinLength: 1
-        },
+      hTTPConfiguration: {
+        serializedName: "HTTPConfiguration",
         type: {
-          name: "String"
+          name: "Composite",
+          className: "ConnectivityCheckRequestProtocolConfigurationHTTPConfiguration"
         }
-      },
-      firstName: {
+      }
+    }
+  }
+};
+
+export const ConnectivityCheckRequest: msRest.CompositeMapper = {
+  serializedName: "ConnectivityCheckRequest",
+  type: {
+    name: "Composite",
+    className: "ConnectivityCheckRequest",
+    modelProperties: {
+      source: {
         required: true,
-        serializedName: "properties.firstName",
-        constraints: {
-          MaxLength: 100,
-          MinLength: 1
-        },
+        serializedName: "source",
         type: {
-          name: "String"
+          name: "Composite",
+          className: "ConnectivityCheckRequestSource"
         }
       },
-      lastName: {
+      destination: {
         required: true,
-        serializedName: "properties.lastName",
-        constraints: {
-          MaxLength: 100,
-          MinLength: 1
-        },
+        serializedName: "destination",
         type: {
-          name: "String"
+          name: "Composite",
+          className: "ConnectivityCheckRequestDestination"
         }
       },
-      password: {
-        serializedName: "properties.password",
+      preferredIPVersion: {
+        serializedName: "preferredIPVersion",
         type: {
           name: "String"
         }
       },
-      appType: {
-        serializedName: "properties.appType",
+      protocol: {
+        serializedName: "protocol",
         type: {
           name: "String"
         }
       },
-      confirmation: {
-        serializedName: "properties.confirmation",
+      protocolConfiguration: {
+        serializedName: "protocolConfiguration",
         type: {
-          name: "String"
+          name: "Composite",
+          className: "ConnectivityCheckRequestProtocolConfiguration"
         }
       }
     }