diff --git a/AutoRest.sln b/AutoRest.sln
index b11b89d798ca5..e9e2ddf312323 100644
--- a/AutoRest.sln
+++ b/AutoRest.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoRest.Core", "AutoRest\AutoRest.Core\AutoRest.Core.csproj", "{C876085F-9DC3-41F0-B7B4-17022CD84684}"
 EndProject
@@ -372,6 +372,14 @@ Global
 		{DA37E6A9-5D59-45A3-A809-ABA85031C369}.Portable-Debug|Any CPU.Build.0 = Portable-Debug|Any CPU
 		{DA37E6A9-5D59-45A3-A809-ABA85031C369}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU
 		{DA37E6A9-5D59-45A3-A809-ABA85031C369}.Portable-Release|Any CPU.Build.0 = Portable-Release|Any CPU
+		{654344A5-0556-49C7-BFB3-59676D7440D3}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU
+		{654344A5-0556-49C7-BFB3-59676D7440D3}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU
+		{654344A5-0556-49C7-BFB3-59676D7440D3}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU
+		{654344A5-0556-49C7-BFB3-59676D7440D3}.Net45-Release|Any CPU.Build.0 = Net45-Release|Any CPU
+		{654344A5-0556-49C7-BFB3-59676D7440D3}.Portable-Debug|Any CPU.ActiveCfg = Portable-Debug|Any CPU
+		{654344A5-0556-49C7-BFB3-59676D7440D3}.Portable-Debug|Any CPU.Build.0 = Portable-Debug|Any CPU
+		{654344A5-0556-49C7-BFB3-59676D7440D3}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU
+		{654344A5-0556-49C7-BFB3-59676D7440D3}.Portable-Release|Any CPU.Build.0 = Portable-Release|Any CPU
 		{654344A5-0556-49C7-BFB3-59676D7440D3}.Net45-Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{654344A5-0556-49C7-BFB3-59676D7440D3}.Net45-Debug|Any CPU.Build.0 = Debug|Any CPU
 		{654344A5-0556-49C7-BFB3-59676D7440D3}.Net45-Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/AutoRest/AutoRest.Core.Tests/CodeGeneratorsTests.cs b/AutoRest/AutoRest.Core.Tests/CodeGeneratorsTests.cs
index c58c81e4e6b0c..8cadb3f6414f4 100644
--- a/AutoRest/AutoRest.Core.Tests/CodeGeneratorsTests.cs
+++ b/AutoRest/AutoRest.Core.Tests/CodeGeneratorsTests.cs
@@ -86,8 +86,11 @@ public void OutputToSingleFile()
             };
 
             string path = Path.Combine(settings.OutputDirectory, "test.file.cs");
+            string existingContents = "this is dummy";
+            _fileSystem.VirtualStore[path] = new StringBuilder(existingContents);
             var codeGenerator = new SampleCodeGenerator(settings);
             codeGenerator.Generate(new ServiceClient()).GetAwaiter().GetResult();
+            Assert.DoesNotContain(existingContents, _fileSystem.VirtualStore[path].ToString());
             Assert.Equal(4, _fileSystem.VirtualStore.Count);
             Assert.True(_fileSystem.VirtualStore.ContainsKey(path));
             Assert.True(_fileSystem.VirtualStore.ContainsKey("AutoRest.json"));
diff --git a/AutoRest/AutoRest.Core/AutoRest.nuget.proj b/AutoRest/AutoRest.Core/AutoRest.nuget.proj
index 86429ba41f707..83546d434a8e4 100644
--- a/AutoRest/AutoRest.Core/AutoRest.nuget.proj
+++ b/AutoRest/AutoRest.Core/AutoRest.nuget.proj
@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <SdkNuGetPackage Include="AutoRest">
-      <PackageVersion>0.16.0$(NightlyBuildVersion)</PackageVersion>
+      <PackageVersion>0.17.0$(NightlyBuildVersion)</PackageVersion>
       <!--Want to prevent NuGet from reporting warnings
       like we are not putting assemblies under the \lib folder-->
       <NoPackageAnalysis>true</NoPackageAnalysis>
diff --git a/AutoRest/AutoRest.Core/AutoRest.nuspec b/AutoRest/AutoRest.Core/AutoRest.nuspec
index 0451285cb520a..2af544a885822 100644
--- a/AutoRest/AutoRest.Core/AutoRest.nuspec
+++ b/AutoRest/AutoRest.Core/AutoRest.nuspec
@@ -31,6 +31,7 @@
     <file src="binaries/net45/AutoRest.Generator.Azure.Ruby.dll" target="tools" />
     <file src="binaries/net45/AutoRest.Generator.Python.dll" target="tools" />
     <file src="binaries/net45/AutoRest.Generator.Azure.Python.dll" target="tools" />
+    <file src="binaries/net45/AutoRest.Generator.AzureResourceSchema.dll" target="tools" />
     <file src="binaries/net45/AutoRest.Modeler.Swagger.dll" target="tools" />
     <file src="binaries/net45/AutoRest.Modeler.CompositeSwagger.dll" target="tools" />
     <file src="binaries/net45/Newtonsoft.Json.dll" target="tools" />
diff --git a/AutoRest/AutoRest.Core/ClientModel/KnownPrimaryType.cs b/AutoRest/AutoRest.Core/ClientModel/KnownPrimaryType.cs
index 200dcfe018dfc..94dd5ffd7b726 100644
--- a/AutoRest/AutoRest.Core/ClientModel/KnownPrimaryType.cs
+++ b/AutoRest/AutoRest.Core/ClientModel/KnownPrimaryType.cs
@@ -25,6 +25,7 @@ public enum KnownPrimaryType
         Boolean,
         Credentials,
         Uuid,
-        Base64Url
+        Base64Url,
+        UnixTime
     }
 }
diff --git a/AutoRest/AutoRest.Core/CodeGenerator.cs b/AutoRest/AutoRest.Core/CodeGenerator.cs
index 8efb1c0311361..57dbecb697346 100644
--- a/AutoRest/AutoRest.Core/CodeGenerator.cs
+++ b/AutoRest/AutoRest.Core/CodeGenerator.cs
@@ -16,6 +16,7 @@ namespace Microsoft.Rest.Generator
     public abstract class CodeGenerator
     {
         public const string EnumObject = "x-ms-enum";
+        private bool firstTimeWriteSingleFile = true;
 
         protected CodeGenerator(Settings settings)
         {
@@ -99,7 +100,7 @@ public async Task Write(ITemplate template, string fileName)
         /// <returns></returns>
         public async Task Write(string template, string fileName)
         {
-            string relativeFilePath = null;
+            string filePath = null;
 
             if (Settings.OutputFileName != null)
             {
@@ -110,17 +111,19 @@ public async Task Write(string template, string fileName)
                     ErrorManager.ThrowErrors();
                 }
                 
-                relativeFilePath = Settings.OutputFileName;  
+                filePath = Path.Combine(Settings.OutputDirectory, Settings.OutputFileName);
+
+                if (firstTimeWriteSingleFile)
+                {
+                    // for SingleFileGeneration clean the file before writing only if its the first time
+                    Settings.FileSystem.DeleteFile(filePath);
+                    firstTimeWriteSingleFile = false;
+                }
             }
             else
             {
-                relativeFilePath = fileName;
-            }
-            string filePath = Path.Combine(Settings.OutputDirectory, relativeFilePath);
-
-            // cleans file before writing unless single file
-            if (!(Settings.OutputFileName != null && IsSingleFileGenerationSupported))
-            {
+                filePath = Path.Combine(Settings.OutputDirectory, fileName);
+                // cleans file before writing
                 Settings.FileSystem.DeleteFile(filePath);
             }
             // Make sure the directory exist
diff --git a/AutoRest/AutoRest.Core/Properties/AssemblyInfo.cs b/AutoRest/AutoRest.Core/Properties/AssemblyInfo.cs
index aa48e093addc2..f1686e2433161 100644
--- a/AutoRest/AutoRest.Core/Properties/AssemblyInfo.cs
+++ b/AutoRest/AutoRest.Core/Properties/AssemblyInfo.cs
@@ -11,8 +11,8 @@
 [assembly: AssemblyCompany("Microsoft Corporation")]
 [assembly: AssemblyProduct("Microsoft AutoRest")]
 [assembly: AssemblyCopyright("Copyright (c) Microsoft Corporation")]
-[assembly: AssemblyVersion("0.16.0.0")]
-[assembly: AssemblyFileVersion("0.16.0.0")]
+[assembly: AssemblyVersion("0.17.0.0")]
+[assembly: AssemblyFileVersion("0.17.0.0")]
 
 [assembly: NeutralResourcesLanguage("en")]
 [assembly: CLSCompliant(true)]
diff --git a/AutoRest/AutoRest.Core/Utilities/Extensions.cs b/AutoRest/AutoRest.Core/Utilities/Extensions.cs
index 23bea5173d9db..9a18e21f1f5b4 100644
--- a/AutoRest/AutoRest.Core/Utilities/Extensions.cs
+++ b/AutoRest/AutoRest.Core/Utilities/Extensions.cs
@@ -244,7 +244,7 @@ public static string EscapeXmlComment(this string comment)
         }
 
         /// <summary>
-        /// Returns true is the type is a PrimaryType with KnownPrimaryType matching typeToMatch.
+        /// Returns true if the type is a PrimaryType with KnownPrimaryType matching typeToMatch.
         /// </summary>
         /// <param name="type"></param>
         /// <param name="typeToMatch"></param>
@@ -263,5 +263,54 @@ public static bool IsPrimaryType(this IType type, KnownPrimaryType typeToMatch)
             }
             return false;
         }
+
+        /// <summary>
+        /// Returns true if the <paramref name="type"/> is a PrimaryType with KnownPrimaryType matching <paramref name="typeToMatch"/>
+        /// or a DictionaryType with ValueType matching <paramref name="typeToMatch"/> or a SequenceType matching <paramref name="typeToMatch"/>
+        /// </summary>
+        /// <param name="type"></param>
+        /// <param name="typeToMatch"></param>
+        /// <returns></returns>
+        public static bool IsOrContainsPrimaryType(this IType type, KnownPrimaryType typeToMatch)
+        {
+            if (type == null)
+            {
+                return false;
+            }
+
+            if (type.IsPrimaryType(typeToMatch) ||
+                type.IsDictionaryContainingType(typeToMatch) ||
+                type.IsSequenceContainingType(typeToMatch))
+            {
+                return true;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Returns true if the <paramref name="type"/> is a DictionaryType with ValueType matching <paramref name="typeToMatch"/>
+        /// </summary>
+        /// <param name="type"></param>
+        /// <param name="typeToMatch"></param>
+        /// <returns></returns>
+        public static bool IsDictionaryContainingType(this IType type, KnownPrimaryType typeToMatch)
+        {
+            DictionaryType dictionaryType = type as DictionaryType;
+            PrimaryType dictionaryPrimaryType = dictionaryType?.ValueType as PrimaryType;
+            return dictionaryPrimaryType != null && dictionaryPrimaryType.IsPrimaryType(typeToMatch);
+        }
+
+        /// <summary>
+        /// Returns true if the <paramref name="type"/>is a SequenceType matching <paramref name="typeToMatch"/>
+        /// </summary>
+        /// <param name="type"></param>
+        /// <param name="typeToMatch"></param>
+        /// <returns></returns>
+        public static bool IsSequenceContainingType(this IType type, KnownPrimaryType typeToMatch)
+        {
+            SequenceType sequenceType = type as SequenceType;
+            PrimaryType sequencePrimaryType = sequenceType?.ElementType as PrimaryType;
+            return sequencePrimaryType != null && sequencePrimaryType.IsPrimaryType(typeToMatch);
+        }
     }
 }
\ No newline at end of file
diff --git a/AutoRest/AutoRest.Core/Utilities/FileSystem.cs b/AutoRest/AutoRest.Core/Utilities/FileSystem.cs
index 91b4f6c18bdd0..13fab28c4cd4c 100644
--- a/AutoRest/AutoRest.Core/Utilities/FileSystem.cs
+++ b/AutoRest/AutoRest.Core/Utilities/FileSystem.cs
@@ -3,6 +3,7 @@
 
 using System.IO;
 using System.Net;
+using System.Text;
 
 namespace Microsoft.Rest.Generator.Utilities
 {
@@ -10,13 +11,15 @@ public class FileSystem : IFileSystem
     {
         public void WriteFile(string path, string contents)
         {
-            File.WriteAllText(path, contents);
+            File.WriteAllText(path, contents, Encoding.UTF8);
         }
 
         public string ReadFileAsText(string path)
         {
             using (var client = new WebClient())
             {
+                client.Headers.Add("User-Agent: AutoRest");
+                client.Encoding = Encoding.UTF8;
                 return client.DownloadString(path);
             }
         }
diff --git a/AutoRest/AutoRest/AutoRest.Release.json b/AutoRest/AutoRest/AutoRest.Release.json
index b488b12ca1fc8..f368702db7a63 100644
--- a/AutoRest/AutoRest/AutoRest.Release.json
+++ b/AutoRest/AutoRest/AutoRest.Release.json
@@ -29,6 +29,9 @@
     },
     "Azure.Python": {
       "type": "AzurePythonCodeGenerator, AutoRest.Generator.Azure.Python"
+    },
+    "AzureResourceSchema": {
+      "type": "AzureResourceSchemaCodeGenerator, AutoRest.Generator.AzureResourceSchema"
     }
   },
   "modelers": {
diff --git a/AutoRest/AutoRest/AutoRest.csproj b/AutoRest/AutoRest/AutoRest.csproj
index 8bd5ec84e97dd..7c578e0980acb 100644
--- a/AutoRest/AutoRest/AutoRest.csproj
+++ b/AutoRest/AutoRest/AutoRest.csproj
@@ -31,6 +31,7 @@
     <Compile Include="..\..\Tools\AssemblyVersionInfo.cs">
       <Link>Properties\AssemblyVersionInfo.cs</Link>
     </Compile>
+    <Compile Include="ExitCode.cs" />
     <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="HelpExample.cs" />
     <Compile Include="HelpGenerator.cs" />
@@ -70,4 +71,4 @@
     </Content>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/AutoRest/AutoRest/AutoRest.json b/AutoRest/AutoRest/AutoRest.json
index b488b12ca1fc8..f368702db7a63 100644
--- a/AutoRest/AutoRest/AutoRest.json
+++ b/AutoRest/AutoRest/AutoRest.json
@@ -29,6 +29,9 @@
     },
     "Azure.Python": {
       "type": "AzurePythonCodeGenerator, AutoRest.Generator.Azure.Python"
+    },
+    "AzureResourceSchema": {
+      "type": "AzureResourceSchemaCodeGenerator, AutoRest.Generator.AzureResourceSchema"
     }
   },
   "modelers": {
diff --git a/AutoRest/AutoRest/ExitCode.cs b/AutoRest/AutoRest/ExitCode.cs
new file mode 100644
index 0000000000000..fe09a82b44c21
--- /dev/null
+++ b/AutoRest/AutoRest/ExitCode.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+namespace Microsoft.Rest.Generator.Cli
+{
+    /// <summary>
+    /// Available exit codes.
+    /// </summary>
+    public enum ExitCode : int
+    {
+        Success = 0,
+        Error = 1
+    }
+}
diff --git a/AutoRest/AutoRest/Program.cs b/AutoRest/AutoRest/Program.cs
index b0c4aa7abea2b..f7bdf406b1066 100644
--- a/AutoRest/AutoRest/Program.cs
+++ b/AutoRest/AutoRest/Program.cs
@@ -12,8 +12,10 @@ namespace Microsoft.Rest.Generator.Cli
 {
     internal class Program
     {
-        private static void Main(string[] args)
+        private static int Main(string[] args)
         {
+            int exitCode = (int)ExitCode.Error;
+
             try
             {
                 Settings settings = null;
@@ -69,6 +71,7 @@ private static void Main(string[] args)
                         {
                             Console.WriteLine(Resources.GenerationComplete,
                                 settings.CodeGenerator, settings.Input);
+                            exitCode = (int)ExitCode.Success;
                         }
                     }
 
@@ -91,6 +94,7 @@ private static void Main(string[] args)
                 Console.Error.WriteLine(Resources.ConsoleErrorMessage, exception.Message);
                 Console.Error.WriteLine(Resources.ConsoleErrorStackTrace, exception.StackTrace);
             }
+            return exitCode;
         }
 
         /// <summary>
diff --git a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/AcceptanceTests.cs b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/AcceptanceTests.cs
new file mode 100644
index 0000000000000..97cbab6189e36
--- /dev/null
+++ b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/AcceptanceTests.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using Microsoft.Rest.Generator.AzureResourceSchema;
+using Microsoft.Rest.Modeler.Swagger.Tests;
+using System.IO;
+using Xunit;
+
+namespace AutoRest.Generator.AzureResourceSchema.Tests
+{
+    [Collection("AutoRest Azure Resource Schema Tests")]
+    public static class AcceptanceTests
+    {
+        [Fact]
+        public static void Storage()
+        {
+            RunSwaggerTest("storage.json", "Storage");
+        }
+
+        [Fact]
+        public static void Batch()
+        {
+            RunSwaggerTest("BatchManagement.json", "Batch");
+        }
+
+        [Fact]
+        public static void Cdn()
+        {
+            RunSwaggerTest("cdn.json", "CDN");
+        }
+
+        [Fact]
+        public static void Compute()
+        {
+            RunSwaggerTest("compute.json", "Compute");
+        }
+
+        [Fact]
+        public static void Network()
+        {
+            RunSwaggerTest("network.json", "Network");
+        }
+
+        [Fact]
+        public static void Web()
+        {
+            RunSwaggerTest("web.json", "Web");
+        }
+
+        private static void RunSwaggerTest(string swaggerFileName, string expectedFolderName)
+        {
+            SwaggerSpecHelper.RunTests<AzureResourceSchemaCodeGenerator>(
+                Path.Combine("Swagger", swaggerFileName),
+                Path.Combine("Expected", expectedFolderName));
+        }
+    }
+}
diff --git a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/AutoRest.Generator.AzureResourceSchema.Tests.csproj b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/AutoRest.Generator.AzureResourceSchema.Tests.csproj
index 079278b9d781b..3624fde45de91 100644
--- a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/AutoRest.Generator.AzureResourceSchema.Tests.csproj
+++ b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/AutoRest.Generator.AzureResourceSchema.Tests.csproj
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
+  <Import Project="..\..\..\..\packages\xunit.core.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.core.props" Condition="Exists('..\..\..\..\packages\xunit.core.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.core.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -8,6 +9,7 @@
     <ProjectGuid>{1C3B4A33-E045-4C8F-9202-1B651A686567}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Microsoft.Rest.Generator.AzureResourceSchema.Tests</RootNamespace>
     <RootNamespace>AutoRest.Generator.AzureResourceSchema.Tests</RootNamespace>
     <AssemblyName>AutoRest.Generator.AzureResourceSchema.Tests</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
@@ -33,6 +35,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -42,40 +48,104 @@
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
     <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
+      <HintPath>..\..\..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
+      <HintPath>..\..\..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
+      <HintPath>..\..\..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
+      <HintPath>..\..\..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="AcceptanceTests.cs" />
+    <Compile Include="AzureResourceSchemaCodeGeneratorTests.cs" />
+    <Compile Include="JSONSchemaTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ResourceSchemaParserTests.cs" />
+    <Compile Include="ResourceSchemaWriterTests.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\AutoRest.Core\AutoRest.Core.csproj">
+      <Project>{c876085f-9dc3-41f0-b7b4-17022cd84684}</Project>
+      <Name>AutoRest.Core</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <Content Include="Expected\Storage\Microsoft.Storage.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Expected\Batch\Microsoft.Batch.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Expected\CDN\Microsoft.Cdn.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Expected\Compute\Microsoft.Compute.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Expected\Network\Microsoft.Network.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Expected\Web\Microsoft.Web.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Expected\Web\Microsoft.DomainRegistration.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Expected\Web\Microsoft.CertificateRegistration.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <None Include="packages.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <Content Include="Swagger\storage.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Swagger\BatchManagement.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Swagger\cdn.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Swagger\compute.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Swagger\network.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Swagger\web.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\Modelers\Swagger.Tests\AutoRest.Modeler.Swagger.Tests.csproj">
+      <Project>{c6c4e139-d7af-486c-95ba-2b879f58f18d}</Project>
+      <Name>AutoRest.Modeler.Swagger.Tests</Name>
+    </ProjectReference>
     <ProjectReference Include="..\AzureResourceSchema\AutoRest.Generator.AzureResourceSchema.csproj">
       <Project>{654344a5-0556-49c7-bfb3-59676d7440d3}</Project>
       <Name>AutoRest.Generator.AzureResourceSchema</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/AzureResourceSchemaCodeGeneratorTests.cs b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/AzureResourceSchemaCodeGeneratorTests.cs
new file mode 100644
index 0000000000000..fcdec9851ab6c
--- /dev/null
+++ b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/AzureResourceSchemaCodeGeneratorTests.cs
@@ -0,0 +1,103 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using Microsoft.Rest.Generator.ClientModel;
+using Microsoft.Rest.Generator.Utilities;
+using Newtonsoft.Json.Linq;
+using System.Linq;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.Rest.Generator.AzureResourceSchema.Tests
+{
+    [Collection("AutoRest Tests")]
+    public class AzureResourceSchemaCodeGeneratorTests
+    {
+        [Fact]
+        public void Description()
+        {
+            Assert.Equal("Azure Resource Schema generator", CreateGenerator().Description);
+        }
+
+        [Fact]
+        public void ImplementationFileExtension()
+        {
+            Assert.Equal(".json", CreateGenerator().ImplementationFileExtension);
+        }
+
+        [Fact]
+        public void Name()
+        {
+            Assert.Equal("AzureResourceSchema", CreateGenerator().Name);
+        }
+
+        [Fact]
+        public void UsageInstructionsWithNoOutputFileSetting()
+        {
+            AzureResourceSchemaCodeGenerator codeGen = CreateGenerator();
+            Assert.Equal("Your Azure Resource Schema(s) can be found in " + codeGen.Settings.OutputDirectory, codeGen.UsageInstructions);
+        }
+
+        [Fact]
+        public void UsageInstructionsWithOutputFileSetting()
+        {
+            Settings settings = new Settings()
+            {
+                OutputFileName = "spam.json"
+            };
+            AzureResourceSchemaCodeGenerator codeGen = CreateGenerator(settings);
+
+            Assert.Equal("Your Azure Resource Schema(s) can be found in " + settings.OutputDirectory, codeGen.UsageInstructions);
+        }
+
+        [Fact]
+        public void NormalizeClientModelDoesNothing()
+        {
+            ServiceClient serviceClient = new ServiceClient();
+            CreateGenerator().NormalizeClientModel(serviceClient);
+
+            // Nothing happens
+        }
+
+        private static AzureResourceSchemaCodeGenerator CreateGenerator()
+        {
+            return CreateGenerator(new Settings());
+        }
+        private static AzureResourceSchemaCodeGenerator CreateGenerator(Settings settings)
+        {
+            return new AzureResourceSchemaCodeGenerator(settings);
+        }
+
+        private static async Task TestGenerate(string apiVersion, string[] methodUrls, string expectedJsonString)
+        {
+            MemoryFileSystem fileSystem = new MemoryFileSystem();
+
+            Settings settings = new Settings();
+            settings.FileSystem = fileSystem;
+
+            ServiceClient serviceClient = new ServiceClient();
+            serviceClient.ApiVersion = apiVersion;
+            foreach(string methodUrl in methodUrls)
+            {
+                serviceClient.Methods.Add(new Method()
+                {
+                    Url = methodUrl,
+                    HttpMethod = HttpMethod.Put,
+                });
+            }
+            await CreateGenerator(settings).Generate(serviceClient);
+
+            Assert.Equal(2, fileSystem.VirtualStore.Count);
+
+            string folderPath = fileSystem.VirtualStore.Keys.First();
+            Assert.Equal("Folder", fileSystem.VirtualStore[folderPath].ToString());
+
+            JObject expectedJSON = JObject.Parse(expectedJsonString);
+
+            string fileContents = fileSystem.VirtualStore[fileSystem.VirtualStore.Keys.Skip(1).First()].ToString();
+            JObject actualJson = JObject.Parse(fileContents);
+
+            Assert.Equal(expectedJSON, actualJson);
+        }
+    }
+}
diff --git a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/Expected/Batch/Microsoft.Batch.json b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/Expected/Batch/Microsoft.Batch.json
new file mode 100644
index 0000000000000..e35a69c99b6cc
--- /dev/null
+++ b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/Expected/Batch/Microsoft.Batch.json
@@ -0,0 +1,92 @@
+{
+  "id": "http://schema.management.azure.com/schemas/2015-12-01/Microsoft.Batch.json#",
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Microsoft.Batch",
+  "description": "Microsoft Batch Resource Types",
+  "resourceDefinitions": {
+    "Microsoft.Batch_batchAccounts": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Batch/batchAccounts"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-12-01"
+          ]
+        },
+        "location": {
+          "type": "string",
+          "description": "The region in which the account is created."
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "The user specified tags associated with the account."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/AccountBaseProperties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "The properties of the account."
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Batch/batchAccounts"
+    }
+  },
+  "definitions": {
+    "AccountBaseProperties": {
+      "type": "object",
+      "properties": {
+        "autoStorage": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/AutoStorageBaseProperties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "The properties related to auto storage account."
+        }
+      },
+      "description": "The properties of a Batch account."
+    },
+    "AutoStorageBaseProperties": {
+      "type": "object",
+      "properties": {
+        "storageAccountId": {
+          "type": "string",
+          "description": "The resource id of the storage account to be used for auto storage account."
+        }
+      },
+      "required": [
+        "storageAccountId"
+      ],
+      "description": "The properties related to auto storage account."
+    }
+  }
+}
diff --git a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/Expected/CDN/Microsoft.Cdn.json b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/Expected/CDN/Microsoft.Cdn.json
new file mode 100644
index 0000000000000..bf7c8c6821a9e
--- /dev/null
+++ b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/Expected/CDN/Microsoft.Cdn.json
@@ -0,0 +1,556 @@
+{
+  "id": "http://schema.management.azure.com/schemas/2016-04-02/Microsoft.Cdn.json#",
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Microsoft.Cdn",
+  "description": "Microsoft Cdn Resource Types",
+  "resourceDefinitions": {
+    "Microsoft.Cdn_profiles": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Cdn/profiles"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2016-04-02"
+          ]
+        },
+        "location": {
+          "type": "string",
+          "description": "Profile location"
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Profile tags"
+        },
+        "sku": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Sku"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "The SKU (pricing tier) of the CDN profile."
+        }
+      },
+      "resources": {
+        "type": "array",
+        "items": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Microsoft.Cdn_profiles_endpoints_childResource"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "location",
+        "sku"
+      ],
+      "description": "Microsoft.Cdn/profiles"
+    },
+    "Microsoft.Cdn_profiles_endpoints": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Cdn/profiles/endpoints"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2016-04-02"
+          ]
+        },
+        "location": {
+          "type": "string",
+          "description": "Endpoint location"
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Endpoint tags"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/EndpointPropertiesCreateParameters"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "resources": {
+        "type": "array",
+        "items": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Microsoft.Cdn_profiles_endpoints_customDomains_childResource"
+            },
+            {
+              "$ref": "#/definitions/Microsoft.Cdn_profiles_endpoints_origins_childResource"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties",
+        "location"
+      ],
+      "description": "Microsoft.Cdn/profiles/endpoints"
+    },
+    "Microsoft.Cdn_profiles_endpoints_customDomains": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Cdn/profiles/endpoints/customDomains"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2016-04-02"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/CustomDomainPropertiesParameters"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Cdn/profiles/endpoints/customDomains"
+    },
+    "Microsoft.Cdn_profiles_endpoints_origins": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Cdn/profiles/endpoints/origins"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2016-04-02"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/OriginPropertiesParameters"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Cdn/profiles/endpoints/origins"
+    }
+  },
+  "definitions": {
+    "CustomDomainPropertiesParameters": {
+      "type": "object",
+      "properties": {
+        "hostName": {
+          "type": "string",
+          "description": "The host name of the custom domain. Must be a domain name."
+        }
+      },
+      "required": [
+        "hostName"
+      ]
+    },
+    "DeepCreatedOrigin": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Origin name"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/DeepCreatedOriginProperties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "name"
+      ],
+      "description": "Deep created origins within a CDN endpoint."
+    },
+    "DeepCreatedOriginProperties": {
+      "type": "object",
+      "properties": {
+        "hostName": {
+          "type": "string",
+          "description": "The address of the origin. Domain names, IPv4 addresses, and IPv6 addresses are supported."
+        },
+        "httpPort": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "The value of the HTTP port. Must be between 1 and 65535"
+        },
+        "httpsPort": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "The value of the HTTPS port. Must be between 1 and 65535"
+        }
+      },
+      "required": [
+        "hostName"
+      ],
+      "description": "Properties of deep created origin on a CDN endpoint."
+    },
+    "EndpointPropertiesCreateParameters": {
+      "type": "object",
+      "properties": {
+        "originHostHeader": {
+          "type": "string",
+          "description": "The host header CDN provider will send along with content requests to origins. The default value is the host name of the origin."
+        },
+        "originPath": {
+          "type": "string",
+          "description": "The path used for origin requests."
+        },
+        "contentTypesToCompress": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "List of content types on which compression will be applied. The value for the elements should be a valid MIME type."
+        },
+        "isCompressionEnabled": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Indicates whether content compression is enabled. Default value is false. If compression is enabled, the content transferred from the CDN endpoint to the end user will be compressed. The requested content must be larger than 1 byte and smaller than 1 MB."
+        },
+        "isHttpAllowed": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Indicates whether HTTP traffic is allowed on the endpoint. Default value is true. At least one protocol (HTTP or HTTPS) must be allowed."
+        },
+        "isHttpsAllowed": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Indicates whether https traffic is allowed on the endpoint. Default value is true. At least one protocol (HTTP or HTTPS) must be allowed."
+        },
+        "queryStringCachingBehavior": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "IgnoreQueryString",
+                "BypassCaching",
+                "UseQueryString",
+                "NotSet"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Defines the query string caching behavior. Possible values include: 'IgnoreQueryString', 'BypassCaching', 'UseQueryString', 'NotSet'"
+        },
+        "origins": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/DeepCreatedOrigin"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "The set of origins for the CDN endpoint. When multiple origins exist, the first origin will be used as primary and rest will be used as failover options."
+        }
+      },
+      "required": [
+        "origins"
+      ]
+    },
+    "Microsoft.Cdn_profiles_endpoints_childResource": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "endpoints"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2016-04-02"
+          ]
+        },
+        "location": {
+          "type": "string",
+          "description": "Endpoint location"
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Endpoint tags"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/EndpointPropertiesCreateParameters"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "resources": {
+        "type": "array",
+        "items": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Microsoft.Cdn_profiles_endpoints_customDomains_childResource"
+            },
+            {
+              "$ref": "#/definitions/Microsoft.Cdn_profiles_endpoints_origins_childResource"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties",
+        "location"
+      ],
+      "description": "Microsoft.Cdn/profiles/endpoints"
+    },
+    "Microsoft.Cdn_profiles_endpoints_customDomains_childResource": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "customDomains"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2016-04-02"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/CustomDomainPropertiesParameters"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Cdn/profiles/endpoints/customDomains"
+    },
+    "Microsoft.Cdn_profiles_endpoints_origins_childResource": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "origins"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2016-04-02"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/OriginPropertiesParameters"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Cdn/profiles/endpoints/origins"
+    },
+    "OriginPropertiesParameters": {
+      "type": "object",
+      "properties": {
+        "hostName": {
+          "type": "string",
+          "description": "The address of the origin. Domain names, IPv4 addresses, and IPv6 addresses are supported."
+        },
+        "httpPort": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "The value of the HTTP port. Must be between 1 and 65535."
+        },
+        "httpsPort": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "The value of the HTTPS port. Must be between 1 and 65535."
+        }
+      },
+      "required": [
+        "hostName"
+      ]
+    },
+    "Sku": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Standard_Verizon",
+                "Premium_Verizon",
+                "Custom_Verizon",
+                "Standard_Akamai"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Name of the pricing tier. Possible values include: 'Standard_Verizon', 'Premium_Verizon', 'Custom_Verizon', 'Standard_Akamai'"
+        }
+      },
+      "description": "The SKU (pricing tier) of the CDN profile."
+    }
+  }
+}
diff --git a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/Expected/Compute/Microsoft.Compute.json b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/Expected/Compute/Microsoft.Compute.json
new file mode 100644
index 0000000000000..d6cf3e64556cb
--- /dev/null
+++ b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/Expected/Compute/Microsoft.Compute.json
@@ -0,0 +1,1976 @@
+{
+  "id": "http://schema.management.azure.com/schemas/2016-03-30/Microsoft.Compute.json#",
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Microsoft.Compute",
+  "description": "Microsoft Compute Resource Types",
+  "resourceDefinitions": {
+    "Microsoft.Compute_availabilitySets": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Compute/availabilitySets"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2016-03-30"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/AvailabilitySetProperties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Compute/availabilitySets"
+    },
+    "Microsoft.Compute_virtualMachines": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Compute/virtualMachines"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2016-03-30"
+          ]
+        },
+        "plan": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Plan"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the purchase plan when deploying virtual machine from VM Marketplace images."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VirtualMachineProperties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "resources": {
+        "type": "array",
+        "items": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Microsoft.Compute_virtualMachines_extensions_childResource"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Compute/virtualMachines"
+    },
+    "Microsoft.Compute_virtualMachines_extensions": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Compute/virtualMachines/extensions"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2016-03-30"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VirtualMachineExtensionProperties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Compute/virtualMachines/extensions"
+    },
+    "Microsoft.Compute_virtualMachineScaleSets": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Compute/virtualMachineScaleSets"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2016-03-30"
+          ]
+        },
+        "sku": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Sku"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the virtual machine scale set sku."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VirtualMachineScaleSetProperties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Compute/virtualMachineScaleSets"
+    }
+  },
+  "definitions": {
+    "AdditionalUnattendContent": {
+      "type": "object",
+      "properties": {
+        "passName": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "oobeSystem"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the pass name. Currently, the only allowable value is oobeSystem. Possible values include: 'oobeSystem'"
+        },
+        "componentName": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Microsoft-Windows-Shell-Setup"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the component name. Currently, the only allowable value is Microsoft-Windows-Shell-Setup. Possible values include: 'Microsoft-Windows-Shell-Setup'"
+        },
+        "settingName": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "AutoLogon",
+                "FirstLogonCommands"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets setting name (e.g. FirstLogonCommands, AutoLogon ). Possible values include: 'AutoLogon', 'FirstLogonCommands'"
+        },
+        "content": {
+          "type": "string",
+          "description": "Gets or sets XML formatted content that is added to the unattend.xml file in the specified pass and component.The XML must be less than 4 KB and must include the root element for the setting or feature that is being inserted."
+        }
+      },
+      "description": "Gets or sets additional XML formatted information that can be included in the Unattend.xml file, which is used by Windows Setup. Contents are defined by setting name, component name, and the pass in which the content is a applied."
+    },
+    "ApiEntityReference": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Gets or sets the ARM resource id in the form of /subscriptions/{SubcriptionId}/resourceGroups/{ResourceGroupName}/..."
+        }
+      },
+      "description": "The API entity reference."
+    },
+    "AvailabilitySetProperties": {
+      "type": "object",
+      "properties": {
+        "platformUpdateDomainCount": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets Update Domain count."
+        },
+        "platformFaultDomainCount": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets Fault Domain count."
+        },
+        "virtualMachines": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/SubResource"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets a list containing reference to all Virtual Machines created under this Availability Set."
+        },
+        "statuses": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/InstanceViewStatus"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the resource status information."
+        }
+      },
+      "description": "The instance view of a resource."
+    },
+    "BootDiagnostics": {
+      "type": "object",
+      "properties": {
+        "enabled": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets whether boot diagnostics should be enabled on the Virtual Machine."
+        },
+        "storageUri": {
+          "type": "string",
+          "description": "Gets or sets the boot diagnostics storage Uri. It should be a valid Uri"
+        }
+      },
+      "description": "Describes Boot Diagnostics."
+    },
+    "DataDisk": {
+      "type": "object",
+      "properties": {
+        "lun": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the logical unit number."
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets or sets the disk name."
+        },
+        "vhd": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VirtualHardDisk"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the Virtual Hard Disk."
+        },
+        "image": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VirtualHardDisk"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the Source User Image VirtualHardDisk. This VirtualHardDisk will be copied before using it to attach to the Virtual Machine.If SourceImage is provided, the destination VirtualHardDisk should not exist."
+        },
+        "caching": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "None",
+                "ReadOnly",
+                "ReadWrite"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the caching type. Possible values include: 'None', 'ReadOnly', 'ReadWrite'"
+        },
+        "createOption": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "fromImage",
+                "empty",
+                "attach"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the create option. Possible values include: 'fromImage', 'empty', 'attach'"
+        },
+        "diskSizeGB": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the initial disk size in GB for blank data disks, and the new desired size for existing OS and Data disks."
+        }
+      },
+      "required": [
+        "lun",
+        "name",
+        "vhd",
+        "createOption"
+      ],
+      "description": "Describes a data disk."
+    },
+    "DiagnosticsProfile": {
+      "type": "object",
+      "properties": {
+        "bootDiagnostics": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/BootDiagnostics"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the boot diagnostics."
+        }
+      },
+      "description": "Describes a diagnostics profile."
+    },
+    "DiskEncryptionSettings": {
+      "type": "object",
+      "properties": {
+        "diskEncryptionKey": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/KeyVaultSecretReference"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the disk encryption key which is a KeyVault Secret."
+        },
+        "keyEncryptionKey": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/KeyVaultKeyReference"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the key encryption key which is KeyVault Key."
+        },
+        "enabled": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets whether disk encryption should be enabled on the Virtual Machine."
+        }
+      },
+      "description": "Describes a Encryption Settings for a Disk"
+    },
+    "HardwareProfile": {
+      "type": "object",
+      "properties": {
+        "vmSize": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Basic_A0",
+                "Basic_A1",
+                "Basic_A2",
+                "Basic_A3",
+                "Basic_A4",
+                "Standard_A0",
+                "Standard_A1",
+                "Standard_A2",
+                "Standard_A3",
+                "Standard_A4",
+                "Standard_A5",
+                "Standard_A6",
+                "Standard_A7",
+                "Standard_A8",
+                "Standard_A9",
+                "Standard_A10",
+                "Standard_A11",
+                "Standard_D1",
+                "Standard_D2",
+                "Standard_D3",
+                "Standard_D4",
+                "Standard_D11",
+                "Standard_D12",
+                "Standard_D13",
+                "Standard_D14",
+                "Standard_D1_v2",
+                "Standard_D2_v2",
+                "Standard_D3_v2",
+                "Standard_D4_v2",
+                "Standard_D5_v2",
+                "Standard_D11_v2",
+                "Standard_D12_v2",
+                "Standard_D13_v2",
+                "Standard_D14_v2",
+                "Standard_D15_v2",
+                "Standard_DS1",
+                "Standard_DS2",
+                "Standard_DS3",
+                "Standard_DS4",
+                "Standard_DS11",
+                "Standard_DS12",
+                "Standard_DS13",
+                "Standard_DS14",
+                "Standard_DS1_v2",
+                "Standard_DS2_v2",
+                "Standard_DS3_v2",
+                "Standard_DS4_v2",
+                "Standard_DS5_v2",
+                "Standard_DS11_v2",
+                "Standard_DS12_v2",
+                "Standard_DS13_v2",
+                "Standard_DS14_v2",
+                "Standard_DS15_v2",
+                "Standard_G1",
+                "Standard_G2",
+                "Standard_G3",
+                "Standard_G4",
+                "Standard_G5",
+                "Standard_GS1",
+                "Standard_GS2",
+                "Standard_GS3",
+                "Standard_GS4",
+                "Standard_GS5"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "The virtual machine size name. Possible values include: 'Basic_A0', 'Basic_A1', 'Basic_A2', 'Basic_A3', 'Basic_A4', 'Standard_A0', 'Standard_A1', 'Standard_A2', 'Standard_A3', 'Standard_A4', 'Standard_A5', 'Standard_A6', 'Standard_A7', 'Standard_A8', 'Standard_A9', 'Standard_A10', 'Standard_A11', 'Standard_D1', 'Standard_D2', 'Standard_D3', 'Standard_D4', 'Standard_D11', 'Standard_D12', 'Standard_D13', 'Standard_D14', 'Standard_D1_v2', 'Standard_D2_v2', 'Standard_D3_v2', 'Standard_D4_v2', 'Standard_D5_v2', 'Standard_D11_v2', 'Standard_D12_v2', 'Standard_D13_v2', 'Standard_D14_v2', 'Standard_D15_v2', 'Standard_DS1', 'Standard_DS2', 'Standard_DS3', 'Standard_DS4', 'Standard_DS11', 'Standard_DS12', 'Standard_DS13', 'Standard_DS14', 'Standard_DS1_v2', 'Standard_DS2_v2', 'Standard_DS3_v2', 'Standard_DS4_v2', 'Standard_DS5_v2', 'Standard_DS11_v2', 'Standard_DS12_v2', 'Standard_DS13_v2', 'Standard_DS14_v2', 'Standard_DS15_v2', 'Standard_G1', 'Standard_G2', 'Standard_G3', 'Standard_G4', 'Standard_G5', 'Standard_GS1', 'Standard_GS2', 'Standard_GS3', 'Standard_GS4', 'Standard_GS5'"
+        }
+      },
+      "description": "Describes a hardware profile."
+    },
+    "ImageReference": {
+      "type": "object",
+      "properties": {
+        "publisher": {
+          "type": "string",
+          "description": "Gets or sets the image publisher."
+        },
+        "offer": {
+          "type": "string",
+          "description": "Gets or sets the image offer."
+        },
+        "sku": {
+          "type": "string",
+          "description": "Gets or sets the image sku."
+        },
+        "version": {
+          "type": "string",
+          "description": "Gets or sets the image version. The allowed formats are Major.Minor.Build or 'latest'. Major, Minor and Build being decimal numbers. Specify 'latest' to use the latest version of image."
+        }
+      },
+      "description": "The image reference."
+    },
+    "InstanceViewStatus": {
+      "type": "object",
+      "properties": {
+        "code": {
+          "type": "string",
+          "description": "Gets the status Code."
+        },
+        "level": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Info",
+                "Warning",
+                "Error"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the level Code. Possible values include: 'Info', 'Warning', 'Error'"
+        },
+        "displayStatus": {
+          "type": "string",
+          "description": "Gets or sets the short localizable label for the status."
+        },
+        "message": {
+          "type": "string",
+          "description": "Gets or sets the detailed Message, including for alerts and error messages."
+        },
+        "time": {
+          "type": "string",
+          "description": "Gets or sets the time of the status."
+        }
+      },
+      "description": "Instance view status."
+    },
+    "KeyVaultKeyReference": {
+      "type": "object",
+      "properties": {
+        "keyUrl": {
+          "type": "string",
+          "description": "Gets or sets the URL referencing a key in a Key Vault."
+        },
+        "sourceVault": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SubResource"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the Relative URL of the Key Vault containing the key"
+        }
+      },
+      "required": [
+        "keyUrl",
+        "sourceVault"
+      ],
+      "description": "Describes a reference to Key Vault Key"
+    },
+    "KeyVaultSecretReference": {
+      "type": "object",
+      "properties": {
+        "secretUrl": {
+          "type": "string",
+          "description": "Gets or sets the URL referencing a secret in a Key Vault."
+        },
+        "sourceVault": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SubResource"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the Relative URL of the Key Vault containing the secret."
+        }
+      },
+      "required": [
+        "secretUrl",
+        "sourceVault"
+      ],
+      "description": "Describes a reference to Key Vault Secret"
+    },
+    "LinuxConfiguration": {
+      "type": "object",
+      "properties": {
+        "disablePasswordAuthentication": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets whether Authentication using user name and password is allowed or not"
+        },
+        "ssh": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SshConfiguration"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the SSH configuration for linux VMs"
+        }
+      },
+      "description": "Describes Windows Configuration of the OS Profile."
+    },
+    "Microsoft.Compute_virtualMachines_extensions_childResource": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "extensions"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2016-03-30"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VirtualMachineExtensionProperties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Compute/virtualMachines/extensions"
+    },
+    "NetworkInterfaceReference": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/NetworkInterfaceReferenceProperties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "description": "Describes a network interface reference."
+    },
+    "NetworkInterfaceReferenceProperties": {
+      "type": "object",
+      "properties": {
+        "primary": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets whether this is a primary NIC on a virtual machine"
+        }
+      },
+      "description": "Describes a network interface reference properties."
+    },
+    "NetworkProfile": {
+      "type": "object",
+      "properties": {
+        "networkInterfaces": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/NetworkInterfaceReference"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the network interfaces."
+        }
+      },
+      "description": "Describes a network profile."
+    },
+    "OSDisk": {
+      "type": "object",
+      "properties": {
+        "osType": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Windows",
+                "Linux"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the Operating System type. Possible values include: 'Windows', 'Linux'"
+        },
+        "encryptionSettings": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/DiskEncryptionSettings"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the disk encryption settings."
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets or sets the disk name."
+        },
+        "vhd": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VirtualHardDisk"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the Virtual Hard Disk."
+        },
+        "image": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VirtualHardDisk"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the Source User Image VirtualHardDisk. This VirtualHardDisk will be copied before using it to attach to the Virtual Machine.If SourceImage is provided, the destination VirtualHardDisk should not exist."
+        },
+        "caching": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "None",
+                "ReadOnly",
+                "ReadWrite"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the caching type. Possible values include: 'None', 'ReadOnly', 'ReadWrite'"
+        },
+        "createOption": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "fromImage",
+                "empty",
+                "attach"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the create option. Possible values include: 'fromImage', 'empty', 'attach'"
+        },
+        "diskSizeGB": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the initial disk size in GB for blank data disks, and the new desired size for existing OS and Data disks."
+        }
+      },
+      "required": [
+        "name",
+        "vhd",
+        "createOption"
+      ],
+      "description": "Describes an Operating System disk."
+    },
+    "OSProfile": {
+      "type": "object",
+      "properties": {
+        "computerName": {
+          "type": "string",
+          "description": "Gets or sets the computer name."
+        },
+        "adminUsername": {
+          "type": "string",
+          "description": "Gets or sets the admin user name."
+        },
+        "adminPassword": {
+          "type": "string",
+          "description": "Gets or sets the admin user password."
+        },
+        "customData": {
+          "type": "string",
+          "description": "Gets or sets a base-64 encoded string of custom data."
+        },
+        "windowsConfiguration": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/WindowsConfiguration"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the Windows Configuration of the OS profile."
+        },
+        "linuxConfiguration": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/LinuxConfiguration"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the Linux Configuration of the OS profile."
+        },
+        "secrets": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/VaultSecretGroup"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the List of certificates for addition to the VM."
+        }
+      },
+      "description": "Describes an OS profile."
+    },
+    "Plan": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Gets or sets the plan ID."
+        },
+        "publisher": {
+          "type": "string",
+          "description": "Gets or sets the publisher ID."
+        },
+        "product": {
+          "type": "string",
+          "description": "Gets or sets the offer ID."
+        },
+        "promotionCode": {
+          "type": "string",
+          "description": "Gets or sets the promotion code."
+        }
+      },
+      "description": "Plan for the resource."
+    },
+    "Sku": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Gets or sets the sku name."
+        },
+        "tier": {
+          "type": "string",
+          "description": "Gets or sets the sku tier."
+        },
+        "capacity": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the sku capacity."
+        }
+      },
+      "description": "Describes a virtual machine scale set sku."
+    },
+    "SshConfiguration": {
+      "type": "object",
+      "properties": {
+        "publicKeys": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/SshPublicKey"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the list of SSH public keys used to authenticate with linux based VMs"
+        }
+      },
+      "description": "SSH configuration for Linux based VMs running on Azure"
+    },
+    "SshPublicKey": {
+      "type": "object",
+      "properties": {
+        "path": {
+          "type": "string",
+          "description": "Gets or sets the full path on the created VM where SSH public key is stored. If the file already exists, the specified key is appended to the file."
+        },
+        "keyData": {
+          "type": "string",
+          "description": "Gets or sets Certificate public key used to authenticate with VM through SSH.The certificate must be in Pem format with or without headers."
+        }
+      },
+      "description": "Contains information about SSH certificate public key and the path on the Linux VM where the public key is placed."
+    },
+    "StorageProfile": {
+      "type": "object",
+      "properties": {
+        "imageReference": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ImageReference"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the image reference."
+        },
+        "osDisk": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/OSDisk"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the OS disk."
+        },
+        "dataDisks": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/DataDisk"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the data disks."
+        }
+      },
+      "description": "Describes a storage profile."
+    },
+    "SubResource": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        }
+      }
+    },
+    "UpgradePolicy": {
+      "type": "object",
+      "properties": {
+        "mode": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Automatic",
+                "Manual"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the upgrade mode. Possible values include: 'Automatic', 'Manual'"
+        }
+      },
+      "description": "Describes an upgrade policy - automatic or manual."
+    },
+    "VaultCertificate": {
+      "type": "object",
+      "properties": {
+        "certificateUrl": {
+          "type": "string",
+          "description": "Gets or sets the URL referencing a secret in a Key Vault which contains a properly formatted certificate."
+        },
+        "certificateStore": {
+          "type": "string",
+          "description": "Gets or sets the Certificate store in LocalMachine to add the certificate to on Windows, leave empty on Linux."
+        }
+      },
+      "description": "Describes a single certificate reference in a Key Vault, and where the certificate should reside on the VM."
+    },
+    "VaultSecretGroup": {
+      "type": "object",
+      "properties": {
+        "sourceVault": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SubResource"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the Relative URL of the Key Vault containing all of the certificates in VaultCertificates."
+        },
+        "vaultCertificates": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/VaultCertificate"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the list of key vault references in SourceVault which contain certificates"
+        }
+      },
+      "description": "Describes a set of certificates which are all in the same Key Vault."
+    },
+    "VirtualHardDisk": {
+      "type": "object",
+      "properties": {
+        "uri": {
+          "type": "string",
+          "description": "Gets or sets the virtual hard disk's uri. It should be a valid Uri to a virtual hard disk."
+        }
+      },
+      "description": "Describes the uri of a disk."
+    },
+    "VirtualMachineExtensionInstanceView": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Gets or sets the virtual machine extension name."
+        },
+        "type": {
+          "type": "string",
+          "description": "Gets or sets the full type of the extension handler which includes both publisher and type."
+        },
+        "typeHandlerVersion": {
+          "type": "string",
+          "description": "Gets or sets the type version of the extension handler."
+        },
+        "substatuses": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/InstanceViewStatus"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the resource status information."
+        },
+        "statuses": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/InstanceViewStatus"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the resource status information."
+        }
+      },
+      "description": "The instance view of a virtual machine extension."
+    },
+    "VirtualMachineExtensionProperties": {
+      "type": "object",
+      "properties": {
+        "forceUpdateTag": {
+          "type": "string",
+          "description": "Gets or sets how the extension handler should be forced to update even if the extension configuration has not changed."
+        },
+        "publisher": {
+          "type": "string",
+          "description": "Gets or sets the name of the extension handler publisher."
+        },
+        "type": {
+          "type": "string",
+          "description": "Gets or sets the type of the extension handler."
+        },
+        "typeHandlerVersion": {
+          "type": "string",
+          "description": "Gets or sets the type version of the extension handler."
+        },
+        "autoUpgradeMinorVersion": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets whether the extension handler should be automatically upgraded across minor versions."
+        },
+        "settings": {
+          "oneOf": [
+            {
+              "type": "object"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets Json formatted public settings for the extension."
+        },
+        "protectedSettings": {
+          "oneOf": [
+            {
+              "type": "object"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets Json formatted protected settings for the extension."
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets the provisioning state, which only appears in the response."
+        },
+        "instanceView": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VirtualMachineExtensionInstanceView"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the virtual machine extension instance view."
+        }
+      },
+      "description": "Describes the properties of a Virtual Machine Extension."
+    },
+    "VirtualMachineProperties": {
+      "type": "object",
+      "properties": {
+        "hardwareProfile": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/HardwareProfile"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the hardware profile."
+        },
+        "storageProfile": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/StorageProfile"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the storage profile."
+        },
+        "osProfile": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/OSProfile"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the OS profile."
+        },
+        "networkProfile": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/NetworkProfile"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the network profile."
+        },
+        "diagnosticsProfile": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/DiagnosticsProfile"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the diagnostics profile."
+        },
+        "availabilitySet": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SubResource"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the reference Id of the availability set to which this virtual machine belongs."
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets the provisioning state, which only appears in the response."
+        },
+        "licenseType": {
+          "type": "string",
+          "description": "Gets or sets the license type, which is for bring your own license scenario."
+        },
+        "vmId": {
+          "type": "string",
+          "description": "Gets the virtual machine unique id."
+        }
+      },
+      "description": "Describes the properties of a Virtual Machine."
+    },
+    "VirtualMachineScaleSetExtension": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets or sets the name of the extension."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VirtualMachineScaleSetExtensionProperties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "description": "Describes a Virtual Machine Scale Set Extension."
+    },
+    "VirtualMachineScaleSetExtensionProfile": {
+      "type": "object",
+      "properties": {
+        "extensions": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/VirtualMachineScaleSetExtension"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets the virtual machine scale set child extension resources."
+        }
+      },
+      "description": "Describes a virtual machine scale set extension profile."
+    },
+    "VirtualMachineScaleSetExtensionProperties": {
+      "type": "object",
+      "properties": {
+        "publisher": {
+          "type": "string",
+          "description": "Gets or sets the name of the extension handler publisher."
+        },
+        "type": {
+          "type": "string",
+          "description": "Gets or sets the type of the extension handler."
+        },
+        "typeHandlerVersion": {
+          "type": "string",
+          "description": "Gets or sets the type version of the extension handler."
+        },
+        "autoUpgradeMinorVersion": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets whether the extension handler should be automatically upgraded across minor versions."
+        },
+        "settings": {
+          "oneOf": [
+            {
+              "type": "object"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets Json formatted public settings for the extension."
+        },
+        "protectedSettings": {
+          "oneOf": [
+            {
+              "type": "object"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets Json formatted protected settings for the extension."
+        }
+      },
+      "description": "Describes the properties of a Virtual Machine Scale Set Extension."
+    },
+    "VirtualMachineScaleSetIPConfiguration": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets or sets the IP configuration name."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VirtualMachineScaleSetIPConfigurationProperties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "name"
+      ],
+      "description": "Describes a virtual machine scale set network profile's IP configuration."
+    },
+    "VirtualMachineScaleSetIPConfigurationProperties": {
+      "type": "object",
+      "properties": {
+        "subnet": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ApiEntityReference"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the subnet."
+        },
+        "applicationGatewayBackendAddressPools": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/SubResource"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the application gateway backend address pools."
+        },
+        "loadBalancerBackendAddressPools": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/SubResource"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the load balancer backend address pools."
+        },
+        "loadBalancerInboundNatPools": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/SubResource"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the load balancer inbound nat pools."
+        }
+      },
+      "required": [
+        "subnet"
+      ],
+      "description": "Describes a virtual machine scale set network profile's IP configuration properties."
+    },
+    "VirtualMachineScaleSetNetworkConfiguration": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets or sets the network configuration name."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VirtualMachineScaleSetNetworkConfigurationProperties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "name"
+      ],
+      "description": "Describes a virtual machine scale set network profile's network configurations."
+    },
+    "VirtualMachineScaleSetNetworkConfigurationProperties": {
+      "type": "object",
+      "properties": {
+        "primary": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets whether this is a primary NIC on a virtual machine."
+        },
+        "ipConfigurations": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/VirtualMachineScaleSetIPConfiguration"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the virtual machine scale set IP Configuration."
+        }
+      },
+      "required": [
+        "ipConfigurations"
+      ],
+      "description": "Describes a virtual machine scale set network profile's IP configuration."
+    },
+    "VirtualMachineScaleSetNetworkProfile": {
+      "type": "object",
+      "properties": {
+        "networkInterfaceConfigurations": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/VirtualMachineScaleSetNetworkConfiguration"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the list of network configurations."
+        }
+      },
+      "description": "Describes a virtual machine scale set network profile."
+    },
+    "VirtualMachineScaleSetOSDisk": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Gets or sets the disk name."
+        },
+        "caching": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "None",
+                "ReadOnly",
+                "ReadWrite"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the caching type. Possible values include: 'None', 'ReadOnly', 'ReadWrite'"
+        },
+        "createOption": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "fromImage",
+                "empty",
+                "attach"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the create option. Possible values include: 'fromImage', 'empty', 'attach'"
+        },
+        "osType": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Windows",
+                "Linux"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the Operating System type. Possible values include: 'Windows', 'Linux'"
+        },
+        "image": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VirtualHardDisk"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the Source User Image VirtualHardDisk. This VirtualHardDisk will be copied before using it to attach to the Virtual Machine.If SourceImage is provided, the destination VirtualHardDisk should not exist."
+        },
+        "vhdContainers": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the list of virtual hard disk container uris."
+        }
+      },
+      "required": [
+        "name",
+        "createOption"
+      ],
+      "description": "Describes a virtual machine scale set operating system disk."
+    },
+    "VirtualMachineScaleSetOSProfile": {
+      "type": "object",
+      "properties": {
+        "computerNamePrefix": {
+          "type": "string",
+          "description": "Gets or sets the computer name prefix."
+        },
+        "adminUsername": {
+          "type": "string",
+          "description": "Gets or sets the admin user name."
+        },
+        "adminPassword": {
+          "type": "string",
+          "description": "Gets or sets the admin user password."
+        },
+        "customData": {
+          "type": "string",
+          "description": "Gets or sets a base-64 encoded string of custom data."
+        },
+        "windowsConfiguration": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/WindowsConfiguration"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the Windows Configuration of the OS profile."
+        },
+        "linuxConfiguration": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/LinuxConfiguration"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the Linux Configuration of the OS profile."
+        },
+        "secrets": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/VaultSecretGroup"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the List of certificates for addition to the VM."
+        }
+      },
+      "description": "Describes a virtual machine scale set OS profile."
+    },
+    "VirtualMachineScaleSetProperties": {
+      "type": "object",
+      "properties": {
+        "upgradePolicy": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/UpgradePolicy"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the upgrade policy."
+        },
+        "virtualMachineProfile": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VirtualMachineScaleSetVMProfile"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the virtual machine profile."
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets the provisioning state, which only appears in the response."
+        },
+        "overProvision": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Specifies whether the Virtual Machine Scale Set should be overprovisioned."
+        }
+      },
+      "description": "Describes the properties of a Virtual Machine Scale Set."
+    },
+    "VirtualMachineScaleSetStorageProfile": {
+      "type": "object",
+      "properties": {
+        "imageReference": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ImageReference"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the image reference."
+        },
+        "osDisk": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VirtualMachineScaleSetOSDisk"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the OS disk."
+        }
+      },
+      "description": "Describes a virtual machine scale set storage profile."
+    },
+    "VirtualMachineScaleSetVMProfile": {
+      "type": "object",
+      "properties": {
+        "osProfile": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VirtualMachineScaleSetOSProfile"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the virtual machine scale set OS profile."
+        },
+        "storageProfile": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VirtualMachineScaleSetStorageProfile"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the virtual machine scale set storage profile."
+        },
+        "networkProfile": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VirtualMachineScaleSetNetworkProfile"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the virtual machine scale set network profile."
+        },
+        "extensionProfile": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VirtualMachineScaleSetExtensionProfile"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets the virtual machine scale set extension profile."
+        }
+      },
+      "description": "Describes a virtual machine scale set virtual machine profile."
+    },
+    "WindowsConfiguration": {
+      "type": "object",
+      "properties": {
+        "provisionVMAgent": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets whether VM Agent should be provisioned on the Virtual Machine."
+        },
+        "enableAutomaticUpdates": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets whether Windows updates are automatically installed on the VM"
+        },
+        "timeZone": {
+          "type": "string",
+          "description": "Gets or sets the Time Zone of the VM"
+        },
+        "additionalUnattendContent": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/AdditionalUnattendContent"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the additional base-64 encoded XML formatted information that can be included in the Unattend.xml file."
+        },
+        "winRM": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/WinRMConfiguration"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the Windows Remote Management configuration of the VM"
+        }
+      },
+      "description": "Describes Windows Configuration of the OS Profile."
+    },
+    "WinRMConfiguration": {
+      "type": "object",
+      "properties": {
+        "listeners": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/WinRMListener"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the list of Windows Remote Management listeners"
+        }
+      },
+      "description": "Describes Windows Remote Management configuration of the VM"
+    },
+    "WinRMListener": {
+      "type": "object",
+      "properties": {
+        "protocol": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Http",
+                "Https"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the Protocol used by WinRM listener. Currently only Http and Https are supported. Possible values include: 'Http', 'Https'"
+        },
+        "certificateUrl": {
+          "type": "string",
+          "description": "Gets or sets the Certificate URL in KMS for Https listeners. Should be null for Http listeners."
+        }
+      },
+      "description": "Describes Protocol and thumbprint of Windows Remote Management listener"
+    }
+  }
+}
diff --git a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/Expected/Network/Microsoft.Network.json b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/Expected/Network/Microsoft.Network.json
new file mode 100644
index 0000000000000..6c740b079a4fc
--- /dev/null
+++ b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/Expected/Network/Microsoft.Network.json
@@ -0,0 +1,5022 @@
+{
+  "id": "http://schema.management.azure.com/schemas/2016-03-30/Microsoft.Network.json#",
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Microsoft.Network",
+  "description": "Microsoft Network Resource Types",
+  "resourceDefinitions": {
+    "Microsoft.Network_applicationGateways": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Network/applicationGateways"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2016-03-30"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ApplicationGatewayPropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "etag": {
+          "type": "string",
+          "description": "Gets a unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Network/applicationGateways"
+    },
+    "Microsoft.Network_connections": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Network/connections"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2016-03-30"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VirtualNetworkGatewayConnectionPropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "etag": {
+          "type": "string",
+          "description": "Gets a unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Network/connections"
+    },
+    "Microsoft.Network_expressRouteCircuits": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Network/expressRouteCircuits"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2016-03-30"
+          ]
+        },
+        "sku": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ExpressRouteCircuitSku"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets sku"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ExpressRouteCircuitPropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "etag": {
+          "type": "string",
+          "description": "Gets a unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "resources": {
+        "type": "array",
+        "items": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Microsoft.Network_expressRouteCircuits_peerings_childResource"
+            },
+            {
+              "$ref": "#/definitions/Microsoft.Network_expressRouteCircuits_authorizations_childResource"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Network/expressRouteCircuits"
+    },
+    "Microsoft.Network_expressRouteCircuits_authorizations": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Network/expressRouteCircuits/authorizations"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2016-03-30"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/AuthorizationPropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Network/expressRouteCircuits/authorizations"
+    },
+    "Microsoft.Network_expressRouteCircuits_peerings": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Network/expressRouteCircuits/peerings"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2016-03-30"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ExpressRouteCircuitPeeringPropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Network/expressRouteCircuits/peerings"
+    },
+    "Microsoft.Network_loadBalancers": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Network/loadBalancers"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2016-03-30"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/LoadBalancerPropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "etag": {
+          "type": "string",
+          "description": "Gets a unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Network/loadBalancers"
+    },
+    "Microsoft.Network_localNetworkGateways": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Network/localNetworkGateways"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2016-03-30"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/LocalNetworkGatewayPropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "etag": {
+          "type": "string",
+          "description": "Gets a unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Network/localNetworkGateways"
+    },
+    "Microsoft.Network_networkInterfaces": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Network/networkInterfaces"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2016-03-30"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/NetworkInterfacePropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "etag": {
+          "type": "string",
+          "description": "Gets a unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Network/networkInterfaces"
+    },
+    "Microsoft.Network_networkSecurityGroups": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Network/networkSecurityGroups"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2016-03-30"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/NetworkSecurityGroupPropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "etag": {
+          "type": "string",
+          "description": "Gets a unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "resources": {
+        "type": "array",
+        "items": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Microsoft.Network_networkSecurityGroups_securityRules_childResource"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Network/networkSecurityGroups"
+    },
+    "Microsoft.Network_networkSecurityGroups_securityRules": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Network/networkSecurityGroups/securityRules"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2016-03-30"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SecurityRulePropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Network/networkSecurityGroups/securityRules"
+    },
+    "Microsoft.Network_publicIPAddresses": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Network/publicIPAddresses"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2016-03-30"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/PublicIPAddressPropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "etag": {
+          "type": "string",
+          "description": "Gets a unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Network/publicIPAddresses"
+    },
+    "Microsoft.Network_routeTables": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Network/routeTables"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2016-03-30"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/RouteTablePropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "etag": {
+          "type": "string",
+          "description": "Gets a unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "resources": {
+        "type": "array",
+        "items": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Microsoft.Network_routeTables_routes_childResource"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Network/routeTables"
+    },
+    "Microsoft.Network_routeTables_routes": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Network/routeTables/routes"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2016-03-30"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/RoutePropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Network/routeTables/routes"
+    },
+    "Microsoft.Network_virtualnetworkgateways": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Network/virtualnetworkgateways"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2016-03-30"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VirtualNetworkGatewayPropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "etag": {
+          "type": "string",
+          "description": "Gets a unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Network/virtualnetworkgateways"
+    },
+    "Microsoft.Network_virtualnetworks": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Network/virtualnetworks"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2016-03-30"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VirtualNetworkPropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "etag": {
+          "type": "string",
+          "description": "Gets a unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "resources": {
+        "type": "array",
+        "items": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Microsoft.Network_virtualnetworks_subnets_childResource"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Network/virtualnetworks"
+    },
+    "Microsoft.Network_virtualnetworks_subnets": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Network/virtualnetworks/subnets"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2016-03-30"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SubnetPropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Network/virtualnetworks/subnets"
+    }
+  },
+  "definitions": {
+    "AddressSpace": {
+      "type": "object",
+      "properties": {
+        "addressPrefixes": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets List of address blocks reserved for this virtual network in CIDR notation"
+        }
+      },
+      "description": "AddressSpace contains an array of IP address ranges that can be used by subnets"
+    },
+    "ApplicationGatewayBackendAddress": {
+      "type": "object",
+      "properties": {
+        "fqdn": {
+          "type": "string",
+          "description": "Gets or sets the dns name"
+        },
+        "ipAddress": {
+          "type": "string",
+          "description": "Gets or sets the ip address"
+        }
+      },
+      "description": "Backend Address of application gateway"
+    },
+    "ApplicationGatewayBackendAddressPool": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ApplicationGatewayBackendAddressPoolPropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "description": "Backend Address Pool of application gateway"
+    },
+    "ApplicationGatewayBackendAddressPoolPropertiesFormat": {
+      "type": "object",
+      "properties": {
+        "backendIPConfigurations": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/NetworkInterfaceIPConfiguration"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets collection of references to IPs defined in NICs"
+        },
+        "backendAddresses": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/ApplicationGatewayBackendAddress"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the backend addresses"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the backend address pool resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Properties of Backend Address Pool of application gateway"
+    },
+    "ApplicationGatewayBackendHttpSettings": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ApplicationGatewayBackendHttpSettingsPropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "description": "Backend address pool settings of application gateway"
+    },
+    "ApplicationGatewayBackendHttpSettingsPropertiesFormat": {
+      "type": "object",
+      "properties": {
+        "port": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the port"
+        },
+        "protocol": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Http",
+                "Https"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the protocol. Possible values include: 'Http', 'Https'"
+        },
+        "cookieBasedAffinity": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Enabled",
+                "Disabled"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the cookie affinity. Possible values include: 'Enabled', 'Disabled'"
+        },
+        "requestTimeout": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets request timeout"
+        },
+        "probe": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SubResource"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets probe resource of application gateway "
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the backend http settings resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Properties of Backend address pool settings of application gateway"
+    },
+    "ApplicationGatewayFrontendIPConfiguration": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ApplicationGatewayFrontendIPConfigurationPropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "description": "Frontend IP configuration of application gateway"
+    },
+    "ApplicationGatewayFrontendIPConfigurationPropertiesFormat": {
+      "type": "object",
+      "properties": {
+        "privateIPAddress": {
+          "type": "string",
+          "description": "Gets or sets the privateIPAddress of the Network Interface IP Configuration"
+        },
+        "privateIPAllocationMethod": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Static",
+                "Dynamic"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets PrivateIP allocation method (Static/Dynamic). Possible values include: 'Static', 'Dynamic'"
+        },
+        "subnet": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SubResource"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the reference of the subnet resource"
+        },
+        "publicIPAddress": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SubResource"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the reference of the PublicIP resource"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the PublicIP resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Properties of Frontend IP configuration of application gateway"
+    },
+    "ApplicationGatewayFrontendPort": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ApplicationGatewayFrontendPortPropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "description": "Frontend Port of application gateway"
+    },
+    "ApplicationGatewayFrontendPortPropertiesFormat": {
+      "type": "object",
+      "properties": {
+        "port": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the frontend port"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the frontend port resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Properties of Frontend Port of application gateway"
+    },
+    "ApplicationGatewayHttpListener": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ApplicationGatewayHttpListenerPropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "description": "Http listener of application gateway"
+    },
+    "ApplicationGatewayHttpListenerPropertiesFormat": {
+      "type": "object",
+      "properties": {
+        "frontendIPConfiguration": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SubResource"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets frontend IP configuration resource of application gateway "
+        },
+        "frontendPort": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SubResource"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets frontend port resource of application gateway "
+        },
+        "protocol": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Http",
+                "Https"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the protocol. Possible values include: 'Http', 'Https'"
+        },
+        "hostName": {
+          "type": "string",
+          "description": "Gets or sets the host name of http listener "
+        },
+        "sslCertificate": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SubResource"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets ssl certificate resource of application gateway "
+        },
+        "requireServerNameIndication": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the requireServerNameIndication of http listener "
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the http listener resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Properties of Http listener of application gateway"
+    },
+    "ApplicationGatewayIPConfiguration": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ApplicationGatewayIPConfigurationPropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "description": "IP configuration of application gateway"
+    },
+    "ApplicationGatewayIPConfigurationPropertiesFormat": {
+      "type": "object",
+      "properties": {
+        "subnet": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SubResource"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the reference of the subnet resource.A subnet from where appliation gateway gets its private address "
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the application gateway subnet resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Properties of IP configuration of application gateway"
+    },
+    "ApplicationGatewayPathRule": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ApplicationGatewayPathRulePropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "description": "Path rule of URL path map of application gateway"
+    },
+    "ApplicationGatewayPathRulePropertiesFormat": {
+      "type": "object",
+      "properties": {
+        "paths": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the path rules of URL path map"
+        },
+        "backendAddressPool": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SubResource"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets backend address pool resource of URL path map "
+        },
+        "backendHttpSettings": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SubResource"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets backend http settings resource of URL path map "
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets path rule of URL path map resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Properties of probe of application gateway"
+    },
+    "ApplicationGatewayProbe": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ApplicationGatewayProbePropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "description": "Probe of application gateway"
+    },
+    "ApplicationGatewayProbePropertiesFormat": {
+      "type": "object",
+      "properties": {
+        "protocol": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Http",
+                "Https"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the protocol. Possible values include: 'Http', 'Https'"
+        },
+        "host": {
+          "type": "string",
+          "description": "Gets or sets the host to send probe to "
+        },
+        "path": {
+          "type": "string",
+          "description": "Gets or sets the relative path of probe "
+        },
+        "interval": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets probing interval in seconds "
+        },
+        "timeout": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets probing timeout in seconds "
+        },
+        "unhealthyThreshold": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets probing unhealthy threshold "
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the backend http settings resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Properties of probe of application gateway"
+    },
+    "ApplicationGatewayPropertiesFormat": {
+      "type": "object",
+      "properties": {
+        "sku": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ApplicationGatewaySku"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets sku of application gateway resource"
+        },
+        "gatewayIPConfigurations": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/ApplicationGatewayIPConfiguration"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets subnets of application gateway resource"
+        },
+        "sslCertificates": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/ApplicationGatewaySslCertificate"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets ssl certificates of application gateway resource"
+        },
+        "frontendIPConfigurations": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/ApplicationGatewayFrontendIPConfiguration"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets frontend IP addresses of application gateway resource"
+        },
+        "frontendPorts": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/ApplicationGatewayFrontendPort"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets frontend ports of application gateway resource"
+        },
+        "probes": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/ApplicationGatewayProbe"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets probes of application gateway resource"
+        },
+        "backendAddressPools": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/ApplicationGatewayBackendAddressPool"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets backend address pool of application gateway resource"
+        },
+        "backendHttpSettingsCollection": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/ApplicationGatewayBackendHttpSettings"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets backend http settings of application gateway resource"
+        },
+        "httpListeners": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/ApplicationGatewayHttpListener"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets HTTP listeners of application gateway resource"
+        },
+        "urlPathMaps": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/ApplicationGatewayUrlPathMap"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets URL path map of application gateway resource"
+        },
+        "requestRoutingRules": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/ApplicationGatewayRequestRoutingRule"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets request routing rules of application gateway resource"
+        },
+        "resourceGuid": {
+          "type": "string",
+          "description": "Gets or sets resource guid property of the ApplicationGateway resource"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the ApplicationGateway resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Properties of Application Gateway"
+    },
+    "ApplicationGatewayRequestRoutingRule": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ApplicationGatewayRequestRoutingRulePropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "description": "Request routing rule of application gateway"
+    },
+    "ApplicationGatewayRequestRoutingRulePropertiesFormat": {
+      "type": "object",
+      "properties": {
+        "ruleType": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Basic",
+                "PathBasedRouting"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the rule type. Possible values include: 'Basic', 'PathBasedRouting'"
+        },
+        "backendAddressPool": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SubResource"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets backend address pool resource of application gateway "
+        },
+        "backendHttpSettings": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SubResource"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets frontend port resource of application gateway "
+        },
+        "httpListener": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SubResource"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets http listener resource of application gateway "
+        },
+        "urlPathMap": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SubResource"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets url path map resource of application gateway "
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the request routing rule resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Properties of Request routing rule of application gateway"
+    },
+    "ApplicationGatewaySku": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Standard_Small",
+                "Standard_Medium",
+                "Standard_Large"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets name of application gateway SKU. Possible values include: 'Standard_Small', 'Standard_Medium', 'Standard_Large'"
+        },
+        "tier": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Standard"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets tier of application gateway. Possible values include: 'Standard'"
+        },
+        "capacity": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets capacity (instance count) of application gateway"
+        }
+      },
+      "description": "SKU of application gateway"
+    },
+    "ApplicationGatewaySslCertificate": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ApplicationGatewaySslCertificatePropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "description": "SSL certificates of application gateway"
+    },
+    "ApplicationGatewaySslCertificatePropertiesFormat": {
+      "type": "object",
+      "properties": {
+        "data": {
+          "type": "string",
+          "description": "Gets or sets the certificate data "
+        },
+        "password": {
+          "type": "string",
+          "description": "Gets or sets the certificate password "
+        },
+        "publicCertData": {
+          "type": "string",
+          "description": "Gets or sets the certificate public data "
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the ssl certificate resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Properties of SSL certificates of application gateway"
+    },
+    "ApplicationGatewayUrlPathMap": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ApplicationGatewayUrlPathMapPropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "description": "UrlPathMap of application gateway"
+    },
+    "ApplicationGatewayUrlPathMapPropertiesFormat": {
+      "type": "object",
+      "properties": {
+        "defaultBackendAddressPool": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SubResource"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets default backend address pool resource of URL path map "
+        },
+        "defaultBackendHttpSettings": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SubResource"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets default backend http settings resource of URL path map "
+        },
+        "pathRules": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/ApplicationGatewayPathRule"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets path rule of URL path map resource"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the backend http settings resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Properties of probe of application gateway"
+    },
+    "AuthorizationPropertiesFormat": {
+      "type": "object",
+      "properties": {
+        "authorizationKey": {
+          "type": "string",
+          "description": "Gets or sets the authorization key"
+        },
+        "authorizationUseStatus": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Available",
+                "InUse"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets AuthorizationUseStatus. Possible values include: 'Available', 'InUse'"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the PublicIP resource Updating/Deleting/Failed"
+        }
+      }
+    },
+    "BackendAddressPool": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/BackendAddressPoolPropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "description": "Pool of backend IP addresseses"
+    },
+    "BackendAddressPoolPropertiesFormat": {
+      "type": "object",
+      "properties": {
+        "backendIPConfigurations": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/NetworkInterfaceIPConfiguration"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets collection of references to IPs defined in NICs"
+        },
+        "loadBalancingRules": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/SubResource"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets Load Balancing rules that use this Backend Address Pool"
+        },
+        "outboundNatRule": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SubResource"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets outbound rules that use this Backend Address Pool"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Provisioning state of the PublicIP resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Properties of BackendAddressPool"
+    },
+    "BgpSettings": {
+      "type": "object",
+      "properties": {
+        "asn": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets this BGP speaker's ASN"
+        },
+        "bgpPeeringAddress": {
+          "type": "string",
+          "description": "Gets or sets the BGP peering address and BGP identifier of this BGP speaker"
+        },
+        "peerWeight": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the weight added to routes learned from this BGP speaker"
+        }
+      }
+    },
+    "DhcpOptions": {
+      "type": "object",
+      "properties": {
+        "dnsServers": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets list of DNS servers IP addresses"
+        }
+      },
+      "description": "DHCPOptions contains an array of DNS servers available to VMs deployed in the virtual networkStandard DHCP option for a subnet overrides VNET DHCP options."
+    },
+    "ExpressRouteCircuitAuthorization": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/AuthorizationPropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "description": "Authorization in a ExpressRouteCircuit resource"
+    },
+    "ExpressRouteCircuitPeering": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ExpressRouteCircuitPeeringPropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "description": "Peering in a ExpressRouteCircuit resource"
+    },
+    "ExpressRouteCircuitPeeringConfig": {
+      "type": "object",
+      "properties": {
+        "advertisedPublicPrefixes": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the reference of AdvertisedPublicPrefixes"
+        },
+        "advertisedPublicPrefixesState": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "NotConfigured",
+                "Configuring",
+                "Configured",
+                "ValidationNeeded"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets AdvertisedPublicPrefixState of the Peering resource . Possible values include: 'NotConfigured', 'Configuring', 'Configured', 'ValidationNeeded'"
+        },
+        "customerASN": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or Sets CustomerAsn of the peering."
+        },
+        "routingRegistryName": {
+          "type": "string",
+          "description": "Gets or Sets RoutingRegistryName of the config."
+        }
+      },
+      "description": "Specfies the peering config"
+    },
+    "ExpressRouteCircuitPeeringPropertiesFormat": {
+      "type": "object",
+      "properties": {
+        "peeringType": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "AzurePublicPeering",
+                "AzurePrivatePeering",
+                "MicrosoftPeering"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets PeeringType. Possible values include: 'AzurePublicPeering', 'AzurePrivatePeering', 'MicrosoftPeering'"
+        },
+        "state": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Disabled",
+                "Enabled"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets state of Peering. Possible values include: 'Disabled', 'Enabled'"
+        },
+        "azureASN": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the azure ASN"
+        },
+        "peerASN": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the peer ASN"
+        },
+        "primaryPeerAddressPrefix": {
+          "type": "string",
+          "description": "Gets or sets the primary address prefix"
+        },
+        "secondaryPeerAddressPrefix": {
+          "type": "string",
+          "description": "Gets or sets the secondary address prefix"
+        },
+        "primaryAzurePort": {
+          "type": "string",
+          "description": "Gets or sets the primary port"
+        },
+        "secondaryAzurePort": {
+          "type": "string",
+          "description": "Gets or sets the secondary port"
+        },
+        "sharedKey": {
+          "type": "string",
+          "description": "Gets or sets the shared key"
+        },
+        "vlanId": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the vlan id"
+        },
+        "microsoftPeeringConfig": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ExpressRouteCircuitPeeringConfig"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the mircosoft peering config"
+        },
+        "stats": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ExpressRouteCircuitStats"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or peering stats"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the PublicIP resource Updating/Deleting/Failed"
+        }
+      }
+    },
+    "ExpressRouteCircuitPropertiesFormat": {
+      "type": "object",
+      "properties": {
+        "allowClassicOperations": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "allow classic operations"
+        },
+        "circuitProvisioningState": {
+          "type": "string",
+          "description": "Gets or sets CircuitProvisioningState state of the resource "
+        },
+        "serviceProviderProvisioningState": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "NotProvisioned",
+                "Provisioning",
+                "Provisioned",
+                "Deprovisioning"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets ServiceProviderProvisioningState state of the resource . Possible values include: 'NotProvisioned', 'Provisioning', 'Provisioned', 'Deprovisioning'"
+        },
+        "authorizations": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/ExpressRouteCircuitAuthorization"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets list of authorizations"
+        },
+        "peerings": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/ExpressRouteCircuitPeering"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets list of peerings"
+        },
+        "serviceKey": {
+          "type": "string",
+          "description": "Gets or sets ServiceKey"
+        },
+        "serviceProviderNotes": {
+          "type": "string",
+          "description": "Gets or sets ServiceProviderNotes"
+        },
+        "serviceProviderProperties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ExpressRouteCircuitServiceProviderProperties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets ServiceProviderProperties"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the PublicIP resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Properties of ExpressRouteCircuit"
+    },
+    "ExpressRouteCircuitServiceProviderProperties": {
+      "type": "object",
+      "properties": {
+        "serviceProviderName": {
+          "type": "string",
+          "description": "Gets or sets serviceProviderName."
+        },
+        "peeringLocation": {
+          "type": "string",
+          "description": "Gets or sets peering location."
+        },
+        "bandwidthInMbps": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets BandwidthInMbps."
+        }
+      },
+      "description": "Contains ServiceProviderProperties in an ExpressRouteCircuit"
+    },
+    "ExpressRouteCircuitSku": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Gets or sets name of the sku."
+        },
+        "tier": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Standard",
+                "Premium"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets tier of the sku. Possible values include: 'Standard', 'Premium'"
+        },
+        "family": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "UnlimitedData",
+                "MeteredData"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets family of the sku. Possible values include: 'UnlimitedData', 'MeteredData'"
+        }
+      },
+      "description": "Contains sku in an ExpressRouteCircuit"
+    },
+    "ExpressRouteCircuitStats": {
+      "type": "object",
+      "properties": {
+        "primarybytesIn": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets BytesIn of the peering."
+        },
+        "primarybytesOut": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets BytesOut of the peering."
+        },
+        "secondarybytesIn": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets BytesIn of the peering."
+        },
+        "secondarybytesOut": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets BytesOut of the peering."
+        }
+      },
+      "description": "Contains Stats associated with the peering"
+    },
+    "FrontendIPConfiguration": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/FrontendIPConfigurationPropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "description": "Frontend IP address of the load balancer"
+    },
+    "FrontendIPConfigurationPropertiesFormat": {
+      "type": "object",
+      "properties": {
+        "inboundNatRules": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/SubResource"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Read only.Inbound rules URIs that use this frontend IP"
+        },
+        "inboundNatPools": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/SubResource"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Read only.Inbound pools URIs that use this frontend IP"
+        },
+        "outboundNatRules": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/SubResource"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Read only.Outbound rules URIs that use this frontend IP"
+        },
+        "loadBalancingRules": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/SubResource"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets Load Balancing rules URIs that use this frontend IP"
+        },
+        "privateIPAddress": {
+          "type": "string",
+          "description": "Gets or sets the privateIPAddress of the IP Configuration"
+        },
+        "privateIPAllocationMethod": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Static",
+                "Dynamic"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets PrivateIP allocation method (Static/Dynamic). Possible values include: 'Static', 'Dynamic'"
+        },
+        "subnet": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Subnet"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the reference of the subnet resource"
+        },
+        "publicIPAddress": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/PublicIPAddress"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the reference of the PublicIP resource"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the PublicIP resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Properties of Frontend IP Configuration of the load balancer"
+    },
+    "InboundNatPool": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/InboundNatPoolPropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "description": "Inbound NAT pool of the loadbalancer"
+    },
+    "InboundNatPoolPropertiesFormat": {
+      "type": "object",
+      "properties": {
+        "frontendIPConfiguration": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SubResource"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets a reference to frontend IP Addresses"
+        },
+        "protocol": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Udp",
+                "Tcp"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the transport potocol for the external endpoint. Possible values are Udp or Tcp. Possible values include: 'Udp', 'Tcp'"
+        },
+        "frontendPortRangeStart": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the starting port range for the NAT pool. You can spcify any port number you choose, but the port numbers specified for each role in the service must be unique. Possible values range between 1 and 65535, inclusive"
+        },
+        "frontendPortRangeEnd": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the ending port range for the NAT pool. You can spcify any port number you choose, but the port numbers specified for each role in the service must be unique. Possible values range between 1 and 65535, inclusive"
+        },
+        "backendPort": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets a port used for internal connections on the endpoint. The localPort attribute maps the eternal port of the endpoint to an internal port on a role. This is useful in scenarios where a role must communicate to an internal compotnent on a port that is different from the one that is exposed externally. If not specified, the value of localPort is the same as the port attribute. Set the value of localPort to '*' to automatically assign an unallocated port that is discoverable using the runtime API"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the PublicIP resource Updating/Deleting/Failed"
+        }
+      },
+      "required": [
+        "protocol",
+        "frontendPortRangeStart",
+        "frontendPortRangeEnd",
+        "backendPort"
+      ],
+      "description": "Properties of Inbound NAT pool"
+    },
+    "InboundNatRule": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/InboundNatRulePropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "description": "Inbound NAT rule of the loadbalancer"
+    },
+    "InboundNatRulePropertiesFormat": {
+      "type": "object",
+      "properties": {
+        "frontendIPConfiguration": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SubResource"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets a reference to frontend IP Addresses"
+        },
+        "backendIPConfiguration": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/NetworkInterfaceIPConfiguration"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets a reference to a private ip address defined on a NetworkInterface of a VM. Traffic sent to frontendPort of each of the frontendIPConfigurations is forwarded to the backed IP"
+        },
+        "protocol": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Udp",
+                "Tcp"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the transport potocol for the external endpoint. Possible values are Udp or Tcp. Possible values include: 'Udp', 'Tcp'"
+        },
+        "frontendPort": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the port for the external endpoint. You can spcify any port number you choose, but the port numbers specified for each role in the service must be unique. Possible values range between 1 and 65535, inclusive"
+        },
+        "backendPort": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets a port used for internal connections on the endpoint. The localPort attribute maps the eternal port of the endpoint to an internal port on a role. This is useful in scenarios where a role must communicate to an internal compotnent on a port that is different from the one that is exposed externally. If not specified, the value of localPort is the same as the port attribute. Set the value of localPort to '*' to automatically assign an unallocated port that is discoverable using the runtime API"
+        },
+        "idleTimeoutInMinutes": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the timeout for the Tcp idle connection. The value can be set between 4 and 30 minutes. The default value is 4 minutes. This emlement is only used when the protocol is set to Tcp"
+        },
+        "enableFloatingIP": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Configures a virtual machine's endpoint for the floating IP capability required to configure a SQL AlwaysOn availability Group. This setting is required when using the SQL Always ON availability Groups in SQL server. This setting can't be changed after you create the endpoint"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the PublicIP resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Properties of Inbound NAT rule"
+    },
+    "IPConfiguration": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/IPConfigurationPropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "description": "IPConfiguration"
+    },
+    "IPConfigurationPropertiesFormat": {
+      "type": "object",
+      "properties": {
+        "privateIPAddress": {
+          "type": "string",
+          "description": "Gets or sets the privateIPAddress of the IP Configuration"
+        },
+        "privateIPAllocationMethod": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Static",
+                "Dynamic"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets PrivateIP allocation method (Static/Dynamic). Possible values include: 'Static', 'Dynamic'"
+        },
+        "subnet": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Subnet"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the reference of the subnet resource"
+        },
+        "publicIPAddress": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/PublicIPAddress"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the reference of the PublicIP resource"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the PublicIP resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Properties of IPConfiguration"
+    },
+    "LoadBalancerPropertiesFormat": {
+      "type": "object",
+      "properties": {
+        "frontendIPConfigurations": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/FrontendIPConfiguration"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets frontend IP addresses of the load balancer"
+        },
+        "backendAddressPools": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/BackendAddressPool"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets Pools of backend IP addresseses"
+        },
+        "loadBalancingRules": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/LoadBalancingRule"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets loadbalancing rules"
+        },
+        "probes": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/Probe"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets list of Load balancer probes"
+        },
+        "inboundNatRules": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/InboundNatRule"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets list of inbound rules"
+        },
+        "inboundNatPools": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/InboundNatPool"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets inbound NAT pools"
+        },
+        "outboundNatRules": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/OutboundNatRule"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets outbound NAT rules"
+        },
+        "resourceGuid": {
+          "type": "string",
+          "description": "Gets or sets resource guid property of the Load balancer resource"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the PublicIP resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Properties of Load Balancer"
+    },
+    "LoadBalancingRule": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/LoadBalancingRulePropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "description": "Rules of the load balancer"
+    },
+    "LoadBalancingRulePropertiesFormat": {
+      "type": "object",
+      "properties": {
+        "frontendIPConfiguration": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SubResource"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets a reference to frontend IP Addresses"
+        },
+        "backendAddressPool": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SubResource"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets  a reference to a pool of DIPs. Inbound traffic is randomly load balanced across IPs in the backend IPs"
+        },
+        "probe": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SubResource"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the reference of the load balancer probe used by the Load Balancing rule."
+        },
+        "protocol": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Udp",
+                "Tcp"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the transport protocol for the external endpoint. Possible values are Udp or Tcp. Possible values include: 'Udp', 'Tcp'"
+        },
+        "loadDistribution": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Default",
+                "SourceIP",
+                "SourceIPProtocol"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the load distribution policy for this rule. Possible values include: 'Default', 'SourceIP', 'SourceIPProtocol'"
+        },
+        "frontendPort": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the port for the external endpoint. You can specify any port number you choose, but the port numbers specified for each role in the service must be unique. Possible values range between 1 and 65535, inclusive"
+        },
+        "backendPort": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets a port used for internal connections on the endpoint. The localPort attribute maps the eternal port of the endpoint to an internal port on a role. This is useful in scenarios where a role must communicate to an internal compotnent on a port that is different from the one that is exposed externally. If not specified, the value of localPort is the same as the port attribute. Set the value of localPort to '*' to automatically assign an unallocated port that is discoverable using the runtime API"
+        },
+        "idleTimeoutInMinutes": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the timeout for the Tcp idle connection. The value can be set between 4 and 30 minutes. The default value is 4 minutes. This emlement is only used when the protocol is set to Tcp"
+        },
+        "enableFloatingIP": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Configures a virtual machine's endpoint for the floating IP capability required to configure a SQL AlwaysOn availability Group. This setting is required when using the SQL Always ON availability Groups in SQL server. This setting can't be changed after you create the endpoint"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the PublicIP resource Updating/Deleting/Failed"
+        }
+      },
+      "required": [
+        "protocol",
+        "frontendPort"
+      ],
+      "description": "Properties of the load balancer"
+    },
+    "LocalNetworkGateway": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "location": {
+          "type": "string",
+          "description": "Resource location"
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Resource tags"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/LocalNetworkGatewayPropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "etag": {
+          "type": "string",
+          "description": "Gets a unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "description": "A common class for general resource information"
+    },
+    "LocalNetworkGatewayPropertiesFormat": {
+      "type": "object",
+      "properties": {
+        "localNetworkAddressSpace": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/AddressSpace"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Local network site Address space"
+        },
+        "gatewayIpAddress": {
+          "type": "string",
+          "description": "IP address of local network gateway."
+        },
+        "bgpSettings": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/BgpSettings"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Local network gateway's BGP speaker settings"
+        },
+        "resourceGuid": {
+          "type": "string",
+          "description": "Gets or sets resource guid property of the LocalNetworkGateway resource"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the LocalNetworkGateway resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "LocalNetworkGateway properties"
+    },
+    "Microsoft.Network_expressRouteCircuits_authorizations_childResource": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "authorizations"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2016-03-30"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/AuthorizationPropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Network/expressRouteCircuits/authorizations"
+    },
+    "Microsoft.Network_expressRouteCircuits_peerings_childResource": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "peerings"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2016-03-30"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ExpressRouteCircuitPeeringPropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Network/expressRouteCircuits/peerings"
+    },
+    "Microsoft.Network_networkSecurityGroups_securityRules_childResource": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "securityRules"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2016-03-30"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SecurityRulePropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Network/networkSecurityGroups/securityRules"
+    },
+    "Microsoft.Network_routeTables_routes_childResource": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "routes"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2016-03-30"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/RoutePropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Network/routeTables/routes"
+    },
+    "Microsoft.Network_virtualnetworks_subnets_childResource": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "subnets"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2016-03-30"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SubnetPropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Network/virtualnetworks/subnets"
+    },
+    "NetworkInterface": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "location": {
+          "type": "string",
+          "description": "Resource location"
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Resource tags"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/NetworkInterfacePropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "etag": {
+          "type": "string",
+          "description": "Gets a unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "description": "A NetworkInterface in a resource group"
+    },
+    "NetworkInterfaceDnsSettings": {
+      "type": "object",
+      "properties": {
+        "dnsServers": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets list of DNS servers IP addresses"
+        },
+        "appliedDnsServers": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets list of Applied DNS servers IP addresses"
+        },
+        "internalDnsNameLabel": {
+          "type": "string",
+          "description": "Gets or sets the Internal DNS name"
+        },
+        "internalFqdn": {
+          "type": "string",
+          "description": "Gets or sets the internal fqdn."
+        },
+        "internalDomainNameSuffix": {
+          "type": "string",
+          "description": "Gets or sets internal domain name suffix of the NIC."
+        }
+      },
+      "description": "Dns Settings of a network interface"
+    },
+    "NetworkInterfaceIPConfiguration": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/NetworkInterfaceIPConfigurationPropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "description": "IPConfiguration in a NetworkInterface"
+    },
+    "NetworkInterfaceIPConfigurationPropertiesFormat": {
+      "type": "object",
+      "properties": {
+        "applicationGatewayBackendAddressPools": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/ApplicationGatewayBackendAddressPool"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the reference of ApplicationGatewayBackendAddressPool resource"
+        },
+        "loadBalancerBackendAddressPools": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/BackendAddressPool"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the reference of LoadBalancerBackendAddressPool resource"
+        },
+        "loadBalancerInboundNatRules": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/InboundNatRule"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets list of references of LoadBalancerInboundNatRules"
+        },
+        "privateIPAddress": {
+          "type": "string"
+        },
+        "privateIPAllocationMethod": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Static",
+                "Dynamic"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets PrivateIP allocation method (Static/Dynamic). Possible values include: 'Static', 'Dynamic'"
+        },
+        "privateIPAddressVersion": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "IPv4",
+                "IPv6"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets PrivateIP address version (IPv4/IPv6). Possible values include: 'IPv4', 'IPv6'"
+        },
+        "subnet": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Subnet"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "publicIPAddress": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/PublicIPAddress"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "provisioningState": {
+          "type": "string"
+        }
+      },
+      "description": "Properties of IPConfiguration"
+    },
+    "NetworkInterfacePropertiesFormat": {
+      "type": "object",
+      "properties": {
+        "virtualMachine": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SubResource"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the reference of a VirtualMachine"
+        },
+        "networkSecurityGroup": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/NetworkSecurityGroup"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the reference of the NetworkSecurityGroup resource"
+        },
+        "ipConfigurations": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/NetworkInterfaceIPConfiguration"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets list of IPConfigurations of the NetworkInterface"
+        },
+        "dnsSettings": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/NetworkInterfaceDnsSettings"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets DNS Settings in  NetworkInterface"
+        },
+        "macAddress": {
+          "type": "string",
+          "description": "Gets the MAC Address of the network interface"
+        },
+        "primary": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets whether this is a primary NIC on a virtual machine"
+        },
+        "enableIPForwarding": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets whether IPForwarding is enabled on the NIC"
+        },
+        "resourceGuid": {
+          "type": "string",
+          "description": "Gets or sets resource guid property of the network interface resource"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the PublicIP resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "NetworkInterface properties. "
+    },
+    "NetworkSecurityGroup": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "location": {
+          "type": "string",
+          "description": "Resource location"
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Resource tags"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/NetworkSecurityGroupPropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "etag": {
+          "type": "string",
+          "description": "Gets a unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "description": "NetworkSecurityGroup resource"
+    },
+    "NetworkSecurityGroupPropertiesFormat": {
+      "type": "object",
+      "properties": {
+        "securityRules": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/SecurityRule"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets Security rules of network security group"
+        },
+        "defaultSecurityRules": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/SecurityRule"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets Default security rules of network security group"
+        },
+        "networkInterfaces": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/NetworkInterface"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets collection of references to Network Interfaces"
+        },
+        "subnets": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/Subnet"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets collection of references to subnets"
+        },
+        "resourceGuid": {
+          "type": "string",
+          "description": "Gets or sets resource guid property of the network security group resource"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the PublicIP resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Network Security Group resource"
+    },
+    "OutboundNatRule": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/OutboundNatRulePropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "description": "Outbound NAT pool of the loadbalancer"
+    },
+    "OutboundNatRulePropertiesFormat": {
+      "type": "object",
+      "properties": {
+        "allocatedOutboundPorts": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the number of outbound ports to be used for SNAT"
+        },
+        "frontendIPConfigurations": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/SubResource"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets Frontend IP addresses of the load balancer"
+        },
+        "backendAddressPool": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SubResource"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets a reference to a pool of DIPs. Outbound traffic is randomly load balanced across IPs in the backend IPs"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the PublicIP resource Updating/Deleting/Failed"
+        }
+      },
+      "required": [
+        "backendAddressPool"
+      ],
+      "description": "Outbound NAT pool of the loadbalancer"
+    },
+    "Probe": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ProbePropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "description": "Load balancer Probe"
+    },
+    "ProbePropertiesFormat": {
+      "type": "object",
+      "properties": {
+        "loadBalancingRules": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/SubResource"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets Load balancer rules that use this probe"
+        },
+        "protocol": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Http",
+                "Tcp"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the protocol of the end point. Possible values are http pr Tcp. If Tcp is specified, a received ACK is required for the probe to be successful. If http is specified,a 200 OK response from the specifies URI is required for the probe to be successful. Possible values include: 'Http', 'Tcp'"
+        },
+        "port": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets Port for communicating the probe. Possible values range from 1 to 65535, inclusive."
+        },
+        "intervalInSeconds": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the interval, in seconds, for how frequently to probe the endpoint for health status. Typically, the interval is slightly less than half the allocated timeout period (in seconds) which allows two full probes before taking the instance out of rotation. The default value is 15, the minimum value is 5"
+        },
+        "numberOfProbes": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the number of probes where if no response, will result in stopping further traffic from being delivered to the endpoint. This values allows endponints to be taken out of rotation faster or slower than the typical times used in Azure. "
+        },
+        "requestPath": {
+          "type": "string",
+          "description": "Gets or sets the URI used for requesting health status from the VM. Path is required if a protocol is set to http. Otherwise, it is not allowed. There is no default value"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the PublicIP resource Updating/Deleting/Failed"
+        }
+      },
+      "required": [
+        "protocol",
+        "port"
+      ]
+    },
+    "PublicIPAddress": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "location": {
+          "type": "string",
+          "description": "Resource location"
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Resource tags"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/PublicIPAddressPropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "etag": {
+          "type": "string",
+          "description": "Gets a unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "description": "PublicIPAddress resource"
+    },
+    "PublicIPAddressDnsSettings": {
+      "type": "object",
+      "properties": {
+        "domainNameLabel": {
+          "type": "string",
+          "description": "Gets or sets the Domain name label.The concatenation of the domain name label and the regionalized DNS zone make up the fully qualified domain name associated with the public IP address. If a domain name label is specified, an A DNS record is created for the public IP in the Microsoft Azure DNS system."
+        },
+        "fqdn": {
+          "type": "string",
+          "description": "Gets the FQDN, Fully qualified domain name of the A DNS record associated with the public IP. This is the concatenation of the domainNameLabel and the regionalized DNS zone."
+        },
+        "reverseFqdn": {
+          "type": "string",
+          "description": "Gets or Sests the Reverse FQDN. A user-visible, fully qualified domain name that resolves to this public IP address. If the reverseFqdn is specified, then a PTR DNS record is created pointing from the IP address in the in-addr.arpa domain to the reverse FQDN. "
+        }
+      },
+      "description": "Contains FQDN of the DNS record associated with the public IP address"
+    },
+    "PublicIPAddressPropertiesFormat": {
+      "type": "object",
+      "properties": {
+        "publicIPAllocationMethod": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Static",
+                "Dynamic"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets PublicIP allocation method (Static/Dynamic). Possible values include: 'Static', 'Dynamic'"
+        },
+        "publicIPAddressVersion": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "IPv4",
+                "IPv6"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets PublicIP address version (IPv4/IPv6). Possible values include: 'IPv4', 'IPv6'"
+        },
+        "ipConfiguration": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/IPConfiguration"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "dnsSettings": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/PublicIPAddressDnsSettings"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets FQDN of the DNS record associated with the public IP address"
+        },
+        "ipAddress": {
+          "type": "string"
+        },
+        "idleTimeoutInMinutes": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the Idletimeout of the public IP address"
+        },
+        "resourceGuid": {
+          "type": "string",
+          "description": "Gets or sets resource guid property of the PublicIP resource"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the PublicIP resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "PublicIpAddress properties"
+    },
+    "Route": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/RoutePropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "description": "Route resource"
+    },
+    "RoutePropertiesFormat": {
+      "type": "object",
+      "properties": {
+        "addressPrefix": {
+          "type": "string",
+          "description": "Gets or sets the destination CIDR to which the route applies."
+        },
+        "nextHopType": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "VirtualNetworkGateway",
+                "VnetLocal",
+                "Internet",
+                "VirtualAppliance",
+                "None"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the type of Azure hop the packet should be sent to. Possible values include: 'VirtualNetworkGateway', 'VnetLocal', 'Internet', 'VirtualAppliance', 'None'"
+        },
+        "nextHopIpAddress": {
+          "type": "string",
+          "description": "Gets or sets the IP address packets should be forwarded to. Next hop values are only allowed in routes where the next hop type is VirtualAppliance."
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the resource Updating/Deleting/Failed"
+        }
+      },
+      "required": [
+        "nextHopType"
+      ],
+      "description": "Route resource"
+    },
+    "RouteTable": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "location": {
+          "type": "string",
+          "description": "Resource location"
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Resource tags"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/RouteTablePropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "etag": {
+          "type": "string",
+          "description": "Gets a unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "description": "RouteTable resource"
+    },
+    "RouteTablePropertiesFormat": {
+      "type": "object",
+      "properties": {
+        "routes": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/Route"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets Routes in a Route Table"
+        },
+        "subnets": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/Subnet"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets collection of references to subnets"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Route Table resource"
+    },
+    "SecurityRule": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SecurityRulePropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "description": "Network security rule"
+    },
+    "SecurityRulePropertiesFormat": {
+      "type": "object",
+      "properties": {
+        "description": {
+          "type": "string",
+          "description": "Gets or sets a description for this rule. Restricted to 140 chars."
+        },
+        "protocol": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Tcp",
+                "Udp",
+                "*"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets Network protocol this rule applies to. Can be Tcp, Udp or All(*). Possible values include: 'Tcp', 'Udp', '*'"
+        },
+        "sourcePortRange": {
+          "type": "string",
+          "description": "Gets or sets Source Port or Range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports."
+        },
+        "destinationPortRange": {
+          "type": "string",
+          "description": "Gets or sets Destination Port or Range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports."
+        },
+        "sourceAddressPrefix": {
+          "type": "string",
+          "description": "Gets or sets source address prefix. CIDR or source IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from. "
+        },
+        "destinationAddressPrefix": {
+          "type": "string",
+          "description": "Gets or sets destination address prefix. CIDR or source IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. "
+        },
+        "access": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Allow",
+                "Deny"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets network traffic is allowed or denied. Possible values are 'Allow' and 'Deny'. Possible values include: 'Allow', 'Deny'"
+        },
+        "priority": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the priority of the rule. The value can be between 100 and 4096. The priority number must be unique for each rule in the collection. The lower the priority number, the higher the priority of the rule."
+        },
+        "direction": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Inbound",
+                "Outbound"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the direction of the rule.InBound or Outbound. The direction specifies if rule will be evaluated on incoming or outcoming traffic. Possible values include: 'Inbound', 'Outbound'"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the PublicIP resource Updating/Deleting/Failed"
+        }
+      },
+      "required": [
+        "protocol",
+        "sourceAddressPrefix",
+        "destinationAddressPrefix",
+        "access",
+        "direction"
+      ]
+    },
+    "Subnet": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SubnetPropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "description": "Subnet in a VirtualNework resource"
+    },
+    "SubnetPropertiesFormat": {
+      "type": "object",
+      "properties": {
+        "addressPrefix": {
+          "type": "string",
+          "description": "Gets or sets Address prefix for the subnet."
+        },
+        "networkSecurityGroup": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/NetworkSecurityGroup"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the reference of the NetworkSecurityGroup resource"
+        },
+        "routeTable": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/RouteTable"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the reference of the RouteTable resource"
+        },
+        "ipConfigurations": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/IPConfiguration"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets array of references to the network interface IP configurations using subnet"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the PublicIP resource Updating/Deleting/Failed"
+        }
+      }
+    },
+    "SubResource": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        }
+      }
+    },
+    "VirtualNetworkGateway": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "location": {
+          "type": "string",
+          "description": "Resource location"
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Resource tags"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VirtualNetworkGatewayPropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "etag": {
+          "type": "string",
+          "description": "Gets a unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "description": "A common class for general resource information"
+    },
+    "VirtualNetworkGatewayConnectionPropertiesFormat": {
+      "type": "object",
+      "properties": {
+        "authorizationKey": {
+          "type": "string",
+          "description": "The authorizationKey."
+        },
+        "virtualNetworkGateway1": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VirtualNetworkGateway"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "virtualNetworkGateway2": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VirtualNetworkGateway"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "localNetworkGateway2": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/LocalNetworkGateway"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "connectionType": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "IPsec",
+                "Vnet2Vnet",
+                "ExpressRoute",
+                "VPNClient"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gateway connection type -Ipsec/Dedicated/VpnClient/Vnet2Vnet. Possible values include: 'IPsec', 'Vnet2Vnet', 'ExpressRoute', 'VPNClient'"
+        },
+        "routingWeight": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "The Routing weight."
+        },
+        "sharedKey": {
+          "type": "string",
+          "description": "The Ipsec share key."
+        },
+        "connectionStatus": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Unknown",
+                "Connecting",
+                "Connected",
+                "NotConnected"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Virtual network Gateway connection status. Possible values include: 'Unknown', 'Connecting', 'Connected', 'NotConnected'"
+        },
+        "egressBytesTransferred": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "The Egress Bytes Transferred in this connection"
+        },
+        "ingressBytesTransferred": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "The Ingress Bytes Transferred in this connection"
+        },
+        "peer": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SubResource"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "The reference to peerings resource."
+        },
+        "enableBgp": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "EnableBgp Flag"
+        },
+        "resourceGuid": {
+          "type": "string",
+          "description": "Gets or sets resource guid property of the VirtualNetworkGatewayConnection resource"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the VirtualNetworkGatewayConnection resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "VirtualNeworkGatewayConnection properties"
+    },
+    "VirtualNetworkGatewayIPConfiguration": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VirtualNetworkGatewayIPConfigurationPropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "description": "IpConfiguration for Virtual network gateway"
+    },
+    "VirtualNetworkGatewayIPConfigurationPropertiesFormat": {
+      "type": "object",
+      "properties": {
+        "privateIPAddress": {
+          "type": "string",
+          "description": "Gets or sets the privateIPAddress of the IP Configuration"
+        },
+        "privateIPAllocationMethod": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Static",
+                "Dynamic"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets PrivateIP allocation method (Static/Dynamic). Possible values include: 'Static', 'Dynamic'"
+        },
+        "subnet": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SubResource"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the reference of the subnet resource"
+        },
+        "publicIPAddress": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SubResource"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the reference of the PublicIP resource"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the PublicIP resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Properties of VirtualNetworkGatewayIPConfiguration"
+    },
+    "VirtualNetworkGatewayPropertiesFormat": {
+      "type": "object",
+      "properties": {
+        "ipConfigurations": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/VirtualNetworkGatewayIPConfiguration"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "IpConfigurations for Virtual network gateway."
+        },
+        "gatewayType": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Vpn",
+                "ExpressRoute"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "The type of this virtual network gateway. Possible values include: 'Vpn', 'ExpressRoute'"
+        },
+        "vpnType": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "PolicyBased",
+                "RouteBased"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "The type of this virtual network gateway. Possible values include: 'PolicyBased', 'RouteBased'"
+        },
+        "enableBgp": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "EnableBgp Flag"
+        },
+        "gatewayDefaultSite": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SubResource"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the reference of the LocalNetworkGateway resource which represents Local network site having default routes. Assign Null value in case of removing existing default site setting."
+        },
+        "sku": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VirtualNetworkGatewaySku"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the reference of the VirtualNetworkGatewaySku resource which represents the sku selected for Virtual network gateway."
+        },
+        "vpnClientConfiguration": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VpnClientConfiguration"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the reference of the VpnClientConfiguration resource which represents the P2S VpnClient configurations."
+        },
+        "bgpSettings": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/BgpSettings"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Virtual network gateway's BGP speaker settings"
+        },
+        "resourceGuid": {
+          "type": "string",
+          "description": "Gets or sets resource guid property of the VirtualNetworkGateway resource"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the VirtualNetworkGateway resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "VirtualNeworkGateay properties"
+    },
+    "VirtualNetworkGatewaySku": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Basic",
+                "HighPerformance",
+                "Standard"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gateway sku name -Basic/HighPerformance/Standard. Possible values include: 'Basic', 'HighPerformance', 'Standard'"
+        },
+        "tier": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Basic",
+                "HighPerformance",
+                "Standard"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gateway sku tier -Basic/HighPerformance/Standard. Possible values include: 'Basic', 'HighPerformance', 'Standard'"
+        },
+        "capacity": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "The capacity"
+        }
+      },
+      "description": "VirtualNetworkGatewaySku details"
+    },
+    "VirtualNetworkPropertiesFormat": {
+      "type": "object",
+      "properties": {
+        "addressSpace": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/AddressSpace"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets AddressSpace that contains an array of IP address ranges that can be used by subnets"
+        },
+        "dhcpOptions": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/DhcpOptions"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets DHCPOptions that contains an array of DNS servers available to VMs deployed in the virtual network"
+        },
+        "subnets": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/Subnet"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets List of subnets in a VirtualNetwork"
+        },
+        "resourceGuid": {
+          "type": "string",
+          "description": "Gets or sets resource guid property of the VirtualNetwork resource"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the PublicIP resource Updating/Deleting/Failed"
+        }
+      }
+    },
+    "VpnClientConfiguration": {
+      "type": "object",
+      "properties": {
+        "vpnClientAddressPool": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/AddressSpace"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the reference of the Address space resource which represents Address space for P2S VpnClient."
+        },
+        "vpnClientRootCertificates": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/VpnClientRootCertificate"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "VpnClientRootCertificate for Virtual network gateway."
+        },
+        "vpnClientRevokedCertificates": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/VpnClientRevokedCertificate"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "VpnClientRevokedCertificate for Virtual network gateway."
+        }
+      },
+      "description": "VpnClientConfiguration for P2S client"
+    },
+    "VpnClientRevokedCertificate": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VpnClientRevokedCertificatePropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "description": "VPN client revoked certificate of virtual network gateway"
+    },
+    "VpnClientRevokedCertificatePropertiesFormat": {
+      "type": "object",
+      "properties": {
+        "thumbprint": {
+          "type": "string",
+          "description": "Gets or sets the revoked Vpn client certificate thumbprint"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the VPN client revoked certificate resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Properties of the revoked VPN client certificate of virtual network gateway"
+    },
+    "VpnClientRootCertificate": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VpnClientRootCertificatePropertiesFormat"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "description": "VPN client root certificate of virtual network gateway"
+    },
+    "VpnClientRootCertificatePropertiesFormat": {
+      "type": "object",
+      "properties": {
+        "publicCertData": {
+          "type": "string",
+          "description": "Gets or sets the certificate public data"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the VPN client root certificate resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Properties of SSL certificates of application gateway"
+    }
+  }
+}
diff --git a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/Expected/Storage/Microsoft.Storage.json b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/Expected/Storage/Microsoft.Storage.json
new file mode 100644
index 0000000000000..a98dba664b645
--- /dev/null
+++ b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/Expected/Storage/Microsoft.Storage.json
@@ -0,0 +1,251 @@
+{
+  "id": "http://schema.management.azure.com/schemas/2016-01-01/Microsoft.Storage.json#",
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Microsoft.Storage",
+  "description": "Microsoft Storage Resource Types",
+  "resourceDefinitions": {
+    "Microsoft.Storage_storageAccounts": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Storage/storageAccounts"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2016-01-01"
+          ]
+        },
+        "sku": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Sku"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Required. Gets or sets the sku type."
+        },
+        "kind": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Storage",
+                "BlobStorage"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Required. Indicates the type of storage account. Possible values include: 'Storage', 'BlobStorage'"
+        },
+        "location": {
+          "type": "string",
+          "description": "Required. Gets or sets the location of the resource. This will be one of the supported and registered Azure Geo Regions (e.g. West US, East US, Southeast Asia, etc.). The geo region of a resource cannot be changed once it is created, but if an identical geo region is specified on update the request will succeed."
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets a list of key value pairs that describe the resource. These tags can be used in viewing and grouping this resource (across resource groups). A maximum of 15 tags can be provided for a resource. Each tag must have a key no greater than 128 characters and value no greater than 256 characters."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/StorageAccountPropertiesCreateParameters"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties",
+        "sku",
+        "kind",
+        "location"
+      ],
+      "description": "Microsoft.Storage/storageAccounts"
+    }
+  },
+  "definitions": {
+    "CustomDomain": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Gets or sets the custom domain name. Name is the CNAME source."
+        },
+        "useSubDomain": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Indicates whether indirect CName validation is enabled. Default value is false. This should only be set on updates"
+        }
+      },
+      "required": [
+        "name"
+      ],
+      "description": "The custom domain assigned to this storage account. This can be set via Update."
+    },
+    "Encryption": {
+      "type": "object",
+      "properties": {
+        "services": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/EncryptionServices"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets the services which are encrypted."
+        },
+        "keySource": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Microsoft.Storage"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets the encryption keySource(provider). Possible values (case-insensitive):  Microsoft.Storage"
+        }
+      },
+      "required": [
+        "keySource"
+      ],
+      "description": "The encryption settings on the account."
+    },
+    "EncryptionService": {
+      "type": "object",
+      "properties": {
+        "enabled": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "A boolean indicating whether or not the service is encrypted."
+        }
+      },
+      "description": "An encrypted service."
+    },
+    "EncryptionServices": {
+      "type": "object",
+      "properties": {
+        "blob": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/EncryptionService"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "The blob service."
+        }
+      },
+      "description": "The encrypted services."
+    },
+    "Sku": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Standard_LRS",
+                "Standard_GRS",
+                "Standard_RAGRS",
+                "Standard_ZRS",
+                "Premium_LRS"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the sku name. Required for account creation, optional for update. Note that in older versions, sku name was called accountType. Possible values include: 'Standard_LRS', 'Standard_GRS', 'Standard_RAGRS', 'Standard_ZRS', 'Premium_LRS'"
+        }
+      },
+      "required": [
+        "name"
+      ],
+      "description": "The SKU of the storage account."
+    },
+    "StorageAccountPropertiesCreateParameters": {
+      "type": "object",
+      "properties": {
+        "customDomain": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/CustomDomain"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "User domain assigned to the storage account. Name is the CNAME source. Only one custom domain is supported per storage account at this time. To clear the existing custom domain, use an empty string for the custom domain name property."
+        },
+        "encryption": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Encryption"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Provides the encryption settings on the account. If left unspecified the account encryption settings will remain. The default setting is unencrypted."
+        },
+        "accessTier": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Hot",
+                "Cool"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Required for StandardBlob accounts. The access tier used for billing. Access tier cannot be changed more than once every 7 days (168 hours). Access tier cannot be set for StandardLRS, StandardGRS, StandardRAGRS, or PremiumLRS account types. Possible values include: 'Hot', 'Cool'"
+        }
+      }
+    }
+  }
+}
diff --git a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/Expected/Web/Microsoft.CertificateRegistration.json b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/Expected/Web/Microsoft.CertificateRegistration.json
new file mode 100644
index 0000000000000..384d6bcb850f2
--- /dev/null
+++ b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/Expected/Web/Microsoft.CertificateRegistration.json
@@ -0,0 +1,474 @@
+{
+  "id": "http://schema.management.azure.com/schemas/2015-08-01/Microsoft.CertificateRegistration.json#",
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Microsoft.CertificateRegistration",
+  "description": "Microsoft CertificateRegistration Resource Types",
+  "resourceDefinitions": {
+    "Microsoft.CertificateRegistration_certificateOrders": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.CertificateRegistration/certificateOrders"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-08-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/CertificateOrder_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "resources": {
+        "type": "array",
+        "items": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Microsoft.CertificateRegistration_certificateOrders_certificates_childResource"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.CertificateRegistration/certificateOrders"
+    },
+    "Microsoft.CertificateRegistration_certificateOrders_certificates": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.CertificateRegistration/certificateOrders/certificates"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-08-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/CertificateOrderCertificate_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.CertificateRegistration/certificateOrders/certificates"
+    }
+  },
+  "definitions": {
+    "CertificateDetails": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "name": {
+          "type": "string",
+          "description": "Resource Name"
+        },
+        "kind": {
+          "type": "string",
+          "description": "Kind of resource"
+        },
+        "location": {
+          "type": "string",
+          "description": "Resource Location"
+        },
+        "type": {
+          "type": "string",
+          "description": "Resource type"
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Resource tags"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/CertificateDetails_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "location"
+      ],
+      "description": "Certificate Details"
+    },
+    "CertificateDetails_properties": {
+      "type": "object",
+      "properties": {
+        "version": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Version"
+        },
+        "serialNumber": {
+          "type": "string",
+          "description": "Serial Number"
+        },
+        "thumbprint": {
+          "type": "string",
+          "description": "Thumbprint"
+        },
+        "subject": {
+          "type": "string",
+          "description": "Subject"
+        },
+        "notBefore": {
+          "type": "string",
+          "description": "Valid from"
+        },
+        "notAfter": {
+          "type": "string",
+          "description": "Valid to"
+        },
+        "signatureAlgorithm": {
+          "type": "string",
+          "description": "Signature Algorithm"
+        },
+        "issuer": {
+          "type": "string",
+          "description": "Issuer"
+        },
+        "rawData": {
+          "type": "string",
+          "description": "Raw certificate data"
+        }
+      }
+    },
+    "CertificateOrder_properties": {
+      "type": "object",
+      "properties": {
+        "certificates": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "$ref": "#/definitions/CertificateOrderCertificate"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "State of the Key Vault secret"
+        },
+        "distinguishedName": {
+          "type": "string",
+          "description": "Certificate distinguished name"
+        },
+        "domainVerificationToken": {
+          "type": "string",
+          "description": "Domain Verification Token"
+        },
+        "validityInYears": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Duration in years (must be between 1 and 3)"
+        },
+        "keySize": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Certificate Key Size"
+        },
+        "productType": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "StandardDomainValidatedSsl",
+                "StandardDomainValidatedWildCardSsl"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Certificate product type. Possible values include: 'StandardDomainValidatedSsl', 'StandardDomainValidatedWildCardSsl'"
+        },
+        "autoRenew": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Auto renew"
+        },
+        "provisioningState": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Succeeded",
+                "Failed",
+                "Canceled",
+                "InProgress",
+                "Deleting"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Status of certificate order. Possible values include: 'Succeeded', 'Failed', 'Canceled', 'InProgress', 'Deleting'"
+        },
+        "status": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Pendingissuance",
+                "Issued",
+                "Revoked",
+                "Canceled",
+                "Denied",
+                "Pendingrevocation",
+                "PendingRekey",
+                "Unused",
+                "Expired",
+                "NotSubmitted"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Current order status. Possible values include: 'Pendingissuance', 'Issued', 'Revoked', 'Canceled', 'Denied', 'Pendingrevocation', 'PendingRekey', 'Unused', 'Expired', 'NotSubmitted'"
+        },
+        "signedCertificate": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/CertificateDetails"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Signed certificate"
+        },
+        "csr": {
+          "type": "string",
+          "description": "Last CSR that was created for this order"
+        },
+        "intermediate": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/CertificateDetails"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Intermediate certificate"
+        },
+        "root": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/CertificateDetails"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Root certificate"
+        },
+        "serialNumber": {
+          "type": "string",
+          "description": "Current serial number of the certificate"
+        },
+        "lastCertificateIssuanceTime": {
+          "type": "string",
+          "description": "Certificate last issuance time"
+        },
+        "expirationTime": {
+          "type": "string",
+          "description": "Certificate expiration time"
+        }
+      }
+    },
+    "CertificateOrderCertificate": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "name": {
+          "type": "string",
+          "description": "Resource Name"
+        },
+        "kind": {
+          "type": "string",
+          "description": "Kind of resource"
+        },
+        "location": {
+          "type": "string",
+          "description": "Resource Location"
+        },
+        "type": {
+          "type": "string",
+          "description": "Resource type"
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Resource tags"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/CertificateOrderCertificate_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "location"
+      ],
+      "description": "Class representing the Key Vault container for certificate purchased through Azure"
+    },
+    "CertificateOrderCertificate_properties": {
+      "type": "object",
+      "properties": {
+        "keyVaultId": {
+          "type": "string",
+          "description": "Key Vault Csm resource Id"
+        },
+        "keyVaultSecretName": {
+          "type": "string",
+          "description": "Key Vault secret name"
+        },
+        "provisioningState": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Initialized",
+                "WaitingOnCertificateOrder",
+                "Succeeded",
+                "CertificateOrderFailed",
+                "OperationNotPermittedOnKeyVault",
+                "AzureServiceUnauthorizedToAccessKeyVault",
+                "KeyVaultDoesNotExist",
+                "KeyVaultSecretDoesNotExist",
+                "UnknownError",
+                "Unknown"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Status of the Key Vault secret. Possible values include: 'Initialized', 'WaitingOnCertificateOrder', 'Succeeded', 'CertificateOrderFailed', 'OperationNotPermittedOnKeyVault', 'AzureServiceUnauthorizedToAccessKeyVault', 'KeyVaultDoesNotExist', 'KeyVaultSecretDoesNotExist', 'UnknownError', 'Unknown'"
+        }
+      }
+    },
+    "Microsoft.CertificateRegistration_certificateOrders_certificates_childResource": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "certificates"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-08-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/CertificateOrderCertificate_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.CertificateRegistration/certificateOrders/certificates"
+    }
+  }
+}
diff --git a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/Expected/Web/Microsoft.DomainRegistration.json b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/Expected/Web/Microsoft.DomainRegistration.json
new file mode 100644
index 0000000000000..afbd6b95f97f1
--- /dev/null
+++ b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/Expected/Web/Microsoft.DomainRegistration.json
@@ -0,0 +1,423 @@
+{
+  "id": "http://schema.management.azure.com/schemas/2015-08-01/Microsoft.DomainRegistration.json#",
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Microsoft.DomainRegistration",
+  "description": "Microsoft DomainRegistration Resource Types",
+  "resourceDefinitions": {
+    "Microsoft.DomainRegistration_domains": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.DomainRegistration/domains"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-08-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Domain_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.DomainRegistration/domains"
+    }
+  },
+  "definitions": {
+    "Address": {
+      "type": "object",
+      "properties": {
+        "address1": {
+          "type": "string",
+          "description": "Address 1"
+        },
+        "address2": {
+          "type": "string",
+          "description": "Address 2"
+        },
+        "city": {
+          "type": "string",
+          "description": "City"
+        },
+        "country": {
+          "type": "string",
+          "description": "Country"
+        },
+        "postalCode": {
+          "type": "string",
+          "description": "Postal code"
+        },
+        "state": {
+          "type": "string",
+          "description": "State"
+        }
+      },
+      "description": "Address information for domain registration"
+    },
+    "Contact": {
+      "type": "object",
+      "properties": {
+        "addressMailing": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Address"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Mailing address"
+        },
+        "email": {
+          "type": "string",
+          "description": "Email address"
+        },
+        "fax": {
+          "type": "string",
+          "description": "Fax number"
+        },
+        "jobTitle": {
+          "type": "string",
+          "description": "Job title"
+        },
+        "nameFirst": {
+          "type": "string",
+          "description": "First name"
+        },
+        "nameLast": {
+          "type": "string",
+          "description": "Last name"
+        },
+        "nameMiddle": {
+          "type": "string",
+          "description": "Middle name"
+        },
+        "organization": {
+          "type": "string",
+          "description": "Organization"
+        },
+        "phone": {
+          "type": "string",
+          "description": "Phone number"
+        }
+      },
+      "description": "Contact information for domain registration. If 'Domain Privacy' option is not selected then the contact information will be  be made publicly available through the Whois directories as per ICANN requirements."
+    },
+    "Domain_properties": {
+      "type": "object",
+      "properties": {
+        "contactAdmin": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Contact"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Admin contact information"
+        },
+        "contactBilling": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Contact"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Billing contact information"
+        },
+        "contactRegistrant": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Contact"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Registrant contact information"
+        },
+        "contactTech": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Contact"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Technical contact information"
+        },
+        "registrationStatus": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Active",
+                "Awaiting",
+                "Cancelled",
+                "Confiscated",
+                "Disabled",
+                "Excluded",
+                "Expired",
+                "Failed",
+                "Held",
+                "Locked",
+                "Parked",
+                "Pending",
+                "Reserved",
+                "Reverted",
+                "Suspended",
+                "Transferred",
+                "Unknown",
+                "Unlocked",
+                "Unparked",
+                "Updated",
+                "JsonConverterFailed"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Domain registration status. Possible values include: 'Active', 'Awaiting', 'Cancelled', 'Confiscated', 'Disabled', 'Excluded', 'Expired', 'Failed', 'Held', 'Locked', 'Parked', 'Pending', 'Reserved', 'Reverted', 'Suspended', 'Transferred', 'Unknown', 'Unlocked', 'Unparked', 'Updated', 'JsonConverterFailed'"
+        },
+        "provisioningState": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Succeeded",
+                "Failed",
+                "Canceled",
+                "InProgress",
+                "Deleting"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Domain provisioning state. Possible values include: 'Succeeded', 'Failed', 'Canceled', 'InProgress', 'Deleting'"
+        },
+        "nameServers": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Name servers"
+        },
+        "privacy": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "If true then domain privacy is enabled for this domain"
+        },
+        "createdTime": {
+          "type": "string",
+          "description": "Domain creation timestamp"
+        },
+        "expirationTime": {
+          "type": "string",
+          "description": "Domain expiration timestamp"
+        },
+        "lastRenewedTime": {
+          "type": "string",
+          "description": "Timestamp when the domain was renewed last time"
+        },
+        "autoRenew": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "If true then domain will renewed automatically"
+        },
+        "readyForDnsRecordManagement": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "If true then Azure can assign this domain to Web Apps. This value will be true if domain registration status is active and it is hosted on name servers Azure has programmatic access to"
+        },
+        "managedHostNames": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/HostName"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "All hostnames derived from the domain and assigned to Azure resources"
+        },
+        "consent": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/DomainPurchaseConsent"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Legal agreement consent"
+        },
+        "domainNotRenewableReasons": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "RegistrationStatusNotSupportedForRenewal",
+                "ExpirationNotInRenewalTimeRange",
+                "SubscriptionNotActive"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      }
+    },
+    "DomainPurchaseConsent": {
+      "type": "object",
+      "properties": {
+        "agreementKeys": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "List of applicable legal agreement keys. This list can be retrieved using ListLegalAgreements Api under TopLevelDomain resource"
+        },
+        "agreedBy": {
+          "type": "string",
+          "description": "Client IP address"
+        },
+        "agreedAt": {
+          "type": "string",
+          "description": "Timestamp when the agreements were accepted"
+        }
+      },
+      "description": "Domain purchase consent object representing acceptance of applicable legal agreements"
+    },
+    "HostName": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Name of the hostname"
+        },
+        "siteNames": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "List of sites the hostname is assigned to. This list will have more than one site only if the hostname is pointing to a Traffic Manager"
+        },
+        "azureResourceName": {
+          "type": "string",
+          "description": "Name of the Azure resource the hostname is assigned to. If it is assigned to a traffic manager then it will be the traffic manager name otherwise it will be the website name"
+        },
+        "azureResourceType": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Website",
+                "TrafficManager"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Type of the Azure resource the hostname is assigned to. Possible values include: 'Website', 'TrafficManager'"
+        },
+        "customHostNameDnsRecordType": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "CName",
+                "A"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Type of the Dns record. Possible values include: 'CName', 'A'"
+        },
+        "hostNameType": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Verified",
+                "Managed"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Type of the hostname. Possible values include: 'Verified', 'Managed'"
+        }
+      },
+      "description": "Details of a hostname derived from a domain"
+    }
+  }
+}
diff --git a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/Expected/Web/Microsoft.Web.json b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/Expected/Web/Microsoft.Web.json
new file mode 100644
index 0000000000000..9ba73d1303b08
--- /dev/null
+++ b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/Expected/Web/Microsoft.Web.json
@@ -0,0 +1,3600 @@
+{
+  "id": "http://schema.management.azure.com/schemas/2015-08-01/Microsoft.Web.json#",
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Microsoft.Web",
+  "description": "Microsoft Web Resource Types",
+  "resourceDefinitions": {
+    "Microsoft.Web_certificates": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Web/certificates"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-08-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Certificate_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Web/certificates"
+    },
+    "Microsoft.Web_csrs": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Web/csrs"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-08-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Csr_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Web/csrs"
+    },
+    "Microsoft.Web_hostingEnvironments": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Web/hostingEnvironments"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-08-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/HostingEnvironment_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "resources": {
+        "type": "array",
+        "items": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Microsoft.Web_hostingEnvironments_workerPools_childResource"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Web/hostingEnvironments"
+    },
+    "Microsoft.Web_hostingEnvironments_workerPools": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Web/hostingEnvironments/workerPools"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-08-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/WorkerPool_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "sku": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SkuDescription"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Web/hostingEnvironments/workerPools"
+    },
+    "Microsoft.Web_managedHostingEnvironments": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Web/managedHostingEnvironments"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-08-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/HostingEnvironment_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Web/managedHostingEnvironments"
+    },
+    "Microsoft.Web_serverfarms": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Web/serverfarms"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-08-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ServerFarmWithRichSku_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "sku": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SkuDescription"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Web/serverfarms"
+    },
+    "Microsoft.Web_serverfarms_virtualNetworkConnections_gateways": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Web/serverfarms/virtualNetworkConnections/gateways"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-08-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VnetGateway_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Web/serverfarms/virtualNetworkConnections/gateways"
+    },
+    "Microsoft.Web_serverfarms_virtualNetworkConnections_routes": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Web/serverfarms/virtualNetworkConnections/routes"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-08-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VnetRoute_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Web/serverfarms/virtualNetworkConnections/routes"
+    },
+    "Microsoft.Web_sites": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Web/sites"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-08-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Site_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "resources": {
+        "type": "array",
+        "items": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Microsoft.Web_sites_hybridconnection_childResource"
+            },
+            {
+              "$ref": "#/definitions/Microsoft.Web_sites_hostNameBindings_childResource"
+            },
+            {
+              "$ref": "#/definitions/Microsoft.Web_sites_deployments_childResource"
+            },
+            {
+              "$ref": "#/definitions/Microsoft.Web_sites_slots_childResource"
+            },
+            {
+              "$ref": "#/definitions/Microsoft.Web_sites_virtualNetworkConnections_childResource"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Web/sites"
+    },
+    "Microsoft.Web_sites_deployments": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Web/sites/deployments"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-08-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Deployment_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Web/sites/deployments"
+    },
+    "Microsoft.Web_sites_hostNameBindings": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Web/sites/hostNameBindings"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-08-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/HostNameBinding_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Web/sites/hostNameBindings"
+    },
+    "Microsoft.Web_sites_hybridconnection": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Web/sites/hybridconnection"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-08-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/RelayServiceConnectionEntity_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Web/sites/hybridconnection"
+    },
+    "Microsoft.Web_sites_instances_deployments": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Web/sites/instances/deployments"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-08-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Deployment_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Web/sites/instances/deployments"
+    },
+    "Microsoft.Web_sites_slots": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Web/sites/slots"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-08-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Site_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "resources": {
+        "type": "array",
+        "items": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Microsoft.Web_sites_slots_hybridconnection_childResource"
+            },
+            {
+              "$ref": "#/definitions/Microsoft.Web_sites_slots_hostNameBindings_childResource"
+            },
+            {
+              "$ref": "#/definitions/Microsoft.Web_sites_slots_deployments_childResource"
+            },
+            {
+              "$ref": "#/definitions/Microsoft.Web_sites_slots_virtualNetworkConnections_childResource"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Web/sites/slots"
+    },
+    "Microsoft.Web_sites_slots_deployments": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Web/sites/slots/deployments"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-08-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Deployment_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Web/sites/slots/deployments"
+    },
+    "Microsoft.Web_sites_slots_hostNameBindings": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Web/sites/slots/hostNameBindings"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-08-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/HostNameBinding_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Web/sites/slots/hostNameBindings"
+    },
+    "Microsoft.Web_sites_slots_hybridconnection": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Web/sites/slots/hybridconnection"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-08-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/RelayServiceConnectionEntity_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Web/sites/slots/hybridconnection"
+    },
+    "Microsoft.Web_sites_slots_instances_deployments": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Web/sites/slots/instances/deployments"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-08-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Deployment_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Web/sites/slots/instances/deployments"
+    },
+    "Microsoft.Web_sites_slots_virtualNetworkConnections": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Web/sites/slots/virtualNetworkConnections"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-08-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VnetInfo_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "resources": {
+        "type": "array",
+        "items": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Microsoft.Web_sites_slots_virtualNetworkConnections_gateways_childResource"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Web/sites/slots/virtualNetworkConnections"
+    },
+    "Microsoft.Web_sites_slots_virtualNetworkConnections_gateways": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Web/sites/slots/virtualNetworkConnections/gateways"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-08-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VnetGateway_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Web/sites/slots/virtualNetworkConnections/gateways"
+    },
+    "Microsoft.Web_sites_virtualNetworkConnections": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Web/sites/virtualNetworkConnections"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-08-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VnetInfo_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "resources": {
+        "type": "array",
+        "items": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Microsoft.Web_sites_virtualNetworkConnections_gateways_childResource"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Web/sites/virtualNetworkConnections"
+    },
+    "Microsoft.Web_sites_virtualNetworkConnections_gateways": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Web/sites/virtualNetworkConnections/gateways"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-08-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VnetGateway_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Web/sites/virtualNetworkConnections/gateways"
+    }
+  },
+  "definitions": {
+    "ApiDefinitionInfo": {
+      "type": "object",
+      "properties": {
+        "url": {
+          "type": "string",
+          "description": "The URL of the API definition."
+        }
+      },
+      "description": "Information about the formal API definition for the web app."
+    },
+    "AutoHealActions": {
+      "type": "object",
+      "properties": {
+        "actionType": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Recycle",
+                "LogEvent",
+                "CustomAction"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "ActionType - predefined action to be taken. Possible values include: 'Recycle', 'LogEvent', 'CustomAction'"
+        },
+        "customAction": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/AutoHealCustomAction"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "CustomAction - custom action to be taken"
+        },
+        "minProcessExecutionTime": {
+          "type": "string",
+          "description": "MinProcessExecutionTime - minimum time the process must execute\r\n            before taking the action"
+        }
+      },
+      "required": [
+        "actionType"
+      ],
+      "description": "AutoHealActions - Describes the actions which can be\r\n            taken by the auto-heal module when a rule is triggered."
+    },
+    "AutoHealCustomAction": {
+      "type": "object",
+      "properties": {
+        "exe": {
+          "type": "string",
+          "description": "Executable to be run"
+        },
+        "parameters": {
+          "type": "string",
+          "description": "Parameters for the executable"
+        }
+      },
+      "description": "AutoHealCustomAction - Describes the custom action to be executed\r\n            when an auto heal rule is triggered."
+    },
+    "AutoHealRules": {
+      "type": "object",
+      "properties": {
+        "triggers": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/AutoHealTriggers"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Triggers - Conditions that describe when to execute the auto-heal actions"
+        },
+        "actions": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/AutoHealActions"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Actions - Actions to be executed when a rule is triggered"
+        }
+      },
+      "description": "AutoHealRules - describes the rules which can be defined for auto-heal"
+    },
+    "AutoHealTriggers": {
+      "type": "object",
+      "properties": {
+        "requests": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/RequestsBasedTrigger"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Requests - Defines a rule based on total requests"
+        },
+        "privateBytesInKB": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "PrivateBytesInKB - Defines a rule based on private bytes"
+        },
+        "statusCodes": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/StatusCodesBasedTrigger"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "StatusCodes - Defines a rule based on status codes"
+        },
+        "slowRequests": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SlowRequestsBasedTrigger"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "SlowRequests - Defines a rule based on request execution time"
+        }
+      },
+      "description": "AutoHealTriggers - describes the triggers for auto-heal."
+    },
+    "Certificate_properties": {
+      "type": "object",
+      "properties": {
+        "friendlyName": {
+          "type": "string",
+          "description": "Friendly name of the certificate"
+        },
+        "subjectName": {
+          "type": "string",
+          "description": "Subject name of the certificate"
+        },
+        "hostNames": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Host names the certificate applies to"
+        },
+        "pfxBlob": {
+          "type": "string",
+          "description": "Pfx blob"
+        },
+        "siteName": {
+          "type": "string",
+          "description": "App name"
+        },
+        "selfLink": {
+          "type": "string",
+          "description": "Self link"
+        },
+        "issuer": {
+          "type": "string",
+          "description": "Certificate issuer"
+        },
+        "issueDate": {
+          "type": "string",
+          "description": "Certificate issue Date"
+        },
+        "expirationDate": {
+          "type": "string",
+          "description": "Certificate expriration date"
+        },
+        "password": {
+          "type": "string",
+          "description": "Certificate password"
+        },
+        "thumbprint": {
+          "type": "string",
+          "description": "Certificate thumbprint"
+        },
+        "valid": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Is the certificate valid?"
+        },
+        "cerBlob": {
+          "type": "string",
+          "description": "Raw bytes of .cer file"
+        },
+        "publicKeyHash": {
+          "type": "string",
+          "description": "Public key hash"
+        },
+        "hostingEnvironmentProfile": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/HostingEnvironmentProfile"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Specification for the hosting environment (App Service Environment) to use for the certificate"
+        }
+      }
+    },
+    "CloningInfo": {
+      "type": "object",
+      "properties": {
+        "correlationId": {
+          "type": "string",
+          "description": "Correlation Id of cloning operation. This id ties multiple cloning operations\r\n            together to use the same snapshot"
+        },
+        "overwrite": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Overwrite destination web app"
+        },
+        "cloneCustomHostNames": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "If true, clone custom hostnames from source web app"
+        },
+        "cloneSourceControl": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Clone source control from source web app"
+        },
+        "sourceWebAppId": {
+          "type": "string",
+          "description": "ARM resource id of the source web app. Web app resource id is of the form \r\n            /subscriptions/{subId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{siteName} for production slots and \r\n            /subscriptions/{subId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{siteName}/slots/{slotName} for other slots"
+        },
+        "hostingEnvironment": {
+          "type": "string",
+          "description": "Hosting environment"
+        },
+        "appSettingsOverrides": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Application settings overrides for cloned web app. If specified these settings will override the settings cloned \r\n            from source web app. If not specified, application settings from source web app are retained."
+        },
+        "configureLoadBalancing": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "If specified configure load balancing for source and clone site"
+        },
+        "trafficManagerProfileId": {
+          "type": "string",
+          "description": "ARM resource id of the traffic manager profile to use if it exists. Traffic manager resource id is of the form \r\n            /subscriptions/{subId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/trafficManagerProfiles/{profileName}"
+        },
+        "trafficManagerProfileName": {
+          "type": "string",
+          "description": "Name of traffic manager profile to create. This is only needed if traffic manager profile does not already exist"
+        }
+      },
+      "description": "Represents information needed for cloning operation"
+    },
+    "ConnStringInfo": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Name of connection string"
+        },
+        "connectionString": {
+          "type": "string",
+          "description": "Connection string value"
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "MySql",
+            "SQLServer",
+            "SQLAzure",
+            "Custom"
+          ],
+          "description": "Type of database. Possible values include: 'MySql', 'SQLServer', 'SQLAzure', 'Custom'"
+        }
+      },
+      "required": [
+        "type"
+      ],
+      "description": "Represents database connection string information"
+    },
+    "CorsSettings": {
+      "type": "object",
+      "properties": {
+        "allowedOrigins": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the list of origins that should be allowed to make cross-origin\r\n            calls (for example: http://example.com:12345). Use \"*\" to allow all."
+        }
+      },
+      "description": "Cross-Origin Resource Sharing (CORS) settings for the web app."
+    },
+    "Csr_properties": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Name used to locate CSR object"
+        },
+        "distinguishedName": {
+          "type": "string",
+          "description": "Distinguished name of certificate to be created"
+        },
+        "csrString": {
+          "type": "string",
+          "description": "Actual CSR string created"
+        },
+        "pfxBlob": {
+          "type": "string",
+          "description": "PFX certifcate of created certificate"
+        },
+        "password": {
+          "type": "string",
+          "description": "PFX password"
+        },
+        "publicKeyHash": {
+          "type": "string",
+          "description": "Hash of the certificates public key"
+        },
+        "hostingEnvironment": {
+          "type": "string",
+          "description": "Hosting environment"
+        }
+      }
+    },
+    "Deployment_properties": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Id"
+        },
+        "status": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Status"
+        },
+        "message": {
+          "type": "string",
+          "description": "Message"
+        },
+        "author": {
+          "type": "string",
+          "description": "Author"
+        },
+        "deployer": {
+          "type": "string",
+          "description": "Deployer"
+        },
+        "author_email": {
+          "type": "string",
+          "description": "AuthorEmail"
+        },
+        "start_time": {
+          "type": "string",
+          "description": "StartTime"
+        },
+        "end_time": {
+          "type": "string",
+          "description": "EndTime"
+        },
+        "active": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Active"
+        },
+        "details": {
+          "type": "string",
+          "description": "Detail"
+        }
+      }
+    },
+    "Experiments": {
+      "type": "object",
+      "properties": {
+        "rampUpRules": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/RampUpRule"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "List of {Microsoft.Web.Hosting.Administration.RampUpRule} objects."
+        }
+      },
+      "description": "Class containing Routing in production experiments"
+    },
+    "HandlerMapping": {
+      "type": "object",
+      "properties": {
+        "extension": {
+          "type": "string",
+          "description": "Requests with this extension will be handled using the specified FastCGI application."
+        },
+        "scriptProcessor": {
+          "type": "string",
+          "description": "The absolute path to the FastCGI application."
+        },
+        "arguments": {
+          "type": "string",
+          "description": "Command-line arguments to be passed to the script processor."
+        }
+      },
+      "description": "The IIS handler mappings used to define which handler processes HTTP requests with certain extension. \r\n            For example it is used to configure php-cgi.exe process to handle all HTTP requests with *.php extension."
+    },
+    "HostingEnvironment_properties": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Name of the hostingEnvironment (App Service Environment)"
+        },
+        "location": {
+          "type": "string",
+          "description": "Location of the hostingEnvironment (App Service Environment), e.g. \"West US\""
+        },
+        "provisioningState": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Succeeded",
+                "Failed",
+                "Canceled",
+                "InProgress",
+                "Deleting"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Provisioning state of the hostingEnvironment (App Service Environment). Possible values include: 'Succeeded', 'Failed', 'Canceled', 'InProgress', 'Deleting'"
+        },
+        "status": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Preparing",
+                "Ready",
+                "Scaling",
+                "Deleting"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Current status of the hostingEnvironment (App Service Environment). Possible values include: 'Preparing', 'Ready', 'Scaling', 'Deleting'"
+        },
+        "vnetName": {
+          "type": "string",
+          "description": "Name of the hostingEnvironment's (App Service Environment) virtual network"
+        },
+        "vnetResourceGroupName": {
+          "type": "string",
+          "description": "Resource group of the hostingEnvironment's (App Service Environment) virtual network"
+        },
+        "vnetSubnetName": {
+          "type": "string",
+          "description": "Subnet of the hostingEnvironment's (App Service Environment) virtual network"
+        },
+        "virtualNetwork": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VirtualNetworkProfile"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Description of the hostingEnvironment's (App Service Environment) virtual network"
+        },
+        "internalLoadBalancingMode": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "None",
+                "Web",
+                "Publishing"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Specifies which endpoints to serve internally in the hostingEnvironment's (App Service Environment) VNET. Possible values include: 'None', 'Web', 'Publishing'"
+        },
+        "multiSize": {
+          "type": "string",
+          "description": "Front-end VM size, e.g. \"Medium\", \"Large\""
+        },
+        "multiRoleCount": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Number of front-end instances"
+        },
+        "workerPools": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/WorkerPool"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Description of worker pools with worker size ids, VM sizes, and number of workers in each pool"
+        },
+        "ipsslAddressCount": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Number of IP SSL addresses reserved for this hostingEnvironment (App Service Environment)"
+        },
+        "databaseEdition": {
+          "type": "string",
+          "description": "Edition of the metadata database for the hostingEnvironment (App Service Environment) e.g. \"Standard\""
+        },
+        "databaseServiceObjective": {
+          "type": "string",
+          "description": "Service objective of the metadata database for the hostingEnvironment (App Service Environment) e.g. \"S0\""
+        },
+        "upgradeDomains": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Number of upgrade domains of this hostingEnvironment (App Service Environment)"
+        },
+        "subscriptionId": {
+          "type": "string",
+          "description": "Subscription of the hostingEnvironment (App Service Environment)"
+        },
+        "dnsSuffix": {
+          "type": "string",
+          "description": "DNS suffix of the hostingEnvironment (App Service Environment)"
+        },
+        "lastAction": {
+          "type": "string",
+          "description": "Last deployment action on this hostingEnvironment (App Service Environment)"
+        },
+        "lastActionResult": {
+          "type": "string",
+          "description": "Result of the last deployment action on this hostingEnvironment (App Service Environment)"
+        },
+        "allowedMultiSizes": {
+          "type": "string",
+          "description": "List of comma separated strings describing which VM sizes are allowed for front-ends"
+        },
+        "allowedWorkerSizes": {
+          "type": "string",
+          "description": "List of comma separated strings describing which VM sizes are allowed for workers"
+        },
+        "maximumNumberOfMachines": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Maximum number of VMs in this hostingEnvironment (App Service Environment)"
+        },
+        "vipMappings": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/VirtualIPMapping"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Description of IP SSL mapping for this hostingEnvironment (App Service Environment)"
+        },
+        "environmentCapacities": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/StampCapacity"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Current total, used, and available worker capacities"
+        },
+        "networkAccessControlList": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/NetworkAccessControlEntry"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Access control list for controlling traffic to the hostingEnvironment (App Service Environment)"
+        },
+        "environmentIsHealthy": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "True/false indicating whether the hostingEnvironment (App Service Environment) is healthy"
+        },
+        "environmentStatus": {
+          "type": "string",
+          "description": "Detailed message about with results of the last check of the hostingEnvironment (App Service Environment)"
+        },
+        "resourceGroup": {
+          "type": "string",
+          "description": "Resource group of the hostingEnvironment (App Service Environment)"
+        },
+        "apiManagementAccountId": {
+          "type": "string",
+          "description": "Api Management Account associated with this Hosting Environment"
+        },
+        "suspended": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "True/false indicating whether the hostingEnvironment is suspended. The environment can be suspended e.g. when the management endpoint is no longer available\r\n            (most likely because NSG blocked the incoming traffic)"
+        },
+        "clusterSettings": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/NameValuePair"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Custom settings for changing the behavior of the hosting environment"
+        }
+      }
+    },
+    "HostingEnvironmentProfile": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource id of the hostingEnvironment (App Service Environment)"
+        },
+        "name": {
+          "type": "string",
+          "description": "Name of the hostingEnvironment (App Service Environment) (read only)"
+        },
+        "type": {
+          "type": "string",
+          "description": "Resource type of the hostingEnvironment (App Service Environment) (read only)"
+        }
+      },
+      "description": "Specification for a hostingEnvironment (App Service Environment) to use for this resource"
+    },
+    "HostNameBinding_properties": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Hostname"
+        },
+        "siteName": {
+          "type": "string",
+          "description": "Web app name"
+        },
+        "domainId": {
+          "type": "string",
+          "description": "Fully qualified ARM domain resource URI"
+        },
+        "azureResourceName": {
+          "type": "string",
+          "description": "Azure resource name"
+        },
+        "azureResourceType": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Website",
+                "TrafficManager"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Azure resource type. Possible values include: 'Website', 'TrafficManager'"
+        },
+        "customHostNameDnsRecordType": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "CName",
+                "A"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Custom DNS record type. Possible values include: 'CName', 'A'"
+        },
+        "hostNameType": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Verified",
+                "Managed"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Host name type. Possible values include: 'Verified', 'Managed'"
+        }
+      }
+    },
+    "HostNameSslState": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Host name"
+        },
+        "sslState": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Disabled",
+                "SniEnabled",
+                "IpBasedEnabled"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "SSL type. Possible values include: 'Disabled', 'SniEnabled', 'IpBasedEnabled'"
+        },
+        "virtualIP": {
+          "type": "string",
+          "description": "Virtual IP address assigned to the host name if IP based SSL is enabled"
+        },
+        "thumbprint": {
+          "type": "string",
+          "description": "SSL cert thumbprint"
+        },
+        "toUpdate": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Set this flag to update existing host name"
+        }
+      },
+      "required": [
+        "sslState"
+      ],
+      "description": "Object that represents a SSL-enabled host name."
+    },
+    "IpSecurityRestriction": {
+      "type": "object",
+      "properties": {
+        "ipAddress": {
+          "type": "string",
+          "description": "IP address the security restriction is valid for"
+        },
+        "subnetMask": {
+          "type": "string",
+          "description": "Subnet mask for the range of IP addresses the restriction is valid for"
+        }
+      },
+      "description": "Represents an ip security restriction on a web app."
+    },
+    "Microsoft.Web_hostingEnvironments_workerPools_childResource": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "workerPools"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-08-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/WorkerPool_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "sku": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SkuDescription"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Web/hostingEnvironments/workerPools"
+    },
+    "Microsoft.Web_sites_deployments_childResource": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "deployments"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-08-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Deployment_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Web/sites/deployments"
+    },
+    "Microsoft.Web_sites_hostNameBindings_childResource": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "hostNameBindings"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-08-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/HostNameBinding_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Web/sites/hostNameBindings"
+    },
+    "Microsoft.Web_sites_hybridconnection_childResource": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "hybridconnection"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-08-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/RelayServiceConnectionEntity_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Web/sites/hybridconnection"
+    },
+    "Microsoft.Web_sites_slots_childResource": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "slots"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-08-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Site_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "resources": {
+        "type": "array",
+        "items": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Microsoft.Web_sites_slots_hybridconnection_childResource"
+            },
+            {
+              "$ref": "#/definitions/Microsoft.Web_sites_slots_hostNameBindings_childResource"
+            },
+            {
+              "$ref": "#/definitions/Microsoft.Web_sites_slots_deployments_childResource"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Web/sites/slots"
+    },
+    "Microsoft.Web_sites_slots_deployments_childResource": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "deployments"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-08-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Deployment_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Web/sites/slots/deployments"
+    },
+    "Microsoft.Web_sites_slots_hostNameBindings_childResource": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "hostNameBindings"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-08-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/HostNameBinding_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Web/sites/slots/hostNameBindings"
+    },
+    "Microsoft.Web_sites_slots_hybridconnection_childResource": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "hybridconnection"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-08-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/RelayServiceConnectionEntity_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Web/sites/slots/hybridconnection"
+    },
+    "Microsoft.Web_sites_slots_virtualNetworkConnections_childResource": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "virtualNetworkConnections"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-08-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VnetInfo_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "resources": {
+        "type": "array",
+        "items": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Microsoft.Web_sites_slots_virtualNetworkConnections_gateways_childResource"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Web/sites/slots/virtualNetworkConnections"
+    },
+    "Microsoft.Web_sites_slots_virtualNetworkConnections_gateways_childResource": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "gateways"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-08-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VnetGateway_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Web/sites/slots/virtualNetworkConnections/gateways"
+    },
+    "Microsoft.Web_sites_virtualNetworkConnections_childResource": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "virtualNetworkConnections"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-08-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VnetInfo_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "resources": {
+        "type": "array",
+        "items": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Microsoft.Web_sites_virtualNetworkConnections_gateways_childResource"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Web/sites/virtualNetworkConnections"
+    },
+    "Microsoft.Web_sites_virtualNetworkConnections_gateways_childResource": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "gateways"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2015-08-01"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VnetGateway_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Web/sites/virtualNetworkConnections/gateways"
+    },
+    "NameValuePair": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Pair name"
+        },
+        "value": {
+          "type": "string",
+          "description": "Pair value"
+        }
+      },
+      "description": "Name value pair"
+    },
+    "NetworkAccessControlEntry": {
+      "type": "object",
+      "properties": {
+        "action": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Permit",
+                "Deny"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Possible values include: 'Permit', 'Deny'"
+        },
+        "description": {
+          "type": "string"
+        },
+        "order": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "remoteSubnet": {
+          "type": "string"
+        }
+      }
+    },
+    "RampUpRule": {
+      "type": "object",
+      "properties": {
+        "actionHostName": {
+          "type": "string",
+          "description": "Hostname of a slot to which the traffic will be redirected if decided to. E.g. mysite-stage.azurewebsites.net"
+        },
+        "reroutePercentage": {
+          "oneOf": [
+            {
+              "type": "number"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Percentage of the traffic which will be redirected to {Microsoft.Web.Hosting.Administration.RampUpRule.ActionHostName}"
+        },
+        "changeStep": {
+          "oneOf": [
+            {
+              "type": "number"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "[Optional] In auto ramp up scenario this is the step to to add/remove from {Microsoft.Web.Hosting.Administration.RampUpRule.ReroutePercentage} until it reaches \r\n            {Microsoft.Web.Hosting.Administration.RampUpRule.MinReroutePercentage} or {Microsoft.Web.Hosting.Administration.RampUpRule.MaxReroutePercentage}. Site metrics are checked every N minutes specificed in {Microsoft.Web.Hosting.Administration.RampUpRule.ChangeIntervalInMinutes}.\r\n            Custom decision algorithm can be provided in TiPCallback site extension which Url can be specified in {Microsoft.Web.Hosting.Administration.RampUpRule.ChangeDecisionCallbackUrl}"
+        },
+        "changeIntervalInMinutes": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "[Optional] Specifies interval in mimuntes to reevaluate ReroutePercentage"
+        },
+        "minReroutePercentage": {
+          "oneOf": [
+            {
+              "type": "number"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "[Optional] Specifies lower boundary above which ReroutePercentage will stay."
+        },
+        "maxReroutePercentage": {
+          "oneOf": [
+            {
+              "type": "number"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "[Optional] Specifies upper boundary below which ReroutePercentage will stay."
+        },
+        "changeDecisionCallbackUrl": {
+          "type": "string",
+          "description": "Custom decision algorithm can be provided in TiPCallback site extension which Url can be specified. See TiPCallback site extension for the scaffold and contracts.\r\n            https://www.siteextensions.net/packages/TiPCallback/"
+        },
+        "name": {
+          "type": "string",
+          "description": "Name of the routing rule. The recommended name would be to point to the slot which will receive the traffic in the experiment."
+        }
+      },
+      "description": "Routing rules for ramp up testing. This rule allows to redirect static traffic % to a slot or to gradually change routing % based on performance"
+    },
+    "RelayServiceConnectionEntity_properties": {
+      "type": "object",
+      "properties": {
+        "entityName": {
+          "type": "string"
+        },
+        "entityConnectionString": {
+          "type": "string"
+        },
+        "resourceType": {
+          "type": "string"
+        },
+        "resourceConnectionString": {
+          "type": "string"
+        },
+        "hostname": {
+          "type": "string"
+        },
+        "port": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "biztalkUri": {
+          "type": "string"
+        }
+      }
+    },
+    "RequestsBasedTrigger": {
+      "type": "object",
+      "properties": {
+        "count": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Count"
+        },
+        "timeInterval": {
+          "type": "string",
+          "description": "TimeInterval"
+        }
+      },
+      "description": "RequestsBasedTrigger"
+    },
+    "ServerFarmWithRichSku_properties": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Name for the App Service Plan"
+        },
+        "workerTierName": {
+          "type": "string",
+          "description": "Target worker tier assigned to the App Service Plan"
+        },
+        "adminSiteName": {
+          "type": "string",
+          "description": "App Service Plan administration site"
+        },
+        "hostingEnvironmentProfile": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/HostingEnvironmentProfile"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Specification for the hosting environment (App Service Environment) to use for the App Service Plan"
+        },
+        "maximumNumberOfWorkers": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Maximum number of instances that can be assigned to this App Service Plan"
+        },
+        "perSiteScaling": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "If True apps assigned to this App Service Plan can be scaled independently\r\n            If False apps assigned to this App Service Plan will scale to all instances of the plan"
+        }
+      }
+    },
+    "Site_properties": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Name of web app"
+        },
+        "enabled": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "True if the site is enabled; otherwise, false. Setting this  value to false disables the site (takes the site off line)."
+        },
+        "hostNameSslStates": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/HostNameSslState"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Hostname SSL states are  used to manage the SSL bindings for site's hostnames."
+        },
+        "serverFarmId": {
+          "type": "string"
+        },
+        "siteConfig": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SiteConfig"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Configuration of web app"
+        },
+        "scmSiteAlsoStopped": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "If set indicates whether to stop SCM (KUDU) site when the web app is stopped. Default is false."
+        },
+        "hostingEnvironmentProfile": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/HostingEnvironmentProfile"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Specification for the hosting environment (App Service Environment) to use for the web app"
+        },
+        "microService": {
+          "type": "string"
+        },
+        "gatewaySiteName": {
+          "type": "string",
+          "description": "Name of gateway app associated with web app"
+        },
+        "clientAffinityEnabled": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Specifies if the client affinity is enabled when load balancing http request for multiple instances of the web app"
+        },
+        "clientCertEnabled": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Specifies if the client certificate is enabled for the web app"
+        },
+        "hostNamesDisabled": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Specifies if the public hostnames are disabled the web app.\r\n            If set to true the app is only accessible via API Management process"
+        },
+        "containerSize": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Size of a function container"
+        },
+        "maxNumberOfWorkers": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Maximum number of workers\r\n            This only applies to function container"
+        },
+        "cloningInfo": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/CloningInfo"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "This is only valid for web app creation. If specified, web app is cloned from \r\n            a source web app"
+        }
+      }
+    },
+    "SiteConfig": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "name": {
+          "type": "string",
+          "description": "Resource Name"
+        },
+        "kind": {
+          "type": "string",
+          "description": "Kind of resource"
+        },
+        "location": {
+          "type": "string",
+          "description": "Resource Location"
+        },
+        "type": {
+          "type": "string",
+          "description": "Resource type"
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Resource tags"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SiteConfig_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "location"
+      ],
+      "description": "Configuration of Azure web site"
+    },
+    "SiteConfig_properties": {
+      "type": "object",
+      "properties": {
+        "numberOfWorkers": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Number of workers"
+        },
+        "defaultDocuments": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Default documents"
+        },
+        "netFrameworkVersion": {
+          "type": "string",
+          "description": "Net Framework Version"
+        },
+        "phpVersion": {
+          "type": "string",
+          "description": "Version of PHP"
+        },
+        "pythonVersion": {
+          "type": "string",
+          "description": "Version of Python"
+        },
+        "requestTracingEnabled": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Enable request tracing"
+        },
+        "requestTracingExpirationTime": {
+          "type": "string",
+          "description": "Request tracing expiration time"
+        },
+        "remoteDebuggingEnabled": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Remote Debugging Enabled"
+        },
+        "remoteDebuggingVersion": {
+          "type": "string",
+          "description": "Remote Debugging Version"
+        },
+        "httpLoggingEnabled": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "HTTP logging Enabled"
+        },
+        "logsDirectorySizeLimit": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "HTTP Logs Directory size limit"
+        },
+        "detailedErrorLoggingEnabled": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Detailed error logging enabled"
+        },
+        "publishingUsername": {
+          "type": "string",
+          "description": "Publishing user name"
+        },
+        "publishingPassword": {
+          "type": "string",
+          "description": "Publishing password"
+        },
+        "appSettings": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/NameValuePair"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Application Settings"
+        },
+        "metadata": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/NameValuePair"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Site Metadata"
+        },
+        "connectionStrings": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/ConnStringInfo"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Connection strings"
+        },
+        "handlerMappings": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/HandlerMapping"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Handler mappings"
+        },
+        "documentRoot": {
+          "type": "string",
+          "description": "Document root"
+        },
+        "scmType": {
+          "type": "string",
+          "description": "SCM type"
+        },
+        "use32BitWorkerProcess": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Use 32 bit worker process"
+        },
+        "webSocketsEnabled": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Web socket enabled."
+        },
+        "alwaysOn": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Always On"
+        },
+        "javaVersion": {
+          "type": "string",
+          "description": "Java version"
+        },
+        "javaContainer": {
+          "type": "string",
+          "description": "Java container"
+        },
+        "javaContainerVersion": {
+          "type": "string",
+          "description": "Java container version"
+        },
+        "managedPipelineMode": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Integrated",
+                "Classic"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Managed pipeline mode. Possible values include: 'Integrated', 'Classic'"
+        },
+        "virtualApplications": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/VirtualApplication"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Virtual applications"
+        },
+        "loadBalancing": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "WeightedRoundRobin",
+                "LeastRequests",
+                "LeastResponseTime",
+                "WeightedTotalTraffic",
+                "RequestHash"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Site load balancing. Possible values include: 'WeightedRoundRobin', 'LeastRequests', 'LeastResponseTime', 'WeightedTotalTraffic', 'RequestHash'"
+        },
+        "experiments": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Experiments"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "This is work around for polymophic types"
+        },
+        "limits": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SiteLimits"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Site limits"
+        },
+        "autoHealEnabled": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Auto heal enabled"
+        },
+        "autoHealRules": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/AutoHealRules"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Auto heal rules"
+        },
+        "tracingOptions": {
+          "type": "string",
+          "description": "Tracing options"
+        },
+        "vnetName": {
+          "type": "string",
+          "description": "Vnet name"
+        },
+        "cors": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/CorsSettings"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Cross-Origin Resource Sharing (CORS) settings."
+        },
+        "apiDefinition": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ApiDefinitionInfo"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Information about the formal API definition for the web app."
+        },
+        "autoSwapSlotName": {
+          "type": "string",
+          "description": "Auto swap slot name"
+        },
+        "localMySqlEnabled": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Local mysql enabled"
+        },
+        "ipSecurityRestrictions": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/IpSecurityRestriction"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Ip Security restrictions"
+        }
+      }
+    },
+    "SiteLimits": {
+      "type": "object",
+      "properties": {
+        "maxPercentageCpu": {
+          "oneOf": [
+            {
+              "type": "number"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Maximum allowed CPU usage percentage"
+        },
+        "maxMemoryInMb": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Maximum allowed memory usage in MB"
+        },
+        "maxDiskSizeInMb": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Maximum allowed disk size usage in MB"
+        }
+      },
+      "description": "Represents metric limits set on a web app."
+    },
+    "SkuDescription": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Name of the resource sku"
+        },
+        "tier": {
+          "type": "string",
+          "description": "Service Tier of the resource sku"
+        },
+        "size": {
+          "type": "string",
+          "description": "Size specifier of the resource sku"
+        },
+        "family": {
+          "type": "string",
+          "description": "Family code of the resource sku"
+        },
+        "capacity": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Current number of instances assigned to the resource"
+        }
+      },
+      "description": "Describes a sku for a scalable resource"
+    },
+    "SlowRequestsBasedTrigger": {
+      "type": "object",
+      "properties": {
+        "timeTaken": {
+          "type": "string",
+          "description": "TimeTaken"
+        },
+        "count": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Count"
+        },
+        "timeInterval": {
+          "type": "string",
+          "description": "TimeInterval"
+        }
+      },
+      "description": "SlowRequestsBasedTrigger"
+    },
+    "StampCapacity": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Name of the stamp"
+        },
+        "availableCapacity": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Available capacity (# of machines, bytes of storage etc...)"
+        },
+        "totalCapacity": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Total capacity (# of machines, bytes of storage etc...)"
+        },
+        "unit": {
+          "type": "string",
+          "description": "Name of the unit"
+        },
+        "computeMode": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Shared",
+                "Dedicated",
+                "Dynamic"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Shared/Dedicated workers. Possible values include: 'Shared', 'Dedicated', 'Dynamic'"
+        },
+        "workerSize": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Default",
+                "Small",
+                "Medium",
+                "Large"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Size of the machines. Possible values include: 'Default', 'Small', 'Medium', 'Large'"
+        },
+        "workerSizeId": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Size Id of machines: \r\n            0 - Small\r\n            1 - Medium\r\n            2 - Large"
+        },
+        "excludeFromCapacityAllocation": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "If true it includes basic sites\r\n            Basic sites are not used for capacity allocation."
+        },
+        "isApplicableForAllComputeModes": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Is capacity applicable for all sites?"
+        },
+        "siteMode": {
+          "type": "string",
+          "description": "Shared or Dedicated"
+        }
+      },
+      "description": "Class containing stamp capacity information"
+    },
+    "StatusCodesBasedTrigger": {
+      "type": "object",
+      "properties": {
+        "status": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "HTTP status code"
+        },
+        "subStatus": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "SubStatus"
+        },
+        "win32Status": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Win32 error code"
+        },
+        "count": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Count"
+        },
+        "timeInterval": {
+          "type": "string",
+          "description": "TimeInterval"
+        }
+      },
+      "description": "StatusCodeBasedTrigger"
+    },
+    "VirtualApplication": {
+      "type": "object",
+      "properties": {
+        "virtualPath": {
+          "type": "string"
+        },
+        "physicalPath": {
+          "type": "string"
+        },
+        "preloadEnabled": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "virtualDirectories": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/VirtualDirectory"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      }
+    },
+    "VirtualDirectory": {
+      "type": "object",
+      "properties": {
+        "virtualPath": {
+          "type": "string"
+        },
+        "physicalPath": {
+          "type": "string"
+        }
+      }
+    },
+    "VirtualIPMapping": {
+      "type": "object",
+      "properties": {
+        "virtualIP": {
+          "type": "string",
+          "description": "Virtual IP address"
+        },
+        "internalHttpPort": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Internal HTTP port"
+        },
+        "internalHttpsPort": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Internal HTTPS port"
+        },
+        "inUse": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Is VIP mapping in use"
+        }
+      },
+      "description": "Class that represents a VIP mapping"
+    },
+    "VirtualNetworkProfile": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource id of the virtual network"
+        },
+        "name": {
+          "type": "string",
+          "description": "Name of the virtual network (read-only)"
+        },
+        "type": {
+          "type": "string",
+          "description": "Resource type of the virtual network (read-only)"
+        },
+        "subnet": {
+          "type": "string",
+          "description": "Subnet within the virtual network"
+        }
+      },
+      "description": "Specification for using a virtual network"
+    },
+    "VnetGateway_properties": {
+      "type": "object",
+      "properties": {
+        "vnetName": {
+          "type": "string",
+          "description": "The VNET name."
+        },
+        "vpnPackageUri": {
+          "type": "string",
+          "description": "The URI where the Vpn package can be downloaded"
+        }
+      }
+    },
+    "VnetInfo_properties": {
+      "type": "object",
+      "properties": {
+        "vnetResourceId": {
+          "type": "string",
+          "description": "The vnet resource id"
+        },
+        "certThumbprint": {
+          "type": "string",
+          "description": "The client certificate thumbprint"
+        },
+        "certBlob": {
+          "type": "string",
+          "description": "A certificate file (.cer) blob containing the public key of the private key used to authenticate a \r\n            Point-To-Site VPN connection."
+        },
+        "routes": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/VnetRoute"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "The routes that this virtual network connection uses."
+        },
+        "resyncRequired": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Flag to determine if a resync is required"
+        },
+        "dnsServers": {
+          "type": "string",
+          "description": "Dns servers to be used by this VNET. This should be a comma-separated list of IP addresses."
+        }
+      }
+    },
+    "VnetRoute": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "name": {
+          "type": "string",
+          "description": "Resource Name"
+        },
+        "kind": {
+          "type": "string",
+          "description": "Kind of resource"
+        },
+        "location": {
+          "type": "string",
+          "description": "Resource Location"
+        },
+        "type": {
+          "type": "string",
+          "description": "Resource type"
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Resource tags"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/VnetRoute_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "location"
+      ],
+      "description": "VnetRoute contract used to pass routing information for a vnet."
+    },
+    "VnetRoute_properties": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "The name of this route. This is only returned by the server and does not need to be set by the client."
+        },
+        "startAddress": {
+          "type": "string",
+          "description": "The starting address for this route. This may also include a CIDR notation, in which case the end address must not be specified."
+        },
+        "endAddress": {
+          "type": "string",
+          "description": "The ending address for this route. If the start address is specified in CIDR notation, this must be omitted."
+        },
+        "routeType": {
+          "type": "string",
+          "description": "The type of route this is:\r\n            DEFAULT - By default, every web app has routes to the local address ranges specified by RFC1918\r\n            INHERITED - Routes inherited from the real Virtual Network routes\r\n            STATIC - Static route set on the web app only\r\n            \r\n            These values will be used for syncing a Web App's routes with those from a Virtual Network. This operation will clear all DEFAULT and INHERITED routes and replace them\r\n            with new INHERITED routes."
+        }
+      }
+    },
+    "WorkerPool": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "name": {
+          "type": "string",
+          "description": "Resource Name"
+        },
+        "kind": {
+          "type": "string",
+          "description": "Kind of resource"
+        },
+        "location": {
+          "type": "string",
+          "description": "Resource Location"
+        },
+        "type": {
+          "type": "string",
+          "description": "Resource type"
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Resource tags"
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/WorkerPool_properties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        },
+        "sku": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SkuDescription"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ]
+        }
+      },
+      "required": [
+        "location"
+      ],
+      "description": "Worker pool of a hostingEnvironment (App Service Environment)"
+    },
+    "WorkerPool_properties": {
+      "type": "object",
+      "properties": {
+        "workerSizeId": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Worker size id for referencing this worker pool"
+        },
+        "computeMode": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Shared",
+                "Dedicated",
+                "Dynamic"
+              ]
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Shared or dedicated web app hosting. Possible values include: 'Shared', 'Dedicated', 'Dynamic'"
+        },
+        "workerSize": {
+          "type": "string",
+          "description": "VM size of the worker pool instances"
+        },
+        "workerCount": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Number of instances in the worker pool"
+        },
+        "instanceNames": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Names of all instances in the worker pool (read only)"
+        }
+      }
+    }
+  }
+}
diff --git a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/JSONSchemaTests.cs b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/JSONSchemaTests.cs
new file mode 100644
index 0000000000000..28c54faa7e51b
--- /dev/null
+++ b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/JSONSchemaTests.cs
@@ -0,0 +1,78 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using Microsoft.Rest.Generator.AzureResourceSchema;
+using System;
+using System.Collections.Generic;
+using Xunit;
+
+namespace AutoRest.Generator.AzureResourceSchema.Tests
+{
+    public class JSONSchemaTests
+    {
+        [Fact]
+        public void AddPropertyWithNullPropertyName()
+        {
+            JsonSchema jsonSchema = new JsonSchema();
+            Assert.Throws<ArgumentException>(() => { jsonSchema.AddProperty(null, null); });
+        }
+
+        [Fact]
+        public void AddPropertyWithEmptyPropertyName()
+        {
+            JsonSchema jsonSchema = new JsonSchema();
+            Assert.Throws<ArgumentException>(() => { jsonSchema.AddProperty("", null); });
+        }
+
+        [Fact]
+        public void AddPropertyWithWhitespacePropertyName()
+        {
+            JsonSchema jsonSchema = new JsonSchema();
+            Assert.Throws<ArgumentException>(() => { jsonSchema.AddProperty("     ", null); });
+        }
+
+        [Fact]
+        public void AddRequiredWithOneValueWhenPropertyDoesntExist()
+        {
+            JsonSchema jsonSchema = new JsonSchema();
+            Assert.Throws<ArgumentException>(() => { jsonSchema.AddRequired("a"); });
+            Assert.Null(jsonSchema.Properties);
+            Assert.Null(jsonSchema.Required);
+        }
+
+        [Fact]
+        public void AddRequiredWithTwoValuesWhenSecondPropertyDoesntExist()
+        {
+            JsonSchema jsonSchema = new JsonSchema();
+            jsonSchema.AddProperty("a", new JsonSchema());
+            Assert.Throws<ArgumentException>(() => { jsonSchema.AddRequired("a", "b"); });
+        }
+
+        [Fact]
+        public void AddRequiredWithThreeValuesWhenAllPropertiesExist()
+        {
+            JsonSchema jsonSchema = new JsonSchema();
+            jsonSchema.AddProperty("a", new JsonSchema());
+            jsonSchema.AddProperty("b", new JsonSchema());
+            jsonSchema.AddProperty("c", new JsonSchema());
+
+            jsonSchema.AddRequired("a", "b", "c");
+
+            Assert.Equal(new List<string>() { "a", "b", "c" }, jsonSchema.Required);
+        }
+
+        [Fact]
+        public void EqualsWithNull()
+        {
+            JsonSchema lhs = new JsonSchema();
+            Assert.False(lhs.Equals(null));
+        }
+
+        [Fact]
+        public void EqualsWithString()
+        {
+            JsonSchema lhs = new JsonSchema();
+            Assert.False(lhs.Equals("Not Equal"));
+        }
+    }
+}
diff --git a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/ResourceSchemaParserTests.cs b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/ResourceSchemaParserTests.cs
new file mode 100644
index 0000000000000..4d85c4f3276e5
--- /dev/null
+++ b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/ResourceSchemaParserTests.cs
@@ -0,0 +1,198 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using Microsoft.Rest.Generator.AzureResourceSchema;
+using Microsoft.Rest.Generator.ClientModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xunit;
+
+namespace AutoRest.Generator.AzureResourceSchema.Tests
+{
+    public class ResourceSchemaParserTests
+    {
+        [Fact]
+        public void ParseWithNullServiceClient()
+        {
+            Assert.Throws<ArgumentNullException>(() => { ResourceSchemaParser.Parse(null); });
+        }
+
+        [Fact]
+        public void ParseWithEmptyServiceClient()
+        {
+            ServiceClient serviceClient = new ServiceClient();
+            IDictionary<string, ResourceSchema> schemas = ResourceSchemaParser.Parse(serviceClient);
+            Assert.NotNull(schemas);
+            Assert.Equal(0, schemas.Count);
+        }
+
+        [Fact]
+        public void ParseWithServiceClientWithCreateResourceMethod()
+        {
+            ServiceClient serviceClient = new ServiceClient();
+
+            Parameter body = new Parameter()
+            {
+                Location = ParameterLocation.Body,
+                Type = new CompositeType(),
+            };
+
+            CompositeType responseBody = new CompositeType();
+            responseBody.Extensions.Add("x-ms-azure-resource", true);
+
+            const string url = "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Mock.Provider/mockResourceNames/{mockResourceName}";
+
+            Method method = CreateMethod(body: body, responseBody: responseBody, url: url);
+
+            serviceClient.Methods.Add(method);
+
+            IDictionary<string, ResourceSchema> schemas = ResourceSchemaParser.Parse(serviceClient);
+            Assert.NotNull(schemas);
+            Assert.Equal(1, schemas.Count);
+
+            ResourceSchema schema = schemas["Mock.Provider"];
+            Assert.Null(schema.Id);
+            Assert.Equal("http://json-schema.org/draft-04/schema#", schema.Schema);
+            Assert.Equal("Mock.Provider", schema.Title);
+            Assert.Equal("Mock Provider Resource Types", schema.Description);
+            Assert.Equal(1, schema.ResourceDefinitions.Count);
+            Assert.Equal("Mock.Provider_mockResourceNames", schema.ResourceDefinitions.Keys.Single());
+            Assert.Equal(
+                new JsonSchema()
+                {
+                    JsonType = "object",
+                    Description = "Mock.Provider/mockResourceNames"
+                }
+                .AddProperty("type", new JsonSchema()
+                    {
+                        JsonType = "string"
+                    }
+                    .AddEnum("Mock.Provider/mockResourceNames"),
+                    true),
+                schema.ResourceDefinitions["Mock.Provider_mockResourceNames"]);
+            Assert.NotNull(schema.Definitions);
+            Assert.Equal(0, schema.Definitions.Count);
+        }
+
+        [Fact]
+        public void IsCreateResourceMethodWithNullMethod()
+        {
+            Assert.Throws<ArgumentNullException>(() => { ResourceSchemaParser.IsCreateResourceMethod(null); });
+        }
+
+        [Fact]
+        public void IsCreateResourceMethodWithGetHttpMethod()
+        {
+            Assert.False(ResourceSchemaParser.IsCreateResourceMethod(CreateMethod(HttpMethod.Get)));
+        }
+
+        [Fact]
+        public void IsCreateResourceMethodWithNoBody()
+        {
+            Assert.False(ResourceSchemaParser.IsCreateResourceMethod(CreateMethod()));
+        }
+
+        [Fact]
+        public void IsCreateResourceMethodNoReturnType()
+        {
+            Assert.False(ResourceSchemaParser.IsCreateResourceMethod(CreateMethod(body: new Parameter()
+            {
+                Location = ParameterLocation.Body
+            })));
+        }
+
+        [Fact]
+        public void IsCreateResourceMethodWithNonResourceReturnType()
+        {
+            Assert.False(ResourceSchemaParser.IsCreateResourceMethod(CreateMethod(
+                body: new Parameter()
+                {
+                    Location = ParameterLocation.Body
+                },
+                responseBody: new PrimaryType(KnownPrimaryType.Int))));
+        }
+
+        [Fact]
+        public void IsCreateResourceMethodWithCompositeNonResourceReturnType()
+        {
+            Assert.False(ResourceSchemaParser.IsCreateResourceMethod(CreateMethod(
+                body: new Parameter()
+                {
+                    Location = ParameterLocation.Body
+                },
+                responseBody: new CompositeType())));
+        }
+
+        [Fact]
+        public void IsCreateResourceMethodWithResourceReturnTypeButNoUrl()
+        {
+            CompositeType responseBody = new CompositeType();
+            responseBody.Extensions.Add("x-ms-azure-resource", true);
+
+            Assert.False(ResourceSchemaParser.IsCreateResourceMethod(CreateMethod(
+                body: new Parameter()
+                {
+                    Location = ParameterLocation.Body
+                },
+                responseBody: responseBody)));
+        }
+
+
+
+        [Fact]
+        public void IsCreateResourceMethodWithResourceReturnTypeAndUrl()
+        {
+            CompositeType responseBody = new CompositeType();
+            responseBody.Extensions.Add("x-ms-azure-resource", true);
+
+            Assert.True(ResourceSchemaParser.IsCreateResourceMethod(CreateMethod(
+                body: new Parameter()
+                {
+                    Location = ParameterLocation.Body
+                },
+                responseBody: responseBody,
+                url: "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Mock.Provider/mockResourceNames/{mockResourceName}")));
+        }
+
+        [Fact]
+        public void IsCreateResourceMethodWhenUrlDoesntEndWithResourceNamePlaceholder()
+        {
+            CompositeType responseBody = new CompositeType();
+            responseBody.Extensions.Add("x-ms-azure-resource", true);
+
+            Assert.False(ResourceSchemaParser.IsCreateResourceMethod(CreateMethod(
+                body: new Parameter()
+                {
+                    Location = ParameterLocation.Body
+                },
+                responseBody: responseBody,
+                url: "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/slotConfigNames")));
+        }
+
+        [Fact]
+        public void GetResourceTypeWithOneLevelOfResources()
+        {
+            Assert.Equal("Microsoft.Cdn/profiles", ResourceSchemaParser.GetResourceType("Microsoft.Cdn", "profiles/{profileName}"));
+        }
+
+        [Fact]
+        public void GetResourceTypeWithMultipleLevelsOfResources()
+        {
+            Assert.Equal("Microsoft.Cdn/profiles/endpoints/customDomains", ResourceSchemaParser.GetResourceType("Microsoft.Cdn", "profiles/{profileName}/endpoints/{endpointName}/customDomains/{customDomainName}"));
+        }
+
+        private static Method CreateMethod(HttpMethod httpMethod = HttpMethod.Put, Parameter body = null, IType responseBody = null, string url = null)
+        {
+            Method method = new Method()
+            {
+                HttpMethod = httpMethod,
+                ReturnType = new Response(responseBody, null),
+                Url = url,
+            };
+            method.Parameters.Add(body);
+
+            return method;
+        }
+    }
+}
diff --git a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/ResourceSchemaWriterTests.cs b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/ResourceSchemaWriterTests.cs
new file mode 100644
index 0000000000000..9c52439cfdb10
--- /dev/null
+++ b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/ResourceSchemaWriterTests.cs
@@ -0,0 +1,310 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using Microsoft.Rest.Generator.AzureResourceSchema;
+using Newtonsoft.Json;
+using System;
+using System.IO;
+using Xunit;
+
+namespace AutoRest.Generator.AzureResourceSchema.Tests
+{
+    public class ResourceSchemaWriterTests
+    {
+        [Fact]
+        public void WriteWithNullJsonTextWriter()
+        {
+            JsonTextWriter writer = null;
+            ResourceSchema resourceSchema = new ResourceSchema();
+            Assert.Throws<ArgumentNullException>(() => { ResourceSchemaWriter.Write(writer, resourceSchema); });
+        }
+
+        [Fact]
+        public void WriteWithJsonTextWriterAndNullResourceSchema()
+        {
+            StringWriter stringWriter = new StringWriter();
+            JsonTextWriter writer = new JsonTextWriter(stringWriter);
+            ResourceSchema resourceSchema = null;
+            Assert.Throws<ArgumentNullException>(() => { ResourceSchemaWriter.Write(writer, resourceSchema); });
+        }
+
+        [Fact]
+        public void WriteWithEmptyResourceSchema()
+        {
+            StringWriter stringWriter = new StringWriter();
+            JsonTextWriter writer = new JsonTextWriter(stringWriter);
+            ResourceSchema resourceSchema = new ResourceSchema();
+            ResourceSchemaWriter.Write(writer, resourceSchema);
+            Assert.Equal("{}", stringWriter.ToString());
+        }
+
+        [Fact]
+        public void WriteWithId()
+        {
+            StringWriter stringWriter = new StringWriter();
+            JsonTextWriter writer = new JsonTextWriter(stringWriter);
+            writer.QuoteChar = '\'';
+
+            ResourceSchema resourceSchema = new ResourceSchema();
+            resourceSchema.Id = "MockId";
+
+            ResourceSchemaWriter.Write(writer, resourceSchema);
+            Assert.Equal("{'id':'MockId'}", stringWriter.ToString());
+        }
+
+        [Fact]
+        public void WriteWithSchema()
+        {
+            StringWriter stringWriter = new StringWriter();
+            JsonTextWriter writer = new JsonTextWriter(stringWriter);
+            writer.QuoteChar = '\'';
+
+            ResourceSchema resourceSchema = new ResourceSchema();
+            resourceSchema.Id = "MockId";
+            resourceSchema.Schema = "MockSchema";
+
+            ResourceSchemaWriter.Write(writer, resourceSchema);
+            Assert.Equal("{'id':'MockId','$schema':'MockSchema'}", stringWriter.ToString());
+        }
+
+        [Fact]
+        public void WriteWithTitle()
+        {
+            StringWriter stringWriter = new StringWriter();
+            JsonTextWriter writer = new JsonTextWriter(stringWriter);
+            writer.QuoteChar = '\'';
+
+            ResourceSchema resourceSchema = new ResourceSchema();
+            resourceSchema.Schema = "MockSchema";
+            resourceSchema.Title = "MockTitle";
+
+            ResourceSchemaWriter.Write(writer, resourceSchema);
+            Assert.Equal("{'$schema':'MockSchema','title':'MockTitle'}", stringWriter.ToString());
+        }
+
+        [Fact]
+        public void WriteWithDescription()
+        {
+            StringWriter stringWriter = new StringWriter();
+            JsonTextWriter writer = new JsonTextWriter(stringWriter);
+            writer.QuoteChar = '\'';
+
+            ResourceSchema resourceSchema = new ResourceSchema();
+            resourceSchema.Title = "MockTitle";
+            resourceSchema.Description = "MockDescription";
+
+            ResourceSchemaWriter.Write(writer, resourceSchema);
+            Assert.Equal("{'title':'MockTitle','description':'MockDescription'}", stringWriter.ToString());
+        }
+
+        [Fact]
+        public void WriteWithOneResourceDefinition()
+        {
+            StringWriter stringWriter = new StringWriter();
+            JsonTextWriter writer = new JsonTextWriter(stringWriter);
+            writer.QuoteChar = '\'';
+
+            ResourceSchema resourceSchema = new ResourceSchema();
+            resourceSchema.Description = "MockDescription";
+            resourceSchema.AddResourceDefinition("mockResource", new JsonSchema());
+
+            ResourceSchemaWriter.Write(writer, resourceSchema);
+            Assert.Equal("{'description':'MockDescription','resourceDefinitions':{'mockResource':{}}}", stringWriter.ToString());
+        }
+
+        [Fact]
+        public void WriteWithOneDefinition()
+        {
+            StringWriter stringWriter = new StringWriter();
+            JsonTextWriter writer = new JsonTextWriter(stringWriter);
+            writer.QuoteChar = '\'';
+
+            ResourceSchema resourceSchema = new ResourceSchema();
+            resourceSchema.AddResourceDefinition("mockResource", new JsonSchema());
+            resourceSchema.AddDefinition("mockDefinition", new JsonSchema());
+
+            ResourceSchemaWriter.Write(writer, resourceSchema);
+            Assert.Equal("{'resourceDefinitions':{'mockResource':{}},'definitions':{'mockDefinition':{}}}", stringWriter.ToString());
+        }
+
+
+
+
+        [Fact]
+        public void WriteDefinitionWithEmptyDefinition()
+        {
+            StringWriter stringWriter = new StringWriter();
+            JsonTextWriter writer = new JsonTextWriter(stringWriter);
+            writer.QuoteChar = '\'';
+
+            const string definitionName = "mockDefinition";
+            JsonSchema definition = new JsonSchema();
+
+            ResourceSchemaWriter.WriteDefinition(writer, definitionName, definition);
+            Assert.Equal("'mockDefinition':{}", stringWriter.ToString());
+        }
+
+        [Fact]
+        public void WriteDefinitionWithType()
+        {
+            StringWriter stringWriter = new StringWriter();
+            JsonTextWriter writer = new JsonTextWriter(stringWriter);
+            writer.QuoteChar = '\'';
+
+            const string definitionName = "mockDefinition";
+            JsonSchema definition = new JsonSchema();
+            definition.JsonType = "MockType";
+
+            ResourceSchemaWriter.WriteDefinition(writer, definitionName, definition);
+            Assert.Equal("'mockDefinition':{'type':'MockType'}", stringWriter.ToString());
+        }
+
+        [Fact]
+        public void WriteDefinitionWithTypeAndEnum()
+        {
+            StringWriter stringWriter = new StringWriter();
+            JsonTextWriter writer = new JsonTextWriter(stringWriter);
+            writer.QuoteChar = '\'';
+
+            const string definitionName = "mockDefinition";
+            JsonSchema definition = new JsonSchema()
+                {
+                    JsonType = "MockType"
+                }
+                .AddEnum("MockEnum1", "MockEnum2");
+
+            ResourceSchemaWriter.WriteDefinition(writer, definitionName, definition);
+            Assert.Equal("'mockDefinition':{'type':'MockType','enum':['MockEnum1','MockEnum2']}", stringWriter.ToString());
+        }
+
+        [Fact]
+        public void WriteDefinitionWithEnumAndUnrequiredProperty()
+        {
+            StringWriter stringWriter = new StringWriter();
+            JsonTextWriter writer = new JsonTextWriter(stringWriter);
+            writer.QuoteChar = '\'';
+
+            const string definitionName = "mockDefinition";
+            JsonSchema definition = new JsonSchema()
+                .AddEnum("MockEnum1", "MockEnum2")
+                .AddProperty("mockPropertyName", new JsonSchema());
+
+            ResourceSchemaWriter.WriteDefinition(writer, definitionName, definition);
+            Assert.Equal("'mockDefinition':{'enum':['MockEnum1','MockEnum2'],'properties':{'mockPropertyName':{'oneOf':[{},{'$ref':'http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression'}]}}}", stringWriter.ToString());
+        }
+
+        [Fact]
+        public void WriteDefinitionWithEnumAndRequiredProperty()
+        {
+            StringWriter stringWriter = new StringWriter();
+            JsonTextWriter writer = new JsonTextWriter(stringWriter);
+            writer.QuoteChar = '\'';
+
+            const string definitionName = "mockDefinition";
+            JsonSchema definition = new JsonSchema()
+                .AddEnum("MockEnum1", "MockEnum2")
+                .AddProperty("mockPropertyName", new JsonSchema(), true);
+
+            ResourceSchemaWriter.WriteDefinition(writer, definitionName, definition);
+            Assert.Equal("'mockDefinition':{'enum':['MockEnum1','MockEnum2'],'properties':{'mockPropertyName':{'oneOf':[{},{'$ref':'http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression'}]}},'required':['mockPropertyName']}", stringWriter.ToString());
+        }
+
+        [Fact]
+        public void WriteDefinitionWithRequiredPropertyAndDescription()
+        {
+            StringWriter stringWriter = new StringWriter();
+            JsonTextWriter writer = new JsonTextWriter(stringWriter);
+            writer.QuoteChar = '\'';
+
+            const string definitionName = "mockDefinition";
+            JsonSchema definition = new JsonSchema();
+            definition.AddProperty("mockPropertyName", new JsonSchema(), true);
+            definition.Description = "MockDescription";
+
+            ResourceSchemaWriter.WriteDefinition(writer, definitionName, definition);
+            Assert.Equal("'mockDefinition':{'properties':{'mockPropertyName':{'oneOf':[{},{'$ref':'http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression'}]}},'required':['mockPropertyName'],'description':'MockDescription'}", stringWriter.ToString());
+        }
+
+        [Fact]
+        public void WritePropertyWithNullWriter()
+        {
+            JsonTextWriter writer = null;
+            const string propertyName = "mockPropertyName";
+            const string propertyValue = "mockPropertyValue";
+            Assert.Throws<ArgumentNullException>(() => { ResourceSchemaWriter.WriteProperty(writer, propertyName, propertyValue); });
+        }
+
+        [Fact]
+        public void WritePropertyWithNullPropertyName()
+        {
+            StringWriter stringWriter = new StringWriter();
+            JsonTextWriter writer = new JsonTextWriter(stringWriter);
+            writer.QuoteChar = '\'';
+
+            const string propertyName = null;
+            const string propertyValue = "mockPropertyValue";
+
+            Assert.Throws<ArgumentException>(() => { ResourceSchemaWriter.WriteProperty(writer, propertyName, propertyValue); });
+        }
+
+        [Fact]
+        public void WritePropertyWithNullPropertyValue()
+        {
+            StringWriter stringWriter = new StringWriter();
+            JsonTextWriter writer = new JsonTextWriter(stringWriter);
+            writer.QuoteChar = '\'';
+
+            const string propertyName = "mockPropertyName";
+            const string propertyValue = null;
+
+            ResourceSchemaWriter.WriteProperty(writer, propertyName, propertyValue);
+
+            Assert.Equal("", stringWriter.ToString());
+        }
+
+        [Fact]
+        public void WritePropertyWithEmptyPropertyValue()
+        {
+            StringWriter stringWriter = new StringWriter();
+            JsonTextWriter writer = new JsonTextWriter(stringWriter);
+            writer.QuoteChar = '\'';
+
+            const string propertyName = "mockPropertyName";
+            const string propertyValue = "";
+
+            ResourceSchemaWriter.WriteProperty(writer, propertyName, propertyValue);
+
+            Assert.Equal("", stringWriter.ToString());
+        }
+
+        [Fact]
+        public void WritePropertyWithWhitespacePropertyValue()
+        {
+            StringWriter stringWriter = new StringWriter();
+            JsonTextWriter writer = new JsonTextWriter(stringWriter);
+            writer.QuoteChar = '\'';
+
+            const string propertyName = "mockPropertyName";
+            const string propertyValue = "   ";
+
+            ResourceSchemaWriter.WriteProperty(writer, propertyName, propertyValue);
+
+            Assert.Equal("", stringWriter.ToString());
+        }
+
+        [Fact]
+        public void WritePropertyWithNonWhitespacePropertyValue()
+        {
+            StringWriter stringWriter = new StringWriter();
+            JsonTextWriter writer = new JsonTextWriter(stringWriter);
+            writer.QuoteChar = '\'';
+
+            const string propertyName = "mockPropertyName";
+            const string propertyValue = "mockPropertyValue";
+
+            ResourceSchemaWriter.WriteProperty(writer, propertyName, propertyValue);
+
+            Assert.Equal("'mockPropertyName':'mockPropertyValue'", stringWriter.ToString());
+        }
+    }
+}
diff --git a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/Swagger/BatchManagement.json b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/Swagger/BatchManagement.json
new file mode 100644
index 0000000000000..2e3780c33acc9
--- /dev/null
+++ b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/Swagger/BatchManagement.json
@@ -0,0 +1,1395 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "BatchManagement",
+    "version": "2015-12-01",
+    "x-ms-code-generation-settings": {
+      "name": "BatchManagementClient"
+    }
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Batch/batchAccounts/{accountName}": {
+      "put": {
+        "tags": [
+          "Account"
+        ],
+        "operationId": "Account_Create",
+        "description": "Creates a new Batch account with the specified parameters. Existing accounts cannot be updated with this API and should instead be updated with the Update Batch Account API.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "pattern": "^[-\\w\\._]+$",
+            "description": "The name of the resource group that contains the new Batch account."
+          },
+          {
+            "name": "accountName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "pattern": "^[-\\w\\._]+$",
+            "minLength": 3,
+            "maxLength": 24,
+            "description": "A name for the Batch account which must be unique within the region. Batch account names must be between 3 and 24 characters in length and must use only numbers and lowercase letters. This name is used as part of the DNS name that is used to access the Batch service in the region in which the account is created. For example: http://accountname.region.batch.azure.com/."
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/BatchAccountCreateParameters"
+            },
+            "description": "Additional parameters for account creation."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": ""
+          },
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/AccountResource"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      },
+      "patch": {
+        "tags": [
+          "Account"
+        ],
+        "operationId": "Account_Update",
+        "description": "Updates the properties of an existing Batch account.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "pattern": "^[-\\w\\._]+$",
+            "description": "The name of the resource group that contains the Batch account."
+          },
+          {
+            "name": "accountName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "pattern": "^[-\\w\\._]+$",
+            "minLength": 3,
+            "maxLength": 24,
+            "description": "The name of the account."
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/BatchAccountUpdateParameters"
+            },
+            "description": "Additional parameters for account update."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/AccountResource"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "Account"
+        ],
+        "operationId": "Account_Delete",
+        "description": "Deletes the specified Batch account.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "pattern": "^[-\\w\\._]+$",
+            "description": "The name of the resource group that contains the Batch account to be deleted."
+          },
+          {
+            "name": "accountName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "pattern": "^[-\\w\\._]+$",
+            "minLength": 3,
+            "maxLength": 24,
+            "description": "The name of the account to be deleted."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": ""
+          },
+          "204": {
+            "description": ""
+          },
+          "200": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      },
+      "get": {
+        "tags": [
+          "Account"
+        ],
+        "operationId": "Account_Get",
+        "description": "Gets information about the specified Batch account.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "pattern": "^[-\\w\\._]+$",
+            "description": "The name of the resource group that contains the Batch account."
+          },
+          {
+            "name": "accountName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "pattern": "^[-\\w\\._]+$",
+            "minLength": 3,
+            "maxLength": 24,
+            "description": "The name of the account."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/AccountResource"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Batch/batchAccounts": {
+      "get": {
+        "tags": [
+          "Account"
+        ],
+        "operationId": "Account_List",
+        "description": "Gets information about the Batch accounts associated with the subscription.",
+        "parameters": [
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/BatchAccountListResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Batch/batchAccounts": {
+      "get": {
+        "tags": [
+          "Account"
+        ],
+        "operationId": "Account_ListByResourceGroup",
+        "description": "Gets information about the Batch accounts associated within the specified resource group.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "pattern": "^[-\\w\\._]+$",
+            "description": "The name of the resource group whose Batch accounts to list."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/BatchAccountListResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Batch/batchAccounts/{accountName}/syncAutoStorageKeys": {
+      "post": {
+        "tags": [
+          "Account"
+        ],
+        "operationId": "Account_SynchronizeAutoStorageKeys",
+        "description": "Synchronizes access keys for the auto storage account configured for the specified Batch account.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "pattern": "^[-\\w\\._]+$",
+            "description": "The name of the resource group that contains the Batch account."
+          },
+          {
+            "name": "accountName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "pattern": "^[-\\w\\._]+$",
+            "minLength": 3,
+            "maxLength": 24,
+            "description": "The name of the Batch account."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": ""
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Batch/batchAccounts/{accountName}/regenerateKeys": {
+      "post": {
+        "tags": [
+          "Account"
+        ],
+        "operationId": "Account_RegenerateKey",
+        "description": "Regenerates the specified account key for the specified Batch account.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "pattern": "^[-\\w\\._]+$",
+            "description": "The name of the resource group that contains the Batch account."
+          },
+          {
+            "name": "accountName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "pattern": "^[-\\w\\._]+$",
+            "minLength": 3,
+            "maxLength": 24,
+            "description": "The name of the account."
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/BatchAccountRegenerateKeyParameters"
+            },
+            "description": "The type of key to regenerate."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/BatchAccountRegenerateKeyResult"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Batch/batchAccounts/{accountName}/listKeys": {
+      "post": {
+        "tags": [
+          "Account"
+        ],
+        "operationId": "Account_ListKeys",
+        "description": "Lists the account keys for the specified Batch account.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "pattern": "^[-\\w\\._]+$",
+            "description": "The name of the resource group that contains the Batch account."
+          },
+          {
+            "name": "accountName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "pattern": "^[-\\w\\._]+$",
+            "minLength": 3,
+            "maxLength": 24,
+            "description": "The name of the account."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/BatchAccountListKeyResult"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Batch/batchAccounts/{accountName}/applications/{id}/versions/{version}/activate": {
+      "post": {
+        "tags": [
+          "Application"
+        ],
+        "operationId": "Application_ActivateApplicationPackage",
+        "description": "Activates the specified application package.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "pattern": "^[-\\w\\._]+$",
+            "description": "The name of the resource group that contains the Batch account."
+          },
+          {
+            "name": "accountName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "pattern": "^[-\\w\\._]+$",
+            "minLength": 3,
+            "maxLength": 24,
+            "description": "The name of the Batch account."
+          },
+          {
+            "name": "id",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The id of the application."
+          },
+          {
+            "name": "version",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The version of the application to activate."
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/ActivateApplicationPackageParameters"
+            },
+            "description": "The parameters for the request."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": ""
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Batch/batchAccounts/{accountName}/applications/{applicationId}": {
+      "put": {
+        "tags": [
+          "Application"
+        ],
+        "operationId": "Application_AddApplication",
+        "description": "Adds an application to the specified Batch account.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "pattern": "^[-\\w\\._]+$",
+            "description": "The name of the resource group that contains the Batch account."
+          },
+          {
+            "name": "accountName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "pattern": "^[-\\w\\._]+$",
+            "minLength": 3,
+            "maxLength": 24,
+            "description": "The name of the Batch account."
+          },
+          {
+            "name": "applicationId",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The id of the application."
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/AddApplicationParameters"
+            },
+            "description": "The parameters for the request."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/Application"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "Application"
+        ],
+        "operationId": "Application_DeleteApplication",
+        "description": "Deletes an application.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "pattern": "^[-\\w\\._]+$",
+            "description": "The name of the resource group that contains the Batch account."
+          },
+          {
+            "name": "accountName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "pattern": "^[-\\w\\._]+$",
+            "minLength": 3,
+            "maxLength": 24,
+            "description": "The name of the Batch account."
+          },
+          {
+            "name": "applicationId",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The id of the application."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": ""
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "Application"
+        ],
+        "operationId": "Application_GetApplication",
+        "description": "Gets information about the specified application.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "pattern": "^[-\\w\\._]+$",
+            "description": "The name of the resource group that contains the Batch account."
+          },
+          {
+            "name": "accountName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "pattern": "^[-\\w\\._]+$",
+            "minLength": 3,
+            "maxLength": 24,
+            "description": "The name of the Batch account."
+          },
+          {
+            "name": "applicationId",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The id of the application."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/Application"
+            }
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "Application"
+        ],
+        "operationId": "Application_UpdateApplication",
+        "description": "Updates settings for the specified application.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "pattern": "^[-\\w\\._]+$",
+            "description": "The name of the resource group that contains the Batch account."
+          },
+          {
+            "name": "accountName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "pattern": "^[-\\w\\._]+$",
+            "minLength": 3,
+            "maxLength": 24,
+            "description": "The name of the Batch account."
+          },
+          {
+            "name": "applicationId",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The id of the application."
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/UpdateApplicationParameters"
+            },
+            "description": "The parameters for the request."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": ""
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Batch/batchAccounts/{accountName}/applications/{applicationId}/versions/{version}": {
+      "put": {
+        "tags": [
+          "Application"
+        ],
+        "operationId": "Application_AddApplicationPackage",
+        "description": "Creates an application package record.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "pattern": "^[-\\w\\._]+$",
+            "description": "The name of the resource group that contains the Batch account."
+          },
+          {
+            "name": "accountName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "pattern": "^[-\\w\\._]+$",
+            "minLength": 3,
+            "maxLength": 24,
+            "description": "The name of the Batch account."
+          },
+          {
+            "name": "applicationId",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The id of the application."
+          },
+          {
+            "name": "version",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The version of the application."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/AddApplicationPackageResult"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "Application"
+        ],
+        "operationId": "Application_DeleteApplicationPackage",
+        "description": "Deletes an application package record and its associated binary file.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "pattern": "^[-\\w\\._]+$",
+            "description": "The name of the resource group that contains the Batch account."
+          },
+          {
+            "name": "accountName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "pattern": "^[-\\w\\._]+$",
+            "minLength": 3,
+            "maxLength": 24,
+            "description": "The name of the Batch account."
+          },
+          {
+            "name": "applicationId",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The id of the application."
+          },
+          {
+            "name": "version",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The version of the application to delete."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": ""
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "Application"
+        ],
+        "operationId": "Application_GetApplicationPackage",
+        "description": "Gets information about the specified application package.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "pattern": "^[-\\w\\._]+$",
+            "description": "The name of the resource group that contains the Batch account."
+          },
+          {
+            "name": "accountName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "pattern": "^[-\\w\\._]+$",
+            "minLength": 3,
+            "maxLength": 24,
+            "description": "The name of the Batch account."
+          },
+          {
+            "name": "applicationId",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The id of the application."
+          },
+          {
+            "name": "version",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The version of the application."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/GetApplicationPackageResult"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Batch/batchAccounts/{accountName}/applications": {
+      "get": {
+        "tags": [
+          "Application"
+        ],
+        "operationId": "Application_List",
+        "description": "Lists all of the applications in the specified account.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "pattern": "^[-\\w\\._]+$",
+            "description": "The name of the resource group that contains the Batch account."
+          },
+          {
+            "name": "accountName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "pattern": "^[-\\w\\._]+$",
+            "minLength": 3,
+            "maxLength": 24,
+            "description": "The name of the Batch account."
+          },
+          {
+            "name": "maxresults",
+            "in": "query",
+            "required": false,
+            "type": "integer",
+            "format": "int32",
+            "description": "The maximum number of items to return in the response."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/ListApplicationsResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Batch/locations/{locationName}/quotas": {
+      "get": {
+        "tags": [
+          "Subscription"
+        ],
+        "operationId": "Subscription_GetSubscriptionQuotas",
+        "description": "Gets the Batch service quotas for the specified suscription.",
+        "parameters": [
+          {
+            "name": "locationName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The desired region for the quotas."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/SubscriptionQuotasGetResult"
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {
+    "AutoStorageBaseProperties": {
+      "properties": {
+        "storageAccountId": {
+          "type": "string",
+          "description": "The resource id of the storage account to be used for auto storage account."
+        }
+      },
+      "required": [
+        "storageAccountId"
+      ],
+      "description": "The properties related to auto storage account."
+    },
+    "AccountBaseProperties": {
+      "properties": {
+        "autoStorage": {
+          "$ref": "#/definitions/AutoStorageBaseProperties",
+          "description": "The properties related to auto storage account."
+        }
+      },
+      "description": "The properties of a Batch account."
+    },
+    "BatchAccountCreateParameters": {
+      "properties": {
+        "location": {
+          "type": "string",
+          "description": "The region in which the account is created."
+        },
+        "tags": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "description": "The user specified tags associated with the account."
+        },
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/AccountBaseProperties",
+          "description": "The properties of the account."
+        }
+      },
+      "description": "Parameters supplied to the Create operation."
+    },
+    "AutoStorageProperties": {
+      "properties": {
+        "storageAccountId": {
+          "type": "string",
+          "description": "The resource id of the storage account to be used for auto storage account."
+        },
+        "lastKeySync": {
+          "type": "string",
+          "format": "date-time",
+          "description": "The UTC time at which storage keys were last synchronized with the Batch account."
+        }
+      },
+      "required": [
+        "storageAccountId",
+        "lastKeySync"
+      ],
+      "description": "Contains information about the auto storage account associated with a Batch account."
+    },
+    "AccountProperties": {
+      "properties": {
+        "accountEndpoint": {
+          "type": "string",
+          "description": "The endpoint used by this account to interact with the Batch services."
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "The provisioned state of the resource",
+          "enum": [
+            "Invalid",
+            "Creating",
+            "Deleting",
+            "Succeeded",
+            "Failed",
+            "Cancelled"
+          ],
+          "x-ms-enum": {
+            "name": "AccountProvisioningState",
+            "modelAsString": false
+          }
+        },
+        "autoStorage": {
+          "$ref": "#/definitions/AutoStorageProperties",
+          "description": "The properties and status of any auto storage account associated with the account."
+        },
+        "coreQuota": {
+          "type": "integer",
+          "format": "int32",
+          "description": "The core quota for this Batch account."
+        },
+        "poolQuota": {
+          "type": "integer",
+          "format": "int32",
+          "description": "The pool quota for this Batch account."
+        },
+        "activeJobAndJobScheduleQuota": {
+          "type": "integer",
+          "format": "int32",
+          "description": "The active job and job schedule quota for this Batch account."
+        }
+      },
+      "required": [
+        "coreQuota",
+        "poolQuota",
+        "activeJobAndJobScheduleQuota"
+      ],
+      "description": "Account specific properties."
+    },
+    "AccountResource": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/AccountProperties",
+          "description": "The properties associated with the account."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "description": "Contains information about an Azure Batch account."
+    },
+    "BatchAccountUpdateParameters": {
+      "properties": {
+        "tags": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "description": "The user specified tags associated with the account."
+        },
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/AccountBaseProperties",
+          "description": "The properties of the account."
+        }
+      },
+      "description": "Parameters supplied to the Update operation."
+    },
+    "BatchAccountListResult": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/AccountResource"
+          },
+          "description": "The collection of returned account resources."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "The continuation token."
+        }
+      },
+      "description": "Values returned by the List operation."
+    },
+    "BatchAccountRegenerateKeyParameters": {
+      "properties": {
+        "keyName": {
+          "type": "string",
+          "description": "The type of account key to regenerate.",
+          "enum": [
+            "Primary",
+            "Secondary"
+          ],
+          "x-ms-enum": {
+            "name": "AccountKeyType",
+            "modelAsString": false
+          }
+        }
+      },
+      "required": [
+        "keyName"
+      ],
+      "description": "Parameters supplied to the RegenerateKey operation."
+    },
+    "BatchAccountRegenerateKeyResult": {
+      "properties": {
+        "primary": {
+          "type": "string",
+          "description": "The primary key associated with the account."
+        },
+        "secondary": {
+          "type": "string",
+          "description": "The secondary key associated with the account."
+        }
+      },
+      "description": "Values returned by the RegenerateKey operation."
+    },
+    "BatchAccountListKeyResult": {
+      "properties": {
+        "primary": {
+          "type": "string",
+          "description": "The primary key associated with the account."
+        },
+        "secondary": {
+          "type": "string",
+          "description": "The secondary key associated with the account."
+        }
+      },
+      "description": "Values returned by the GetKeys operation."
+    },
+    "ActivateApplicationPackageParameters": {
+      "properties": {
+        "format": {
+          "type": "string",
+          "description": "The format of the application package binary file."
+        }
+      },
+      "required": [
+        "format"
+      ],
+      "description": "Parameters for an ApplicationOperations.ActivateApplicationPackage request."
+    },
+    "AddApplicationParameters": {
+      "properties": {
+        "allowUpdates": {
+          "type": "boolean",
+          "description": "A value indicating whether packages within the application may be overwritten using the same version string."
+        },
+        "displayName": {
+          "type": "string",
+          "description": "The display name for the application."
+        }
+      },
+      "description": "Parameters for an ApplicationOperations.AddApplication request."
+    },
+    "AddApplicationPackageResult": {
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "The id of the application."
+        },
+        "version": {
+          "type": "string",
+          "description": "The version of the application."
+        },
+        "storageUrl": {
+          "type": "string",
+          "description": "The URL to which the application package binary file should be uploaded."
+        },
+        "storageUrlExpiry": {
+          "type": "string",
+          "format": "date-time",
+          "description": "The UTC time at which the storage URL will expire."
+        }
+      },
+      "description": "Response to an ApplicationOperations.AddApplicationPackage request."
+    },
+    "ApplicationPackage": {
+      "properties": {
+        "version": {
+          "type": "string",
+          "description": "The version of the application package. "
+        },
+        "state": {
+          "type": "string",
+          "description": "The current state of the application package.",
+          "enum": [
+            "pending",
+            "active",
+            "unmapped"
+          ],
+          "x-ms-enum": {
+            "name": "PackageState",
+            "modelAsString": false
+          }
+        },
+        "format": {
+          "type": "string",
+          "description": "The format of the application package, if the package has been activated."
+        },
+        "lastActivationTime": {
+          "type": "string",
+          "format": "date-time",
+          "description": "The time at which the package was last activated, if the package is active."
+        }
+      },
+      "description": "Contains information about an application package."
+    },
+    "Application": {
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "A string that uniquely identifies the application within the account."
+        },
+        "displayName": {
+          "type": "string",
+          "description": "The display name for the application."
+        },
+        "packages": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ApplicationPackage"
+          },
+          "description": "The list of packages under this application."
+        },
+        "allowUpdates": {
+          "type": "boolean",
+          "description": "A value indicating whether packages within the application may be overwritten using the same version string."
+        },
+        "defaultVersion": {
+          "type": "string",
+          "description": "The package to use if a client requests the application but does not specify a version."
+        }
+      },
+      "description": "Contains information about an application in a Batch account."
+    },
+    "GetApplicationPackageResult": {
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "The id of the application."
+        },
+        "version": {
+          "type": "string",
+          "description": "The version of the application package. "
+        },
+        "state": {
+          "type": "string",
+          "description": "The current state of the application package.",
+          "enum": [
+            "pending",
+            "active",
+            "unmapped"
+          ],
+          "x-ms-enum": {
+            "name": "PackageState",
+            "modelAsString": false
+          }
+        },
+        "format": {
+          "type": "string",
+          "description": "The format of the application package, if the package is active."
+        },
+        "storageUrl": {
+          "type": "string",
+          "description": "The storage URL at which the application package is stored."
+        },
+        "storageUrlExpiry": {
+          "type": "string",
+          "format": "date-time",
+          "description": "The UTC time at which the storage URL will expire."
+        },
+        "lastActivationTime": {
+          "type": "string",
+          "format": "date-time",
+          "description": "The time at which the package was last activated, if the package is active."
+        }
+      },
+      "description": "Response to an ApplicationOperations.GetApplicationPackage request."
+    },
+    "ListApplicationsResult": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Application"
+          },
+          "description": "The list of applications."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "The URL to get the next set of results."
+        }
+      },
+      "description": "Response to an ApplicationOperations.ListApplications request."
+    },
+    "UpdateApplicationParameters": {
+      "properties": {
+        "allowUpdates": {
+          "type": "boolean",
+          "description": "A value indicating whether packages within the application may be overwritten using the same version string."
+        },
+        "defaultVersion": {
+          "type": "string",
+          "description": "The package to use if a client requests the application but does not specify a version."
+        },
+        "displayName": {
+          "type": "string",
+          "description": "The display name for the application."
+        }
+      },
+      "description": "Parameters for an ApplicationOperations.UpdateApplication request."
+    },
+    "SubscriptionQuotasGetResult": {
+      "properties": {
+        "accountQuota": {
+          "type": "integer",
+          "format": "int32",
+          "description": "The number of Batch accounts that may be created under the subscription in the specified region."
+        }
+      },
+      "description": "Values returned by the Get Subscription Quotas operation."
+    },
+    "Resource": {
+      "properties": {
+        "id": {
+          "readOnly": true,
+          "type": "string",
+          "description": "The id of the resource"
+        },
+        "name": {
+          "readOnly": true,
+          "type": "string",
+          "description": "The name of the resource"
+        },
+        "type": {
+          "readOnly": true,
+          "type": "string",
+          "description": "The type of the resource"
+        },
+        "location": {
+          "type": "string",
+          "description": "The location of the resource"
+        },
+        "tags": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "description": "The tags of the resource"
+        }
+      },
+      "x-ms-azure-resource": true
+    }
+  },
+  "parameters": {
+    "SubscriptionIdParameter": {
+      "name": "subscriptionId",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "A unique identifier of a Microsoft Azure subscription. The subscription id forms part of the URI for every service call."
+    },  
+    "ApiVersionParameter": {
+      "name": "api-version",
+      "in": "query",
+      "required": true,
+      "type": "string",
+      "description": "Client API Version."
+    }
+  }
+}
\ No newline at end of file
diff --git a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/Swagger/cdn.json b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/Swagger/cdn.json
new file mode 100644
index 0000000000000..06884bfdd01b8
--- /dev/null
+++ b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/Swagger/cdn.json
@@ -0,0 +1,2439 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "version": "2016-04-02",
+    "title": "CdnManagementClient",
+    "description": "Use these APIs to manage Azure CDN resources through the Azure Resource Manager. You must make sure that requests made to these resources are secure. For more information, see <a href=\"https://msdn.microsoft.com/en-us/library/azure/dn790557.aspx\">Authenticating Azure Resource Manager requests.</a>"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json"
+  ],
+  "produces": [
+    "application/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Cdn/profiles": {
+      "get": {
+        "tags": [
+          "Profiles"
+        ],
+        "summary": "Lists the CDN profiles within an Azure subscitption.",
+        "operationId": "Profiles_ListBySubscriptionId",
+        "parameters": [
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/ProfileListResult"
+            }
+          },
+          "default": {
+            "description": "CDN error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": null
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cdn/profiles": {
+      "get": {
+        "tags": [
+          "Profiles"
+        ],
+        "summary": "Lists the CDN profiles within a resource group.",
+        "operationId": "Profiles_ListByResourceGroup",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group within the Azure subscription.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/ProfileListResult"
+            }
+          },
+          "default": {
+            "description": "CDN error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": null
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cdn/profiles/{profileName}": {
+      "get": {
+        "tags": [
+          "Profiles"
+        ],
+        "summary": "Gets a CDN profile with the specified parameters.",
+        "operationId": "Profiles_Get",
+        "parameters": [
+          {
+            "name": "profileName",
+            "in": "path",
+            "description": "Name of the CDN profile within the resource group.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group within the Azure subscription.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Profile"
+            }
+          },
+          "default": {
+            "description": "CDN error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "Profiles"
+        ],
+        "summary": "Creates a new CDN profile with the specified parameters.",
+        "operationId": "Profiles_Create",
+        "parameters": [
+          {
+            "name": "profileName",
+            "in": "path",
+            "description": "Name of the CDN profile within the resource group.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "description": "Profile properties needed for creation.",
+            "in": "body",
+            "name": "profileProperties",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/ProfileCreateParameters"
+            }
+          },
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group within the Azure subscription.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "Created",
+            "schema": {
+              "$ref": "#/definitions/Profile"
+            }
+          },
+          "202": {
+            "description": "Accepted and  the operation will complete asynchronously.",
+            "schema": {
+              "$ref": "#/definitions/Profile"
+            }
+          },
+          "default": {
+            "description": "CDN error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      },
+      "patch": {
+        "tags": [
+          "Profiles"
+        ],
+        "summary": "Updates an existing CDN profile with the specified parameters.",
+        "operationId": "Profiles_Update",
+        "parameters": [
+          {
+            "name": "profileName",
+            "in": "path",
+            "description": "Name of the CDN profile within the resource group.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "profileProperties",
+            "in": "body",
+            "description": "Profile properties needed for update.",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/ProfileUpdateParameters"
+            }
+          },
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group within the Azure subscription.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Profile"
+            }
+          },
+          "202": {
+            "description": "Accepted and the operation will complete asynchronously.",
+            "schema": {
+              "$ref": "#/definitions/Profile"
+            }
+          },
+          "default": {
+            "description": "CDN error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      },
+      "delete": {
+        "tags": [
+          "Profiles"
+        ],
+        "summary": "Deletes an existing CDN profile with the specified parameters. Deleting a profile will result in the deletion of all subresources including endpoints, origins and custom domains.",
+        "operationId": "Profiles_DeleteIfExists",
+        "parameters": [
+          {
+            "name": "profileName",
+            "in": "path",
+            "description": "Name of the CDN profile within the resource group.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group within the Azure subscription.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": "Accepted and the operation will complete asynchronously."
+          },
+          "204": {
+            "description": "No Content."
+          },
+          "default": {
+            "description": "CDN error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cdn/profiles/{profileName}/generateSsoUri": {
+      "post": {
+        "tags": [
+          "Profiles"
+        ],
+        "summary": "Generates a dynamic SSO URI used to sign in to the CDN Supplemental Portal used for advanced management tasks, such as Country Filtering, Advanced HTTP Reports, and Real-time Stats and Alerts. The SSO URI changes approximately every 10 minutes.",
+        "operationId": "Profiles_GenerateSsoUri",
+        "parameters": [
+          {
+            "name": "profileName",
+            "in": "path",
+            "description": "Name of the CDN profile within the resource group.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group within the Azure subscription.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SsoUri"
+            }
+          },
+          "default": {
+            "description": "CDN error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cdn/profiles/{profileName}/endpoints": {
+      "get": {
+        "tags": [
+          "Endpoints"
+        ],
+        "summary": "Lists existing CDN endpoints within a profile.",
+        "operationId": "Endpoints_ListByProfile",
+        "parameters": [
+          {
+            "name": "profileName",
+            "in": "path",
+            "description": "Name of the CDN profile within the resource group.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group within the Azure subscription.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/EndpointListResult"
+            }
+          },
+          "default": {
+            "description": "CDN error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": null
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cdn/profiles/{profileName}/endpoints/{endpointName}": {
+      "get": {
+        "tags": [
+          "Endpoints"
+        ],
+        "summary": "Gets an existing CDN endpoint with the specified parameters.",
+        "operationId": "Endpoints_Get",
+        "parameters": [
+          {
+            "name": "endpointName",
+            "in": "path",
+            "description": "Name of the endpoint within the CDN profile.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "profileName",
+            "in": "path",
+            "description": "Name of the CDN profile within the resource group.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group within the Azure subscription.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Endpoint"
+            }
+          },
+          "default": {
+            "description": "CDN error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "Endpoints"
+        ],
+        "summary": "Creates a new CDN endpoint with the specified parameters.",
+        "operationId": "Endpoints_Create",
+        "parameters": [
+          {
+            "name": "endpointName",
+            "in": "path",
+            "description": "Name of the endpoint within the CDN profile.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "endpointProperties",
+            "in": "body",
+            "description": "Endpoint properties",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/EndpointCreateParameters"
+            }
+          },
+          {
+            "name": "profileName",
+            "in": "path",
+            "description": "Name of the CDN profile within the resource group.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group within the Azure subscription.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "Created",
+            "schema": {
+              "$ref": "#/definitions/Endpoint"
+            }
+          },
+          "202": {
+            "description": "Accepted and the operation will complete asynchronously.",
+            "schema": {
+              "$ref": "#/definitions/Endpoint"
+            }
+          },
+          "default": {
+            "description": "CDN error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      },
+      "patch": {
+        "tags": [
+          "Endpoints"
+        ],
+        "summary": "Updates an existing CDN endpoint with the specified parameters. Only tags and OriginHostHeader can be updated after creating an endpoint. To update origins, use the Update Origin operation. To update custom domains, use the Update Custom Domain operation.",
+        "operationId": "Endpoints_Update",
+        "parameters": [
+          {
+            "name": "endpointName",
+            "in": "path",
+            "description": "Name of the endpoint within the CDN profile.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "endpointProperties",
+            "in": "body",
+            "description": "Endpoint properties",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/EndpointUpdateParameters"
+            }
+          },
+          {
+            "name": "profileName",
+            "in": "path",
+            "description": "Name of the CDN profile within the resource group.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group within the Azure subscription.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Endpoint"
+            }
+          },
+          "202": {
+            "description": "Accepted and  the operation will complete asynchronously",
+            "schema": {
+              "$ref": "#/definitions/Endpoint"
+            }
+          },
+          "default": {
+            "description": "CDN error response describing why the operation failed",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      },
+      "delete": {
+        "tags": [
+          "Endpoints"
+        ],
+        "summary": "Deletes an existing CDN endpoint with the specified parameters.",
+        "operationId": "Endpoints_DeleteIfExists",
+        "parameters": [
+          {
+            "name": "endpointName",
+            "in": "path",
+            "description": "Name of the endpoint within the CDN profile.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "profileName",
+            "in": "path",
+            "description": "Name of the CDN profile within the resource group.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group within the Azure subscription.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": "Accepted"
+          },
+          "204": {
+            "description": "No Content"
+          },
+          "default": {
+            "description": "CDN error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cdn/profiles/{profileName}/endpoints/{endpointName}/start": {
+      "post": {
+        "tags": [
+          "Endpoints"
+        ],
+        "summary": "Starts an existing stopped CDN endpoint.",
+        "operationId": "Endpoints_Start",
+        "parameters": [
+          {
+            "name": "endpointName",
+            "in": "path",
+            "description": "Name of the endpoint within the CDN profile.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "profileName",
+            "in": "path",
+            "description": "Name of the CDN profile within the resource group.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group within the Azure subscription.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": "Accepted and the operation will complete asynchronously.",
+            "schema": {
+              "$ref": "#/definitions/Endpoint"
+            }
+          },
+          "default": {
+            "description": "CDN error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cdn/profiles/{profileName}/endpoints/{endpointName}/stop": {
+      "post": {
+        "tags": [
+          "Endpoints"
+        ],
+        "summary": "Stops an existing running CDN endpoint.",
+        "operationId": "Endpoints_Stop",
+        "parameters": [
+          {
+            "name": "endpointName",
+            "in": "path",
+            "description": "Name of the endpoint within the CDN profile.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "profileName",
+            "in": "path",
+            "description": "Name of the CDN profile within the resource group.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group within the Azure subscription.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": "Accepted and the operation will complete asynchronously.",
+            "schema": {
+              "$ref": "#/definitions/Endpoint"
+            }
+          },
+          "default": {
+            "description": "CDN error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cdn/profiles/{profileName}/endpoints/{endpointName}/purge": {
+      "post": {
+        "tags": [
+          "Endpoints"
+        ],
+        "summary": "Forcibly purges CDN endpoint content.",
+        "operationId": "Endpoints_PurgeContent",
+        "parameters": [
+          {
+            "name": "endpointName",
+            "in": "path",
+            "description": "Name of the endpoint within the CDN profile.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "contentFilePaths",
+            "in": "body",
+            "description": "The path to the content to be purged. Path can describe a file or directory.",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/PurgeParameters"
+            }
+          },
+          {
+            "name": "profileName",
+            "in": "path",
+            "description": "Name of the CDN profile within the resource group.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group within the Azure subscription.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": "Accepted and the operation will complete asynchronously."
+          },
+          "default": {
+            "description": "CDN error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cdn/profiles/{profileName}/endpoints/{endpointName}/load": {
+      "post": {
+        "tags": [
+          "Endpoints"
+        ],
+        "summary": "Forcibly pre-loads CDN endpoint content.",
+        "operationId": "Endpoints_LoadContent",
+        "parameters": [
+          {
+            "name": "endpointName",
+            "in": "path",
+            "description": "Name of the endpoint within the CDN profile.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "contentFilePaths",
+            "in": "body",
+            "description": "The path to the content to be loaded. Path should describe a file.",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/LoadParameters"
+            }
+          },
+          {
+            "name": "profileName",
+            "in": "path",
+            "description": "Name of the CDN profile within the resource group.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group within the Azure subscription.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": "Accepted and the operation will complete asynchronously."
+          },
+          "default": {
+            "description": "CDN error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cdn/profiles/{profileName}/endpoints/{endpointName}/validateCustomDomain": {
+      "post": {
+        "tags": [
+          "Endpoints"
+        ],
+        "summary": "Validates a custom domain mapping to ensure it maps to the correct CNAME in DNS.",
+        "operationId": "Endpoints_ValidateCustomDomain",
+        "parameters": [
+          {
+            "name": "endpointName",
+            "in": "path",
+            "description": "Name of the endpoint within the CDN profile.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "customDomainProperties",
+            "in": "body",
+            "description": "Custom domain to validate.",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/ValidateCustomDomainInput"
+            }
+          },
+          {
+            "name": "profileName",
+            "in": "path",
+            "description": "Name of the CDN profile within the resource group.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group within the Azure subscription.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/ValidateCustomDomainOutput"
+            }
+          },
+          "default": {
+            "description": "CDN error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cdn/profiles/{profileName}/endpoints/{endpointName}/origins": {
+      "get": {
+        "tags": [
+          "Origins"
+        ],
+        "summary": "Lists the existing CDN origins within an endpoint.",
+        "operationId": "Origins_ListByEndpoint",
+        "parameters": [
+          {
+            "name": "endpointName",
+            "in": "path",
+            "description": "Name of the endpoint within the CDN profile.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "profileName",
+            "in": "path",
+            "description": "Name of the CDN profile within the resource group.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group within the Azure subscription.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/OriginListResult"
+            }
+          },
+          "default": {
+            "description": "CDN error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": null
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cdn/profiles/{profileName}/endpoints/{endpointName}/origins/{originName}": {
+      "get": {
+        "tags": [
+          "Origins"
+        ],
+        "summary": "Gets an existing CDN origin within an endpoint.",
+        "operationId": "Origins_Get",
+        "parameters": [
+          {
+            "name": "originName",
+            "in": "path",
+            "description": "Name of the origin, an arbitrary value but it needs to be unique under endpoint",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "endpointName",
+            "in": "path",
+            "description": "Name of the endpoint within the CDN profile.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "profileName",
+            "in": "path",
+            "description": "Name of the CDN profile within the resource group.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group within the Azure subscription.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Origin"
+            }
+          },
+          "default": {
+            "description": "CDN error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "Origins"
+        ],
+        "summary": "Creates a new CDN origin within an endpoint.",
+        "operationId": "Origins_Create",
+        "parameters": [
+          {
+            "name": "originName",
+            "in": "path",
+            "description": "Name of the origin, an arbitrary value but it needs to be unique under endpoint",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "originProperties",
+            "in": "body",
+            "description": "Origin properties",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/OriginParameters"
+            }
+          },
+          {
+            "name": "endpointName",
+            "in": "path",
+            "description": "Name of the endpoint within the CDN profile.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "profileName",
+            "in": "path",
+            "description": "Name of the CDN profile within the resource group.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group within the Azure subscription.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "Created",
+            "schema": {
+              "$ref": "#/definitions/Origin"
+            }
+          },
+          "202": {
+            "description": "Accepted and the operation will complete asynchronously.",
+            "schema": {
+              "$ref": "#/definitions/Origin"
+            }
+          },
+          "default": {
+            "description": "CDN error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      },
+      "patch": {
+        "tags": [
+          "Origins"
+        ],
+        "summary": "Updates an existing CDN origin within an endpoint.",
+        "operationId": "Origins_Update",
+        "parameters": [
+          {
+            "name": "originName",
+            "in": "path",
+            "description": "Name of the origin. Must be unique within endpoint.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "originProperties",
+            "in": "body",
+            "description": "Origin properties",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/OriginParameters"
+            }
+          },
+          {
+            "name": "endpointName",
+            "in": "path",
+            "description": "Name of the endpoint within the CDN profile.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "profileName",
+            "in": "path",
+            "description": "Name of the CDN profile within the resource group.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group within the Azure subscription.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Origin"
+            }
+          },
+          "202": {
+            "description": "Accepted and the operation will complete asynchronously.",
+            "schema": {
+              "$ref": "#/definitions/Origin"
+            }
+          },
+          "default": {
+            "description": "CDN error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      },
+      "delete": {
+        "tags": [
+          "Origins"
+        ],
+        "summary": "Deletes an existing CDN origin within an endpoint.",
+        "operationId": "Origins_DeleteIfExists",
+        "parameters": [
+          {
+            "name": "originName",
+            "in": "path",
+            "description": "Name of the origin. Must be unique within endpoint.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "endpointName",
+            "in": "path",
+            "description": "Name of the endpoint within the CDN profile.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "profileName",
+            "in": "path",
+            "description": "Name of the CDN profile within the resource group.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group within the Azure subscription.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": "Accepted and the operation will complete asynchronously.",
+            "schema": {
+              "$ref": "#/definitions/Origin"
+            }
+          },
+          "204": {
+            "description": "No Content"
+          },
+          "default": {
+            "description": "CDN error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cdn/profiles/{profileName}/endpoints/{endpointName}/customDomains": {
+      "get": {
+        "tags": [
+          "CustomDomains"
+        ],
+        "summary": "Lists the existing CDN custom domains within an endpoint.",
+        "operationId": "CustomDomains_ListByEndpoint",
+        "parameters": [
+          {
+            "name": "endpointName",
+            "in": "path",
+            "description": "Name of the endpoint within the CDN profile.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "profileName",
+            "in": "path",
+            "description": "Name of the CDN profile within the resource group.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group within the Azure subscription.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/CustomDomainListResult"
+            }
+          },
+          "default": {
+            "description": "CDN error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": null
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cdn/profiles/{profileName}/endpoints/{endpointName}/customDomains/{customDomainName}": {
+      "get": {
+        "tags": [
+          "CustomDomains"
+        ],
+        "summary": "Gets an existing CDN custom domain within an endpoint.",
+        "operationId": "CustomDomains_Get",
+        "parameters": [
+          {
+            "name": "customDomainName",
+            "in": "path",
+            "description": "Name of the custom domain within an endpoint.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "endpointName",
+            "in": "path",
+            "description": "Name of the endpoint within the CDN profile.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "profileName",
+            "in": "path",
+            "description": "Name of the CDN profile within the resource group.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group within the Azure subscription.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/CustomDomain"
+            }
+          },
+          "default": {
+            "description": "CDN error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "CustomDomains"
+        ],
+        "summary": "Creates a new CDN custom domain within an endpoint.",
+        "operationId": "CustomDomains_Create",
+        "parameters": [
+          {
+            "name": "customDomainName",
+            "in": "path",
+            "description": "Name of the custom domain within an endpoint.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "customDomainProperties",
+            "in": "body",
+            "description": "Custom domain properties required for creation.",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/CustomDomainParameters"
+            }
+          },
+          {
+            "name": "endpointName",
+            "in": "path",
+            "description": "Name of the endpoint within the CDN profile.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "profileName",
+            "in": "path",
+            "description": "Name of the CDN profile within the resource group.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group within the Azure subscription.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "Created",
+            "schema": {
+              "$ref": "#/definitions/CustomDomain"
+            }
+          },
+          "202": {
+            "description": "Accepted and the operation will complete asynchronously.",
+            "schema": {
+              "$ref": "#/definitions/CustomDomain"
+            }
+          },
+          "default": {
+            "description": "CDN error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      },
+      "patch": {
+        "tags": [
+          "CustomDomains"
+        ],
+        "summary": "Updates an existing CDN custom domain within an endpoint.",
+        "operationId": "CustomDomains_Update",
+        "parameters": [
+          {
+            "name": "customDomainName",
+            "in": "path",
+            "description": "Name of the custom domain within an endpoint.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "customDomainProperties",
+            "in": "body",
+            "description": "Custom domain properties to update.",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/CustomDomainParameters"
+            }
+          },
+          {
+            "name": "endpointName",
+            "in": "path",
+            "description": "Name of the endpoint within the CDN profile.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "profileName",
+            "in": "path",
+            "description": "Name of the CDN profile within the resource group.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group within the Azure subscription.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "default": {
+            "description": "CDN error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "CustomDomains"
+        ],
+        "summary": "Deletes an existing CDN custom domain within an endpoint.",
+        "operationId": "CustomDomains_DeleteIfExists",
+        "parameters": [
+          {
+            "name": "customDomainName",
+            "in": "path",
+            "description": "Name of the custom domain within an endpoint.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "endpointName",
+            "in": "path",
+            "description": "Name of the endpoint within the CDN profile.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "profileName",
+            "in": "path",
+            "description": "Name of the CDN profile within the resource group.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group within the Azure subscription.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "202": {
+            "description": "Accepted and the operation will complete asynchronously.",
+            "schema": {
+              "$ref": "#/definitions/CustomDomain"
+            }
+          },
+          "204": {
+            "description": "No Content"
+          },
+          "default": {
+            "description": "CDN error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/providers/Microsoft.Cdn/checkNameAvailability": {
+      "post": {
+        "tags": [
+          "CheckNameAvailability"
+        ],
+        "summary": "Check the availability of a resource name without creating the resource. This is needed for resources where name is globally unique, such as a CDN endpoint.",
+        "operationId": "NameAvailability_CheckNameAvailability",
+        "parameters": [
+          {
+            "name": "checkNameAvailabilityInput",
+            "in": "body",
+            "description": "Input to check.",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/CheckNameAvailabilityInput"
+            }
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/CheckNameAvailabilityOutput"
+            }
+          },
+          "default": {
+            "description": "CDN error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        }
+      }
+    },
+    "/providers/Microsoft.Cdn/operations": {
+      "get": {
+        "tags": [
+          "Operations"
+        ],
+        "summary": "Lists all of the available CDN REST API operations.",
+        "operationId": "Operations_List",
+        "parameters": [
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/OperationListResult"
+            }
+          },
+          "default": {
+            "description": "CDN error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/ErrorResponse"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": null
+        }
+      }
+    }
+  },
+  "definitions": {
+    "Profile": {
+      "description": "CDN profile represents the top level resource and the entry point into the CDN API. This allows users to set up a logical grouping of endpoints in addition to creating shared configuration settings and selecting pricing tiers and providers.",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/TrackedResource"
+        }
+      ],
+      "properties": {
+	    "sku": {
+          "description": "The SKU (pricing tier) of the CDN profile.",
+          "$ref": "#/definitions/Sku"
+        },
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/ProfileProperties"
+        }
+      }
+    },
+    "ProfileProperties": {
+      "properties": {
+        "resourceState": {
+          "description": "Resource status of the profile.",
+          "readOnly": true,
+          "enum": [
+            "Creating",
+            "Active",
+            "Deleting",
+            "Disabled"
+          ],
+          "type": "string",
+          "x-ms-enum": {
+            "name": "ProfileResourceState",
+            "modelAsString": false
+          }
+        },
+        "provisioningState": {
+          "description": "Provisioning status of the profile.",
+          "$ref": "#/definitions/ProvisioningState"
+        }
+      }
+    },
+    "ProfileListResult": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Profile"
+          },
+          "description": "List of CDN profiles within a resource group."
+        }
+      }
+    },
+    "ProfileCreateParameters": {
+      "type": "object",
+      "description": "Profile properties required for profile creation.",
+      "required": [
+        "location",
+        "sku"
+      ],
+      "properties": {
+        "location": {
+          "description": "Profile location",
+          "type": "string"
+        },
+        "tags": {
+          "description": "Profile tags",
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          }
+        },
+        "sku": {
+          "description": "The SKU (pricing tier) of the CDN profile.",
+          "$ref": "#/definitions/Sku"
+		    }
+      },
+      "x-ms-azure-resource": true
+    },
+    "ProfileUpdateParameters": {
+      "type": "object",
+      "description": "Profile properties required for profile update.",
+      "required": [
+        "tags"
+      ],
+      "properties": {
+        "tags": {
+          "description": "Profile tags",
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          }
+        }
+      },
+      "x-ms-azure-resource": true
+    },
+    "SsoUri": {
+      "description": "SSO URI required to login to third party web portal.",
+      "type": "object",
+      "properties": {
+        "ssoUriValue": {
+          "description": "The URI used to login to third party web portal.",
+          "type": "string"
+        }
+      }
+    },
+    "Endpoint": {
+      "description": "CDN endpoint is the entity within a CDN profile containing configuration information regarding caching behaviors and origins. The CDN endpoint is exposed using the URL format <endpointname>.azureedge.net by default, but custom domains can also be created.",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/TrackedResource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/EndpointProperties"
+        }
+      }
+    },
+    "EndpointProperties": {
+      "properties": {
+        "hostName": {
+          "description": "The host name of the endpoint {endpointName}.{DNSZone}",
+          "type": "string",
+          "readOnly": true
+        },
+        "originHostHeader": {
+          "description": "The host header the CDN provider will send along with content requests to origins. The default value is the host name of the origin.",
+          "type": "string"
+        },
+        "originPath": {
+          "description": "The path used for origin requests.",
+          "type": "string"
+        },
+        "contentTypesToCompress": {
+          "description": "List of content types on which compression will be applied. The value for the elements should be a valid MIME type.",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "isCompressionEnabled": {
+          "description": "Indicates whether the compression is enabled. Default value is false. If compression is enabled, the content transferred from cdn endpoint to end user will be compressed. The requested content must be larger than 1 byte and smaller than 1 MB.",
+          "type": "boolean"
+        },
+        "isHttpAllowed": {
+          "description": "Indicates whether HTTP traffic is allowed on the endpoint. Default value is true. At least one protocol (HTTP or HTTPS) must be allowed.",
+          "type": "boolean"
+        },
+        "isHttpsAllowed": {
+          "description": "Indicates whether https traffic is allowed on the endpoint. Default value is true. At least one protocol (HTTP or HTTPS) must be allowed.",
+          "type": "boolean"
+        },
+        "queryStringCachingBehavior": {
+          "description": "Defines the query string caching behavior.",
+          "$ref": "#/definitions/QueryStringCachingBehavior"
+        },
+        "origins": {
+          "description": "The set of origins for the CDN endpoint. When multiple origins exist, the first origin will be used as primary and rest will be used as failover options.",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/DeepCreatedOrigin"
+          }
+        },
+        "resourceState": {
+          "description": "Resource status of the endpoint.",
+          "readOnly": true,
+          "enum": [
+            "Creating",
+            "Deleting",
+            "Running",
+            "Starting",
+            "Stopped",
+            "Stopping"
+          ],
+          "type": "string",
+          "x-ms-enum": {
+            "name": "EndpointResourceState",
+            "modelAsString": false
+          }
+        },
+        "provisioningState": {
+          "description": "Provisioning status of the endpoint.",
+          "$ref": "#/definitions/ProvisioningState"
+        }
+      }
+    },
+    "EndpointListResult": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Endpoint"
+          },
+          "description": "List of CDN endpoints within a profile"
+        }
+      }
+    },
+    "EndpointCreateParameters": {
+      "type": "object",
+      "description": "Endpoint properties required for new endpoint creation.",
+      "required": [
+        "location"
+      ],
+      "properties": {
+        "location": {
+          "description": "Endpoint location",
+          "type": "string"
+        },
+        "tags": {
+          "description": "Endpoint tags",
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          }
+        },
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/EndpointPropertiesCreateParameters"
+        }
+      },
+      "x-ms-azure-resource": true
+    },
+    "EndpointUpdateParameters": {
+      "type": "object",
+      "description": "Endpoint properties required for new endpoint creation.",
+      "properties": {
+        "tags": {
+          "description": "Endpoint tags",
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          }
+        },
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/EndpointPropertiesUpdateParameters"
+        }
+      },
+      "x-ms-azure-resource": true
+    },
+    "EndpointPropertiesCreateParameters": {
+      "required": [
+        "origins"
+      ],
+      "properties": {
+        "originHostHeader": {
+          "description": "The host header CDN provider will send along with content requests to origins. The default value is the host name of the origin.",
+          "type": "string"
+        },
+        "originPath": {
+          "description": "The path used for origin requests.",
+          "type": "string"
+        },
+        "contentTypesToCompress": {
+          "description": "List of content types on which compression will be applied. The value for the elements should be a valid MIME type.",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "isCompressionEnabled": {
+          "description": "Indicates whether content compression is enabled. Default value is false. If compression is enabled, the content transferred from the CDN endpoint to the end user will be compressed. The requested content must be larger than 1 byte and smaller than 1 MB.",
+          "type": "boolean"
+        },
+        "isHttpAllowed": {
+          "description": "Indicates whether HTTP traffic is allowed on the endpoint. Default value is true. At least one protocol (HTTP or HTTPS) must be allowed.",
+          "type": "boolean"
+        },
+        "isHttpsAllowed": {
+          "description": "Indicates whether https traffic is allowed on the endpoint. Default value is true. At least one protocol (HTTP or HTTPS) must be allowed.",
+          "type": "boolean"
+        },
+        "queryStringCachingBehavior": {
+          "description": "Defines the query string caching behavior.",
+          "$ref": "#/definitions/QueryStringCachingBehavior"
+        },
+        "origins": {
+          "description": "The set of origins for the CDN endpoint. When multiple origins exist, the first origin will be used as primary and rest will be used as failover options.",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/DeepCreatedOrigin"
+          }
+        }
+      }
+    },
+    "EndpointPropertiesUpdateParameters": {
+      "properties": {
+        "originHostHeader": {
+          "description": "The host header the CDN provider will send along with content requests to origins. The default value is the host name of the origin.",
+          "type": "string"
+        },
+        "originPath": {
+          "description": "The path used for origin requests.",
+          "type": "string"
+        },
+        "contentTypesToCompress": {
+          "description": "List of content types on which compression will be applied. The value for the elements should be a valid MIME type.",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "isCompressionEnabled": {
+          "description": "Indicates whether content compression is enabled. Default value is false. If compression is enabled, the content transferred from the CDN endpoint to the end user will be compressed. The requested content must be larger than 1 byte and smaller than 1 MB.",
+          "type": "boolean"
+        },
+        "isHttpAllowed": {
+          "description": "Indicates whether HTTP traffic is allowed on the endpoint. Default value is true. At least one protocol (HTTP or HTTPS) must be allowed.",
+          "type": "boolean"
+        },
+        "isHttpsAllowed": {
+          "description": "Indicates whether HTTPS traffic is allowed on the endpoint. Default value is true. At least one protocol (HTTP or HTTPS) must be allowed.",
+          "type": "boolean"
+        },
+        "queryStringCachingBehavior": {
+          "description": "Defines the query string caching behavior",
+          "$ref": "#/definitions/QueryStringCachingBehavior"
+        }
+      }
+    },
+    "DeepCreatedOrigin": {
+      "description": "Deep created origins within a CDN endpoint.",
+      "type": "object",
+      "required": [
+        "name"
+      ],
+      "properties": {
+        "name": {
+          "description": "Origin name",
+          "type": "string"
+        },
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/DeepCreatedOriginProperties"
+        }
+      },
+      "x-ms-azure-resource": true
+    },
+    "DeepCreatedOriginProperties": {
+      "description": "Properties of deep created origin on a CDN endpoint.",
+      "type": "object",
+      "required": [
+        "hostName"
+      ],
+      "properties": {
+        "hostName": {
+          "description": "The address of the origin. Domain names, IPv4 addresses, and IPv6 addresses are supported.",
+          "type": "string"
+        },
+        "httpPort": {
+          "description": "The value of the HTTP port. Must be between 1 and 65535",
+          "type": "integer"
+        },
+        "httpsPort": {
+          "description": "The value of the HTTPS port. Must be between 1 and 65535",
+          "type": "integer"
+        }
+      },
+      "x-ms-azure-resource": true
+    },
+    "PurgeParameters": {
+      "type": "object",
+      "description": "Parameters required for endpoint purge.",
+      "required": [
+        "contentPaths"
+      ],
+      "properties": {
+        "contentPaths": {
+          "description": "The path to the content to be purged. Can describe a file path or a wild card directory.",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "LoadParameters": {
+      "type": "object",
+      "description": "Parameters required for endpoint load.",
+      "required": [
+        "contentPaths"
+      ],
+      "properties": {
+        "contentPaths": {
+          "description": "The path to the content to be loaded. Should describe a file path.",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "Origin": {
+      "description": "CDN origin is the source of the content being delivered via CDN. When the edge nodes represented by an endpoint do not have the requested content cached, they attempt to fetch it from one or more of the configured origins.",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/OriginProperties"
+        }
+      }
+    },
+    "OriginProperties": {
+      "required": [
+        "hostName"
+      ],
+      "properties": {
+        "hostName": {
+          "description": "The address of the origin. Domain names, IPv4 addresses, and IPv6 addresses are supported.",
+          "type": "string"
+        },
+        "httpPort": {
+          "description": "The value of the HTTP port. Must be between 1 and 65535.",
+          "type": "integer"
+        },
+        "httpsPort": {
+          "description": "The value of the https port. Must be between 1 and 65535.",
+          "type": "integer"
+        },
+        "resourceState": {
+          "description": "Resource status of the origin.",
+          "readOnly": true,
+          "enum": [
+            "Creating",
+            "Active",
+            "Deleting"
+          ],
+          "type": "string",
+          "x-ms-enum": {
+            "name": "OriginResourceState",
+            "modelAsString": false
+          }
+        },
+        "provisioningState": {
+          "description": "Provisioning status of the origin.",
+          "$ref": "#/definitions/ProvisioningState"
+        }
+      }
+    },
+    "OriginParameters": {
+      "type": "object",
+      "description": "Origin properties needed for origin creation or update.",
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/OriginPropertiesParameters"
+        }
+      },
+      "x-ms-azure-resource": true
+    },
+    "OriginPropertiesParameters": {
+      "required": [
+        "hostName"
+      ],
+      "properties": {
+        "hostName": {
+          "description": "The address of the origin. Domain names, IPv4 addresses, and IPv6 addresses are supported.",
+          "type": "string"
+        },
+        "httpPort": {
+          "description": "The value of the HTTP port. Must be between 1 and 65535.",
+          "type": "integer"
+        },
+        "httpsPort": {
+          "description": "The value of the HTTPS port. Must be between 1 and 65535.",
+          "type": "integer"
+        }
+      }
+    },
+    "OriginListResult": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Origin"
+          },
+          "description": "List of CDN origins within an endpoint"
+        }
+      }
+    },
+    "CustomDomain": {
+      "description": "CDN CustomDomain represents a mapping between a user specified domain name and a CDN endpoint. This is to use custom domain names to represent the URLs for branding purposes.",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/CustomDomainProperties"
+        }
+      }
+    },
+    "CustomDomainProperties": {
+      "required": [
+        "hostName"
+      ],
+      "properties": {
+        "hostName": {
+          "description": "The host name of the custom domain. Must be a domain name.",
+          "type": "string"
+        },
+        "resourceState": {
+          "description": "Resource status of the custom domain.",
+          "readOnly": true,
+          "enum": [
+            "Creating",
+            "Active",
+            "Deleting"
+          ],
+          "type": "string",
+          "x-ms-enum": {
+            "name": "CustomDomainResourceState",
+            "modelAsString": false
+          }
+        },
+        "provisioningState": {
+          "description": "Provisioning status of the custom domain.",
+          "$ref": "#/definitions/ProvisioningState"
+        }
+      }
+    },
+    "CustomDomainParameters": {
+      "description": "CustomDomain properties required for custom domain creation or update.",
+      "type": "object",
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/CustomDomainPropertiesParameters"
+        }
+      },
+      "x-ms-azure-resource": true
+    },
+    "CustomDomainPropertiesParameters": {
+      "required": [
+        "hostName"
+      ],
+      "properties": {
+        "hostName": {
+          "description": "The host name of the custom domain. Must be a domain name.",
+          "type": "string"
+        }
+      }
+    },
+    "CustomDomainListResult": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/CustomDomain"
+          },
+          "description": "List of CDN CustomDomains within an endpoint."
+        }
+      }
+    },
+    "ValidateCustomDomainInput": {
+      "description": "Input of the custom domain to be validated.",
+      "type": "object",
+      "required": [
+        "hostName"
+      ],
+      "properties": {
+        "hostName": {
+          "description": "The host name of the custom domain. Must be a domain name.",
+          "type": "string"
+        }
+      }
+    },
+    "ValidateCustomDomainOutput": {
+      "description": "Output of custom domain validation.",
+      "type": "object",
+      "properties": {
+        "customDomainValidated": {
+          "description": "Indicates whether the custom domain is validated or not.",
+          "type": "boolean"
+        },
+        "reason": {
+          "description": "The reason why the custom domain is not valid.",
+          "type": "string"
+        },
+        "message": {
+          "description": "The message describing why the custom domain is not valid.",
+          "type": "string"
+        }
+      }
+    },
+    "CheckNameAvailabilityInput": {
+      "description": "Input of CheckNameAvailability API.",
+      "type": "object",
+      "required": [
+        "name",
+        "type"
+      ],
+      "properties": {
+        "name": {
+          "description": "The resource name to validate.",
+          "type": "string"
+        },
+        "type": {
+          "description": "The type of the resource whose name is to be validated.",
+          "$ref": "#/definitions/ResourceType"
+        }
+      }
+    },
+    "CheckNameAvailabilityOutput": {
+      "description": "Output of check name availability API.",
+      "type": "object",
+      "properties": {
+        "NameAvailable": {
+          "description": "Indicates whether the name is available.",
+          "type": "boolean"
+        },
+        "Reason": {
+          "description": "The reason why the name is not available.",
+          "type": "string"
+        },
+        "Message": {
+          "description": "The detailed error message describing why the name is not available.",
+          "type": "string"
+        }
+      }
+    },
+    "ResourceType": {
+      "description": "Type of CDN resource used in CheckNameAvailability.",
+      "readOnly": true,
+      "enum": [
+        "Microsoft.Cdn/Profiles/Endpoints"
+      ],
+      "type": "string",
+      "x-ms-enum": {
+        "name": "ResourceType",
+        "modelAsString": false
+      }
+    },
+    "Operation": {
+      "description": "CDN REST API operation",
+      "type": "object",
+      "properties": {
+        "name": {
+          "description": "Operation name: {provider}/{resource}/{operation}",
+          "type": "string"
+        },
+        "display": {
+          "properties": {
+            "provider": {
+              "description": "Service provider: Microsoft.Cdn",
+              "type": "string"
+            },
+            "resource": {
+              "description": "Resource on which the operation is performed: Profile, endpoint, etc.",
+              "type": "string"
+            },
+            "operation": {
+              "description": "Operation type: Read, write, delete, etc.",
+              "type": "string"
+            }
+          }
+        }
+      }
+    },
+    "OperationListResult": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Operation"
+          },
+          "description": "List of CDN operations supported by the CDN resource provider."
+        }
+      }
+    },
+    "TrackedResource": {
+      "description": "ARM tracked resource",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "required": [
+        "location",
+        "tags"
+      ],
+      "properties": {
+        "location": {
+          "description": "Resource location",
+          "type": "string"
+        },
+        "tags": {
+          "description": "Resource tags",
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "Resource": {
+      "properties": {
+        "id": {
+          "description": "Resource ID",
+          "readOnly": true,
+          "type": "string"
+        },
+        "name": {
+          "description": "Resource name",
+          "readOnly": true,
+          "type": "string"
+        },
+        "type": {
+          "description": "Resource type",
+          "readOnly": true,
+          "type": "string"
+        }
+      },
+      "x-ms-azure-resource": true
+    },
+    "ProvisioningState": {
+      "description": "Provisioning status of the resource.",
+      "readOnly": true,
+      "enum": [
+        "Creating",
+        "Succeeded",
+        "Failed"
+      ],
+      "type": "string",
+      "x-ms-enum": {
+        "name": "ProvisioningState",
+        "modelAsString": false
+      }
+    },
+    "QueryStringCachingBehavior": {
+      "description": "Defines the query string caching behavior.",
+      "enum": [
+        "IgnoreQueryString",
+        "BypassCaching",
+        "UseQueryString",
+        "NotSet"
+      ],
+      "type": "string",
+      "x-ms-enum": {
+        "name": "QueryStringCachingBehavior",
+        "modelAsString": false
+      }
+    },
+    "Sku": {
+      "description": "The SKU (pricing tier) of the CDN profile.",
+      "properties": {
+        "name": {
+          "description": "Name of the pricing tier",
+          "enum": [
+            "Standard_Verizon",
+            "Premium_Verizon",
+            "Custom_Verizon",
+            "Standard_Akamai"
+          ],
+          "type": "string",
+          "x-ms-enum": {
+            "name": "SkuName",
+            "modelAsString": false
+          }
+        }
+      },
+      "type": "object"
+    },
+    "ErrorResponse": {
+      "type": "object",
+      "properties": {
+        "code": {
+          "description": "Error code",
+          "type": "string"
+        },
+        "message": {
+          "description": "Error message indicating why the operation failed.",
+          "type": "string"
+        }
+      }
+    }
+  },
+  "parameters": {
+    "subscriptionIdParameter": {
+      "name": "subscriptionId",
+      "in": "path",
+      "description": "Azure Subscription ID.",
+      "required": true,
+      "type": "string"
+    },
+    "apiVersionParameter": {
+      "name": "api-version",
+      "in": "query",
+      "required": true,
+      "type": "string",
+      "description": "Version of the API to be used with the client request. Current version is 2016-04-02"
+    }
+  }
+}
\ No newline at end of file
diff --git a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/Swagger/compute.json b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/Swagger/compute.json
new file mode 100644
index 0000000000000..7c55ae8f61486
--- /dev/null
+++ b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/Swagger/compute.json
@@ -0,0 +1,4555 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "ComputeManagementClient",
+    "description": "The Compute Management Client.",
+    "version": "2016-03-30"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json",
+    "text/json"
+  ],
+  "produces": [
+    "application/json",
+    "text/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{name}": {
+      "put": {
+        "tags": [
+          "AvailabilitySets"
+        ],
+        "operationId": "AvailabilitySets_CreateOrUpdate",
+        "description": "The operation to create or update the availability set.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "Parameters supplied to the Create Availability Set operation."
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/AvailabilitySet"
+            },
+            "description": "Parameters supplied to the Create Availability Set operation."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/AvailabilitySet"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}": {
+      "delete": {
+        "tags": [
+          "AvailabilitySets"
+        ],
+        "operationId": "AvailabilitySets_Delete",
+        "description": "The operation to delete the availability set.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "availabilitySetName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the availability set."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": ""
+          },
+          "204": {
+            "description": ""
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "AvailabilitySets"
+        ],
+        "operationId": "AvailabilitySets_Get",
+        "description": "The operation to get the availability set.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "availabilitySetName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the availability set."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/AvailabilitySet"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets": {
+      "get": {
+        "tags": [
+          "AvailabilitySets"
+        ],
+        "operationId": "AvailabilitySets_List",
+        "description": "The operation to list the availability sets.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/AvailabilitySetListResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": null
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}/vmSizes": {
+      "get": {
+        "tags": [
+          "AvailabilitySets"
+        ],
+        "operationId": "AvailabilitySets_ListAvailableSizes",
+        "description": "Lists all available virtual machine sizes that can be used to create a new virtual machine in an existing availability set.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "availabilitySetName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the availability set."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/VirtualMachineSizeListResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": null
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/publishers/{publisherName}/artifacttypes/vmextension/types/{type}/versions/{version}": {
+      "get": {
+        "tags": [
+          "VirtualMachineExtensionImages"
+        ],
+        "operationId": "VirtualMachineExtensionImages_Get",
+        "description": "Gets a virtual machine extension image.",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "publisherName",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "type",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "version",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/VirtualMachineExtensionImage"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/publishers/{publisherName}/artifacttypes/vmextension/types": {
+      "get": {
+        "tags": [
+          "VirtualMachineExtensionImages"
+        ],
+        "operationId": "VirtualMachineExtensionImages_ListTypes",
+        "description": "Gets a list of virtual machine extension image types.",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "publisherName",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/VirtualMachineExtensionImage"
+              }
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/publishers/{publisherName}/artifacttypes/vmextension/types/{type}/versions": {
+      "get": {
+        "tags": [
+          "VirtualMachineExtensionImages"
+        ],
+        "operationId": "VirtualMachineExtensionImages_ListVersions",
+        "description": "Gets a list of virtual machine extension image versions.",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "publisherName",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "type",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "The filter to apply on the operation."
+          },
+          {
+            "name": "$top",
+            "in": "query",
+            "required": false,
+            "type": "integer",
+            "format": "int32"
+          },
+          {
+            "name": "$orderby",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/VirtualMachineExtensionImage"
+              }
+            }
+          }
+        },
+        "x-ms-odata": "#/definitions/VirtualMachineExtensionImage"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/extensions/{vmExtensionName}": {
+      "put": {
+        "tags": [
+          "VirtualMachineExtensions"
+        ],
+        "operationId": "VirtualMachineExtensions_CreateOrUpdate",
+        "description": "The operation to create or update the extension.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "vmName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual machine where the extension should be create or updated."
+          },
+          {
+            "name": "vmExtensionName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual machine extension."
+          },
+          {
+            "name": "extensionParameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/VirtualMachineExtension"
+            },
+            "description": "Parameters supplied to the Create Virtual Machine Extension operation."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/VirtualMachineExtension"
+            }
+          },
+          "201": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/VirtualMachineExtension"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      },
+      "delete": {
+        "tags": [
+          "VirtualMachineExtensions"
+        ],
+        "operationId": "VirtualMachineExtensions_Delete",
+        "description": "The operation to delete the extension.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "vmName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual machine where the extension should be deleted."
+          },
+          {
+            "name": "vmExtensionName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual machine extension."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": ""
+          },
+          "204": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      },
+      "get": {
+        "tags": [
+          "VirtualMachineExtensions"
+        ],
+        "operationId": "VirtualMachineExtensions_Get",
+        "description": "The operation to get the extension.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "vmName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual machine containing the extension."
+          },
+          {
+            "name": "vmExtensionName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual machine extension."
+          },
+          {
+            "name": "$expand",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "The expand expression to apply on the operation."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/VirtualMachineExtension"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/publishers/{publisherName}/artifacttypes/vmimage/offers/{offer}/skus/{skus}/versions/{version}": {
+      "get": {
+        "tags": [
+          "VirtualMachineImages"
+        ],
+        "operationId": "VirtualMachineImages_Get",
+        "description": "Gets a virtual machine image.",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "publisherName",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "offer",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "skus",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "version",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/VirtualMachineImage"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/publishers/{publisherName}/artifacttypes/vmimage/offers/{offer}/skus/{skus}/versions": {
+      "get": {
+        "tags": [
+          "VirtualMachineImages"
+        ],
+        "operationId": "VirtualMachineImages_List",
+        "description": "Gets a list of virtual machine images.",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "publisherName",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "offer",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "skus",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "The filter to apply on the operation."
+          },
+          {
+            "name": "$top",
+            "in": "query",
+            "required": false,
+            "type": "integer",
+            "format": "int32"
+          },
+          {
+            "name": "$orderby",
+            "in": "query",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/VirtualMachineImageResource"
+              }
+            }
+          }
+        },
+        "x-ms-odata": "#/definitions/VirtualMachineImageResource"
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/publishers/{publisherName}/artifacttypes/vmimage/offers": {
+      "get": {
+        "tags": [
+          "VirtualMachineImages"
+        ],
+        "operationId": "VirtualMachineImages_ListOffers",
+        "description": "Gets a list of virtual machine image offers.",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "publisherName",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/VirtualMachineImageResource"
+              }
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/publishers": {
+      "get": {
+        "tags": [
+          "VirtualMachineImages"
+        ],
+        "operationId": "VirtualMachineImages_ListPublishers",
+        "description": "Gets a list of virtual machine image publishers.",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/VirtualMachineImageResource"
+              }
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/publishers/{publisherName}/artifacttypes/vmimage/offers/{offer}/skus": {
+      "get": {
+        "tags": [
+          "VirtualMachineImages"
+        ],
+        "operationId": "VirtualMachineImages_ListSkus",
+        "description": "Gets a list of virtual machine image skus.",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "publisherName",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "offer",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/VirtualMachineImageResource"
+              }
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/usages": {
+      "get": {
+        "tags": [
+          "Usage"
+        ],
+        "operationId": "Usage_List",
+        "description": "Lists compute usages for a subscription.",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The location upon which resource usage is queried.",
+            "pattern": "^[-\\w\\._]+$"
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/ListUsagesResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/vmSizes": {
+      "get": {
+        "tags": [
+          "VirtualMachineSizes"
+        ],
+        "operationId": "VirtualMachineSizes_List",
+        "description": "Lists all available virtual machine sizes for a subscription in a location.",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The location upon which virtual-machine-sizes is queried.",
+            "pattern": "^[-\\w\\._]+$"
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/VirtualMachineSizeListResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": null
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/capture": {
+      "post": {
+        "tags": [
+          "VirtualMachines"
+        ],
+        "operationId": "VirtualMachines_Capture",
+        "description": "Captures the VM by copying virtual hard disks of the VM and outputs a template that can be used to create similar VMs.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "vmName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual machine."
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/VirtualMachineCaptureParameters"
+            },
+            "description": "Parameters supplied to the Capture Virtual Machine operation."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/VirtualMachineCaptureResult"
+            }
+          },
+          "202": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}": {
+      "put": {
+        "tags": [
+          "VirtualMachines"
+        ],
+        "operationId": "VirtualMachines_CreateOrUpdate",
+        "description": "The operation to create or update a virtual machine.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "vmName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual machine."
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/VirtualMachine"
+            },
+            "description": "Parameters supplied to the Create Virtual Machine operation."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/VirtualMachine"
+            }
+          },
+          "201": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/VirtualMachine"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      },
+      "delete": {
+        "tags": [
+          "VirtualMachines"
+        ],
+        "operationId": "VirtualMachines_Delete",
+        "description": "The operation to delete a virtual machine.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "vmName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual machine."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": ""
+          },
+          "204": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      },
+      "get": {
+        "tags": [
+          "VirtualMachines"
+        ],
+        "operationId": "VirtualMachines_Get",
+        "description": "The operation to get a virtual machine.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "vmName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual machine."
+          },
+          {
+            "name": "$expand",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "The expand expression to apply on the operation.",
+            "enum": [
+              "instanceView"
+            ],
+            "x-ms-enum": {
+              "name": "InstanceViewTypes",
+              "modelAsString": false
+            }
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/VirtualMachine"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/deallocate": {
+      "post": {
+        "tags": [
+          "VirtualMachines"
+        ],
+        "operationId": "VirtualMachines_Deallocate",
+        "description": "Shuts down the Virtual Machine and releases the compute resources. You are not billed for the compute resources that this Virtual Machine uses.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "vmName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual machine."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/generalize": {
+      "post": {
+        "tags": [
+          "VirtualMachines"
+        ],
+        "operationId": "VirtualMachines_Generalize",
+        "description": "Sets the state of the VM as Generalized.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "vmName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual machine."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": ""
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines": {
+      "get": {
+        "tags": [
+          "VirtualMachines"
+        ],
+        "operationId": "VirtualMachines_List",
+        "description": "The operation to list virtual machines under a resource group.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/VirtualMachineListResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": null
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Compute/virtualMachines": {
+      "get": {
+        "tags": [
+          "VirtualMachines"
+        ],
+        "operationId": "VirtualMachines_ListAll",
+        "description": "Gets the list of Virtual Machines in the subscription. Use nextLink property in the response to get the next page of Virtual Machines. Do this till nextLink is not null to fetch all the Virtual Machines.",
+        "parameters": [
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/VirtualMachineListResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/vmSizes": {
+      "get": {
+        "tags": [
+          "VirtualMachines"
+        ],
+        "operationId": "VirtualMachines_ListAvailableSizes",
+        "description": "Lists all available virtual machine sizes it can be resized to for a virtual machine.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "vmName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual machine."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/VirtualMachineSizeListResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": null
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/powerOff": {
+      "post": {
+        "tags": [
+          "VirtualMachines"
+        ],
+        "operationId": "VirtualMachines_PowerOff",
+        "description": "The operation to power off (stop) a virtual machine.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "vmName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual machine."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/restart": {
+      "post": {
+        "tags": [
+          "VirtualMachines"
+        ],
+        "operationId": "VirtualMachines_Restart",
+        "description": "The operation to restart a virtual machine.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "vmName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual machine."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/start": {
+      "post": {
+        "tags": [
+          "VirtualMachines"
+        ],
+        "operationId": "VirtualMachines_Start",
+        "description": "The operation to start a virtual machine.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "vmName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual machine."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/redeploy": {
+      "post": {
+        "tags": [
+          "VirtualMachines"
+        ],
+        "operationId": "VirtualMachines_Redeploy",
+        "description": "The operation to redeploy a virtual machine.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "vmName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual machine."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{name}": {
+      "put": {
+        "tags": [
+          "VirtualMachineScaleSets"
+        ],
+        "operationId": "VirtualMachineScaleSets_CreateOrUpdate",
+        "description": "Allows you to create or update a virtual machine scale set by providing parameters or a path to pre-configured parameter file.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "Parameters supplied to the Create Virtual Machine Scale Set operation."
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/VirtualMachineScaleSet"
+            },
+            "description": "Parameters supplied to the Create Virtual Machine Scale Set operation."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/VirtualMachineScaleSet"
+            }
+          },
+          "201": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/VirtualMachineScaleSet"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/deallocate": {
+      "post": {
+        "tags": [
+          "VirtualMachineScaleSets"
+        ],
+        "operationId": "VirtualMachineScaleSets_Deallocate",
+        "description": "Allows you to deallocate virtual machines in a virtual machine scale set. Shuts down the virtual machines and releases the compute resources. You are not billed for the compute resources that this virtual machine scale set uses.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "vmScaleSetName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual machine scale set."
+          },
+          {
+            "name": "vmInstanceIDs",
+            "in": "body",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VirtualMachineScaleSetVMInstanceIDs"
+            },
+            "description": "The list of virtual machine scale set instance IDs."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}": {
+      "delete": {
+        "tags": [
+          "VirtualMachineScaleSets"
+        ],
+        "operationId": "VirtualMachineScaleSets_Delete",
+        "description": "Allows you to delete a virtual machine scale set.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "vmScaleSetName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual machine scale set."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": ""
+          },
+          "202": {
+            "description": ""
+          },
+          "204": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      },
+      "get": {
+        "tags": [
+          "VirtualMachineScaleSets"
+        ],
+        "operationId": "VirtualMachineScaleSets_Get",
+        "description": "Display information about a virtual machine scale set.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "vmScaleSetName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual machine scale set."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/VirtualMachineScaleSet"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/delete": {
+      "post": {
+        "tags": [
+          "VirtualMachineScaleSets"
+        ],
+        "operationId": "VirtualMachineScaleSets_DeleteInstances",
+        "description": "Allows you to delete virtual machines in a virtual machine scale set.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "vmScaleSetName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual machine scale set."
+          },
+          {
+            "name": "vmInstanceIDs",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/VirtualMachineScaleSetVMInstanceRequiredIDs"
+            },
+            "description": "The list of virtual machine scale set instance IDs."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/instanceView": {
+      "get": {
+        "tags": [
+          "VirtualMachineScaleSets"
+        ],
+        "operationId": "VirtualMachineScaleSets_GetInstanceView",
+        "description": "Displays status of a virtual machine scale set instance.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "vmScaleSetName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual machine scale set."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/VirtualMachineScaleSetInstanceView"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets": {
+      "get": {
+        "tags": [
+          "VirtualMachineScaleSets"
+        ],
+        "operationId": "VirtualMachineScaleSets_List",
+        "description": "Lists all virtual machine scale sets under a resource group.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/VirtualMachineScaleSetListResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Compute/virtualMachineScaleSets": {
+      "get": {
+        "tags": [
+          "VirtualMachineScaleSets"
+        ],
+        "operationId": "VirtualMachineScaleSets_ListAll",
+        "description": "Lists all Virtual Machine Scale Sets in the subscription. Use nextLink property in the response to get the next page of Virtual Machine Scale Sets. Do this till nextLink is not null to fetch all the Virtual Machine Scale Sets.",
+        "parameters": [
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/VirtualMachineScaleSetListWithLinkResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/skus": {
+      "get": {
+        "tags": [
+          "VirtualMachineScaleSets"
+        ],
+        "operationId": "VirtualMachineScaleSets_ListSkus",
+        "description": "Displays available skus for your virtual machine scale set including the minimum and maximum vm instances allowed for a particular sku.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "vmScaleSetName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual machine scale set."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/VirtualMachineScaleSetListSkusResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/poweroff": {
+      "post": {
+        "tags": [
+          "VirtualMachineScaleSets"
+        ],
+        "operationId": "VirtualMachineScaleSets_PowerOff",
+        "description": "Allows you to power off (stop) virtual machines in a virtual machine scale set. Note that resources are still attached and you are getting charged for the resources. Use deallocate to release resources.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "vmScaleSetName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual machine scale set."
+          },
+          {
+            "name": "vmInstanceIDs",
+            "in": "body",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VirtualMachineScaleSetVMInstanceIDs"
+            },
+            "description": "The list of virtual machine scale set instance IDs."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/restart": {
+      "post": {
+        "tags": [
+          "VirtualMachineScaleSets"
+        ],
+        "operationId": "VirtualMachineScaleSets_Restart",
+        "description": "Allows you to restart virtual machines in a virtual machine scale set.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "vmScaleSetName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual machine scale set."
+          },
+          {
+            "name": "vmInstanceIDs",
+            "in": "body",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VirtualMachineScaleSetVMInstanceIDs"
+            },
+            "description": "The list of virtual machine scale set instance IDs."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/start": {
+      "post": {
+        "tags": [
+          "VirtualMachineScaleSets"
+        ],
+        "operationId": "VirtualMachineScaleSets_Start",
+        "description": "Allows you to start virtual machines in a virtual machine scale set.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "vmScaleSetName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual machine scale set."
+          },
+          {
+            "name": "vmInstanceIDs",
+            "in": "body",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/VirtualMachineScaleSetVMInstanceIDs"
+            },
+            "description": "The list of virtual machine scale set instance IDs."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/manualupgrade": {
+      "post": {
+        "tags": [
+          "VirtualMachineScaleSets"
+        ],
+        "operationId": "VirtualMachineScaleSets_UpdateInstances",
+        "description": "Allows you to manually upgrade virtual machines in a virtual machine scale set.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "vmScaleSetName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual machine scale set."
+          },
+          {
+            "name": "vmInstanceIDs",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/VirtualMachineScaleSetVMInstanceRequiredIDs"
+            },
+            "description": "The list of virtual machine scale set instance IDs."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/reimage": {
+      "post": {
+        "tags": [
+          "VirtualMachineScaleSets"
+        ],
+        "operationId": "VirtualMachineScaleSets_Reimage",
+        "description": "Allows you to re-image(update the version of the installed operating system) virtual machines in a virtual machine scale set.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "vmScaleSetName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual machine scale set."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/reimage": {
+      "post": {
+        "tags": [
+          "VirtualMachineScaleSetVMs"
+        ],
+        "operationId": "VirtualMachineScaleSetVMs_Reimage",
+        "description": "Allows you to re-image(update the version of the installed operating system) a virtual machine scale set instance.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "vmScaleSetName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual machine scale set."
+          },
+          {
+            "name": "instanceId",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The instance id of the virtual machine."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/deallocate": {
+      "post": {
+        "tags": [
+          "VirtualMachineScaleSetVMs"
+        ],
+        "operationId": "VirtualMachineScaleSetVMs_Deallocate",
+        "description": "Allows you to deallocate a virtual machine virtual machine scale set.Shuts down the virtual machine and releases the compute resources. You are not billed for the compute resources that this virtual machine uses.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "vmScaleSetName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual machine scale set."
+          },
+          {
+            "name": "instanceId",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The instance id of the virtual machine."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}": {
+      "delete": {
+        "tags": [
+          "VirtualMachineScaleSetVMs"
+        ],
+        "operationId": "VirtualMachineScaleSetVMs_Delete",
+        "description": "Allows you to delete a virtual machine scale set.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "vmScaleSetName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual machine scale set."
+          },
+          {
+            "name": "instanceId",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The instance id of the virtual machine."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": ""
+          },
+          "202": {
+            "description": ""
+          },
+          "204": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      },
+      "get": {
+        "tags": [
+          "VirtualMachineScaleSetVMs"
+        ],
+        "operationId": "VirtualMachineScaleSetVMs_Get",
+        "description": "Displays information about a virtual machine scale set virtual machine.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "vmScaleSetName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual machine scale set."
+          },
+          {
+            "name": "instanceId",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The instance id of the virtual machine."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/VirtualMachineScaleSetVM"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/instanceView": {
+      "get": {
+        "tags": [
+          "VirtualMachineScaleSetVMs"
+        ],
+        "operationId": "VirtualMachineScaleSetVMs_GetInstanceView",
+        "description": "Displays the status of a virtual machine scale set virtual machine.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "vmScaleSetName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual machine scale set."
+          },
+          {
+            "name": "instanceId",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The instance id of the virtual machine."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/VirtualMachineScaleSetVMInstanceView"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{virtualMachineScaleSetName}/virtualMachines": {
+      "get": {
+        "tags": [
+          "VirtualMachineScaleSetVMs"
+        ],
+        "operationId": "VirtualMachineScaleSetVMs_List",
+        "description": "Lists all virtual machines in a VM scale sets.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "virtualMachineScaleSetName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual machine scale set."
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "The filter to apply on the operation."
+          },
+          {
+            "name": "$select",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "The list parameters."
+          },
+          {
+            "name": "$expand",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "The expand expression to apply on the operation."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/VirtualMachineScaleSetVMListResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        },
+        "x-ms-odata": "#/definitions/VirtualMachineScaleSetVM"
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/poweroff": {
+      "post": {
+        "tags": [
+          "VirtualMachineScaleSetVMs"
+        ],
+        "operationId": "VirtualMachineScaleSetVMs_PowerOff",
+        "description": "Allows you to power off (stop) a virtual machine in a VM scale set.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "vmScaleSetName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual machine scale set."
+          },
+          {
+            "name": "instanceId",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The instance id of the virtual machine."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/restart": {
+      "post": {
+        "tags": [
+          "VirtualMachineScaleSetVMs"
+        ],
+        "operationId": "VirtualMachineScaleSetVMs_Restart",
+        "description": "Allows you to restart a virtual machine in a VM scale set.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "vmScaleSetName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual machine scale set."
+          },
+          {
+            "name": "instanceId",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The instance id of the virtual machine."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/start": {
+      "post": {
+        "tags": [
+          "VirtualMachineScaleSetVMs"
+        ],
+        "operationId": "VirtualMachineScaleSetVMs_Start",
+        "description": "Allows you to start a virtual machine in a VM scale set.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "vmScaleSetName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual machine scale set."
+          },
+          {
+            "name": "instanceId",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The instance id of the virtual machine."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    }
+  },
+  "definitions": {
+    "InstanceViewStatus": {
+      "properties": {
+        "code": {
+          "type": "string",
+          "description": "Gets the status Code."
+        },
+        "level": {
+          "type": "string",
+          "description": "Gets or sets the level Code.",
+          "enum": [
+            "Info",
+            "Warning",
+            "Error"
+          ],
+          "x-ms-enum": {
+            "name": "StatusLevelTypes",
+            "modelAsString": false
+          }
+        },
+        "displayStatus": {
+          "type": "string",
+          "description": "Gets or sets the short localizable label for the status."
+        },
+        "message": {
+          "type": "string",
+          "description": "Gets or sets the detailed Message, including for alerts and error messages."
+        },
+        "time": {
+          "type": "string",
+          "format": "date-time",
+          "description": "Gets or sets the time of the status."
+        }
+      },
+      "description": "Instance view status."
+    },
+    "AvailabilitySetProperties": {
+      "properties": {
+        "platformUpdateDomainCount": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or sets Update Domain count."
+        },
+        "platformFaultDomainCount": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or sets Fault Domain count."
+        },
+        "virtualMachines": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/SubResource"
+          },
+          "description": "Gets or sets a list containing reference to all Virtual Machines created under this Availability Set."
+        },
+        "statuses": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/InstanceViewStatus"
+          },
+          "description": "Gets or sets the resource status information."
+        }
+      },
+      "description": "The instance view of a resource."
+    },
+    "AvailabilitySet": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/AvailabilitySetProperties"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "description": "Create or update Availability Set parameters."
+    },
+    "AvailabilitySetListResult": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/AvailabilitySet"
+          },
+          "description": "Gets or sets the list of availability sets"
+        }
+      },
+      "description": "The List Availability Set operation response."
+    },
+    "VirtualMachineSize": {
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Gets or sets the VM size name."
+        },
+        "numberOfCores": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or sets the Number of cores supported by a VM size."
+        },
+        "osDiskSizeInMB": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or sets the OS disk size allowed by a VM size."
+        },
+        "resourceDiskSizeInMB": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or sets the Resource disk size allowed by a VM size."
+        },
+        "memoryInMB": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or sets the Memory size supported by a VM size."
+        },
+        "maxDataDiskCount": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or sets the Maximum number of data disks allowed by a VM size."
+        }
+      },
+      "description": "Describes the properties of a VM size."
+    },
+    "VirtualMachineSizeListResult": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/VirtualMachineSize"
+          },
+          "description": "Gets or sets the list of virtual machine sizes."
+        }
+      },
+      "description": "The List Virtual Machine operation response."
+    },
+    "VirtualMachineExtensionImageProperties": {
+      "properties": {
+        "operatingSystem": {
+          "type": "string",
+          "description": "Gets or sets the operating system this extension supports."
+        },
+        "computeRole": {
+          "type": "string",
+          "description": "Gets or sets the type of role (IaaS or PaaS) this extension supports."
+        },
+        "handlerSchema": {
+          "type": "string",
+          "description": "Gets or sets the schema defined by publisher, where extension consumers should provide settings in a matching schema."
+        },
+        "vmScaleSetEnabled": {
+          "type": "boolean",
+          "description": "Gets or sets whether the extension can be used on xRP VMScaleSets.By default existing extensions are usable on scalesets, but there might be cases where a publisher wants to explicitly indicate the extension is only enabled for CRP VMs but not VMSS."
+        },
+        "supportsMultipleExtensions": {
+          "type": "boolean",
+          "description": "Gets or sets whether the handler can support multiple extensions."
+        }
+      },
+      "required": [
+        "operatingSystem",
+        "computeRole",
+        "handlerSchema"
+      ],
+      "description": "Describes the properties of a Virtual Machine Extension Image."
+    },
+    "VirtualMachineExtensionImage": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/VirtualMachineExtensionImageProperties"
+        }
+      },
+      "required": [
+        "name",
+        "location"
+      ],
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "description": "Describes a Virtual Machine Extension Image."
+    },
+    "VirtualMachineImageResource": {
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Gets or sets the name of the resource."
+        },
+        "location": {
+          "type": "string",
+          "description": "Gets or sets the location of the resource."
+        },
+        "tags": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "description": "Gets or sets the tags attached to the resource."
+        }
+      },
+      "required": [
+        "name",
+        "location"
+      ],
+      "allOf": [
+        {
+          "$ref": "#/definitions/SubResource"
+        }
+      ],
+      "description": "Virtual machine image resource information."
+    },
+    "VirtualMachineExtensionInstanceView": {
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Gets or sets the virtual machine extension name."
+        },
+        "type": {
+          "type": "string",
+          "description": "Gets or sets the full type of the extension handler which includes both publisher and type."
+        },
+        "typeHandlerVersion": {
+          "type": "string",
+          "description": "Gets or sets the type version of the extension handler."
+        },
+        "substatuses": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/InstanceViewStatus"
+          },
+          "description": "Gets or sets the resource status information."
+        },
+        "statuses": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/InstanceViewStatus"
+          },
+          "description": "Gets or sets the resource status information."
+        }
+      },
+      "description": "The instance view of a virtual machine extension."
+    },
+    "VirtualMachineExtensionProperties": {
+      "properties": {
+        "forceUpdateTag": {
+          "type": "string",
+          "description": "Gets or sets how the extension handler should be forced to update even if the extension configuration has not changed."
+        },
+        "publisher": {
+          "type": "string",
+          "description": "Gets or sets the name of the extension handler publisher."
+        },
+        "type": {
+          "type": "string",
+          "description": "Gets or sets the type of the extension handler."
+        },
+        "typeHandlerVersion": {
+          "type": "string",
+          "description": "Gets or sets the type version of the extension handler."
+        },
+        "autoUpgradeMinorVersion": {
+          "type": "boolean",
+          "description": "Gets or sets whether the extension handler should be automatically upgraded across minor versions."
+        },
+        "settings": {
+          "type": "object",
+          "description": "Gets or sets Json formatted public settings for the extension."
+        },
+        "protectedSettings": {
+          "type": "object",
+          "description": "Gets or sets Json formatted protected settings for the extension."
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets the provisioning state, which only appears in the response."
+        },
+        "instanceView": {
+          "$ref": "#/definitions/VirtualMachineExtensionInstanceView",
+          "description": "Gets or sets the virtual machine extension instance view."
+        }
+      },
+      "description": "Describes the properties of a Virtual Machine Extension."
+    },
+    "VirtualMachineExtension": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/VirtualMachineExtensionProperties"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "description": "Describes a Virtual Machine Extension."
+    },
+    "PurchasePlan": {
+      "properties": {
+        "publisher": {
+          "type": "string",
+          "description": "Gets or sets the publisher ID."
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets or sets the plan ID."
+        },
+        "product": {
+          "type": "string",
+          "description": "Gets or sets the product ID."
+        }
+      },
+      "required": [
+        "publisher",
+        "name",
+        "product"
+      ],
+      "description": "Used for establishing the purchase context of any 3rd Party artifact through MarketPlace."
+    },
+    "OSDiskImage": {
+      "properties": {
+        "operatingSystem": {
+          "type": "string",
+          "description": "Gets or sets the operating system of the osDiskImage.",
+          "enum": [
+            "Windows",
+            "Linux"
+          ],
+          "x-ms-enum": {
+            "name": "OperatingSystemTypes",
+            "modelAsString": false
+          }
+        }
+      },
+      "required": [
+        "operatingSystem"
+      ],
+      "description": "Contains the os disk image information."
+    },
+    "DataDiskImage": {
+      "properties": {
+        "lun": {
+          "readOnly": true,
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets the LUN number for a data disk.This value is used to identify data disk image inside the VMImage therefore it must be unique for each data disk.The allowed character for the value is digit."
+        }
+      },
+      "description": "Contains the data disk images information."
+    },
+    "VirtualMachineImageProperties": {
+      "properties": {
+        "plan": {
+          "$ref": "#/definitions/PurchasePlan"
+        },
+        "osDiskImage": {
+          "$ref": "#/definitions/OSDiskImage"
+        },
+        "dataDiskImages": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/DataDiskImage"
+          }
+        }
+      },
+      "description": "Describes the properties of a Virtual Machine Image."
+    },
+    "VirtualMachineImage": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/VirtualMachineImageProperties"
+        }
+      },
+      "required": [
+        "name",
+        "location"
+      ],
+      "allOf": [
+        {
+          "$ref": "#/definitions/VirtualMachineImageResource"
+        }
+      ],
+      "description": "Describes a Virtual Machine Image."
+    },
+    "UsageName": {
+      "properties": {
+        "value": {
+          "type": "string",
+          "description": "Gets or sets a string describing the resource name."
+        },
+        "localizedValue": {
+          "type": "string",
+          "description": "Gets or sets a localized string describing the resource name."
+        }
+      },
+      "description": "The Usage Names."
+    },
+    "Usage": {
+      "properties": {
+        "unit": {
+          "type": "string",
+          "description": "Gets or sets an enum describing the unit of measurement.",
+          "enum": [
+            "Count"
+          ],
+          "x-ms-enum": {
+            "name": "UsageUnit",
+            "modelAsString": false
+          }
+        },
+        "currentValue": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or sets the current value of the usage."
+        },
+        "limit": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Gets or sets the limit of usage."
+        },
+        "name": {
+          "$ref": "#/definitions/UsageName",
+          "description": "Gets or sets the name of the type of usage."
+        }
+      },
+      "required": [
+        "unit",
+        "currentValue",
+        "limit",
+        "name"
+      ],
+      "description": "Describes Compute Resource Usage."
+    },
+    "ListUsagesResult": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Usage"
+          },
+          "description": "Gets or sets the list Compute Resource Usages."
+        }
+      },
+      "description": "The List Usages operation response."
+    },
+    "VirtualMachineCaptureParameters": {
+      "properties": {
+        "vhdPrefix": {
+          "type": "string",
+          "description": "Gets or sets the captured VirtualHardDisk's name prefix."
+        },
+        "destinationContainerName": {
+          "type": "string",
+          "description": "Gets or sets the destination container name."
+        },
+        "overwriteVhds": {
+          "type": "boolean",
+          "description": "Gets or sets whether it overwrites destination VirtualHardDisk if true, in case of conflict."
+        }
+      },
+      "required": [
+        "vhdPrefix",
+        "destinationContainerName",
+        "overwriteVhds"
+      ],
+      "description": "Capture Virtual Machine parameters."
+    },
+    "VirtualMachineCaptureResultProperties": {
+      "properties": {
+        "output": {
+          "type": "object",
+          "description": "Operation output data (raw JSON)"
+        }
+      },
+      "description": "Compute-specific operation properties, including output"
+    },
+    "VirtualMachineCaptureResult": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/VirtualMachineCaptureResultProperties"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/SubResource"
+        }
+      ],
+      "description": "Resource Id."
+    },
+    "Plan": {
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Gets or sets the plan ID."
+        },
+        "publisher": {
+          "type": "string",
+          "description": "Gets or sets the publisher ID."
+        },
+        "product": {
+          "type": "string",
+          "description": "Gets or sets the offer ID."
+        },
+        "promotionCode": {
+          "type": "string",
+          "description": "Gets or sets the promotion code."
+        }
+      },
+      "description": "Plan for the resource."
+    },
+    "HardwareProfile": {
+      "properties": {
+        "vmSize": {
+          "type": "string",
+          "description": "The virtual machine size name.",
+          "enum": [
+            "Basic_A0",
+            "Basic_A1",
+            "Basic_A2",
+            "Basic_A3",
+            "Basic_A4",
+            "Standard_A0",
+            "Standard_A1",
+            "Standard_A2",
+            "Standard_A3",
+            "Standard_A4",
+            "Standard_A5",
+            "Standard_A6",
+            "Standard_A7",
+            "Standard_A8",
+            "Standard_A9",
+            "Standard_A10",
+            "Standard_A11",
+            "Standard_D1",
+            "Standard_D2",
+            "Standard_D3",
+            "Standard_D4",
+            "Standard_D11",
+            "Standard_D12",
+            "Standard_D13",
+            "Standard_D14",
+            "Standard_D1_v2",
+            "Standard_D2_v2",
+            "Standard_D3_v2",
+            "Standard_D4_v2",
+            "Standard_D5_v2",
+            "Standard_D11_v2",
+            "Standard_D12_v2",
+            "Standard_D13_v2",
+            "Standard_D14_v2",
+            "Standard_D15_v2",
+            "Standard_DS1",
+            "Standard_DS2",
+            "Standard_DS3",
+            "Standard_DS4",
+            "Standard_DS11",
+            "Standard_DS12",
+            "Standard_DS13",
+            "Standard_DS14",
+            "Standard_DS1_v2",
+            "Standard_DS2_v2",
+            "Standard_DS3_v2",
+            "Standard_DS4_v2",
+            "Standard_DS5_v2",
+            "Standard_DS11_v2",
+            "Standard_DS12_v2",
+            "Standard_DS13_v2",
+            "Standard_DS14_v2",
+            "Standard_DS15_v2",
+            "Standard_G1",
+            "Standard_G2",
+            "Standard_G3",
+            "Standard_G4",
+            "Standard_G5",
+            "Standard_GS1",
+            "Standard_GS2",
+            "Standard_GS3",
+            "Standard_GS4",
+            "Standard_GS5"
+          ],
+          "x-ms-enum": {
+            "name": "VirtualMachineSizeTypes",
+            "modelAsString": true
+          }
+        }
+      },
+      "description": "Describes a hardware profile."
+    },
+    "ImageReference": {
+      "properties": {
+        "publisher": {
+          "type": "string",
+          "description": "Gets or sets the image publisher."
+        },
+        "offer": {
+          "type": "string",
+          "description": "Gets or sets the image offer."
+        },
+        "sku": {
+          "type": "string",
+          "description": "Gets or sets the image sku."
+        },
+        "version": {
+          "type": "string",
+          "description": "Gets or sets the image version. The allowed formats are Major.Minor.Build or 'latest'. Major, Minor and Build being decimal numbers. Specify 'latest' to use the latest version of image."
+        }
+      },
+      "description": "The image reference."
+    },
+    "KeyVaultSecretReference": {
+      "properties": {
+        "secretUrl": {
+          "type": "string",
+          "description": "Gets or sets the URL referencing a secret in a Key Vault."
+        },
+        "sourceVault": {
+          "$ref": "#/definitions/SubResource",
+          "description": "Gets or sets the Relative URL of the Key Vault containing the secret."
+        }
+      },
+      "required": [
+        "secretUrl",
+        "sourceVault"
+      ],
+      "description": "Describes a reference to Key Vault Secret"
+    },
+    "KeyVaultKeyReference": {
+      "properties": {
+        "keyUrl": {
+          "type": "string",
+          "description": "Gets or sets the URL referencing a key in a Key Vault."
+        },
+        "sourceVault": {
+          "$ref": "#/definitions/SubResource",
+          "description": "Gets or sets the Relative URL of the Key Vault containing the key"
+        }
+      },
+      "required": [
+        "keyUrl",
+        "sourceVault"
+      ],
+      "description": "Describes a reference to Key Vault Key"
+    },
+    "DiskEncryptionSettings": {
+      "properties": {
+        "diskEncryptionKey": {
+          "$ref": "#/definitions/KeyVaultSecretReference",
+          "description": "Gets or sets the disk encryption key which is a KeyVault Secret."
+        },
+        "keyEncryptionKey": {
+          "$ref": "#/definitions/KeyVaultKeyReference",
+          "description": "Gets or sets the key encryption key which is KeyVault Key."
+        },
+        "enabled": {
+          "type": "boolean",
+          "description": "Gets or sets whether disk encryption should be enabled on the Virtual Machine."
+        }
+      },
+      "description": "Describes a Encryption Settings for a Disk"
+    },
+    "VirtualHardDisk": {
+      "properties": {
+        "uri": {
+          "type": "string",
+          "description": "Gets or sets the virtual hard disk's uri. It should be a valid Uri to a virtual hard disk."
+        }
+      },
+      "description": "Describes the uri of a disk."
+    },
+    "OSDisk": {
+      "properties": {
+        "osType": {
+          "type": "string",
+          "description": "Gets or sets the Operating System type.",
+          "enum": [
+            "Windows",
+            "Linux"
+          ],
+          "x-ms-enum": {
+            "name": "OperatingSystemTypes",
+            "modelAsString": false
+          }
+        },
+        "encryptionSettings": {
+          "$ref": "#/definitions/DiskEncryptionSettings",
+          "description": "Gets or sets the disk encryption settings."
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets or sets the disk name."
+        },
+        "vhd": {
+          "$ref": "#/definitions/VirtualHardDisk",
+          "description": "Gets or sets the Virtual Hard Disk."
+        },
+        "image": {
+          "$ref": "#/definitions/VirtualHardDisk",
+          "description": "Gets or sets the Source User Image VirtualHardDisk. This VirtualHardDisk will be copied before using it to attach to the Virtual Machine.If SourceImage is provided, the destination VirtualHardDisk should not exist."
+        },
+        "caching": {
+          "type": "string",
+          "description": "Gets or sets the caching type.",
+          "enum": [
+            "None",
+            "ReadOnly",
+            "ReadWrite"
+          ],
+          "x-ms-enum": {
+            "name": "CachingTypes",
+            "modelAsString": false
+          }
+        },
+        "createOption": {
+          "type": "string",
+          "description": "Gets or sets the create option.",
+          "enum": [
+            "fromImage",
+            "empty",
+            "attach"
+          ],
+          "x-ms-enum": {
+            "name": "DiskCreateOptionTypes",
+            "modelAsString": false
+          }
+        },
+        "diskSizeGB": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or sets the initial disk size in GB for blank data disks, and the new desired size for existing OS and Data disks."
+        }
+      },
+      "required": [
+        "name",
+        "vhd",
+        "createOption"
+      ],
+      "description": "Describes an Operating System disk."
+    },
+    "DataDisk": {
+      "properties": {
+        "lun": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or sets the logical unit number."
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets or sets the disk name."
+        },
+        "vhd": {
+          "$ref": "#/definitions/VirtualHardDisk",
+          "description": "Gets or sets the Virtual Hard Disk."
+        },
+        "image": {
+          "$ref": "#/definitions/VirtualHardDisk",
+          "description": "Gets or sets the Source User Image VirtualHardDisk. This VirtualHardDisk will be copied before using it to attach to the Virtual Machine.If SourceImage is provided, the destination VirtualHardDisk should not exist."
+        },
+        "caching": {
+          "type": "string",
+          "description": "Gets or sets the caching type.",
+          "enum": [
+            "None",
+            "ReadOnly",
+            "ReadWrite"
+          ],
+          "x-ms-enum": {
+            "name": "CachingTypes",
+            "modelAsString": false
+          }
+        },
+        "createOption": {
+          "type": "string",
+          "description": "Gets or sets the create option.",
+          "enum": [
+            "fromImage",
+            "empty",
+            "attach"
+          ],
+          "x-ms-enum": {
+            "name": "DiskCreateOptionTypes",
+            "modelAsString": false
+          }
+        },
+        "diskSizeGB": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or sets the initial disk size in GB for blank data disks, and the new desired size for existing OS and Data disks."
+        }
+      },
+      "required": [
+        "lun",
+        "name",
+        "vhd",
+        "createOption"
+      ],
+      "description": "Describes a data disk."
+    },
+    "StorageProfile": {
+      "properties": {
+        "imageReference": {
+          "$ref": "#/definitions/ImageReference",
+          "description": "Gets or sets the image reference."
+        },
+        "osDisk": {
+          "$ref": "#/definitions/OSDisk",
+          "description": "Gets or sets the OS disk."
+        },
+        "dataDisks": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/DataDisk"
+          },
+          "description": "Gets or sets the data disks."
+        }
+      },
+      "description": "Describes a storage profile."
+    },
+    "AdditionalUnattendContent": {
+      "properties": {
+        "passName": {
+          "type": "string",
+          "description": "Gets or sets the pass name. Currently, the only allowable value is oobeSystem.",
+          "enum": [
+            "oobeSystem"
+          ],
+          "x-ms-enum": {
+            "name": "PassNames",
+            "modelAsString": false
+          }
+        },
+        "componentName": {
+          "type": "string",
+          "description": "Gets or sets the component name. Currently, the only allowable value is Microsoft-Windows-Shell-Setup.",
+          "enum": [
+            "Microsoft-Windows-Shell-Setup"
+          ],
+          "x-ms-enum": {
+            "name": "ComponentNames",
+            "modelAsString": false
+          }
+        },
+        "settingName": {
+          "type": "string",
+          "description": "Gets or sets setting name (e.g. FirstLogonCommands, AutoLogon )",
+          "enum": [
+            "AutoLogon",
+            "FirstLogonCommands"
+          ],
+          "x-ms-enum": {
+            "name": "SettingNames",
+            "modelAsString": false
+          }
+        },
+        "content": {
+          "type": "string",
+          "description": "Gets or sets XML formatted content that is added to the unattend.xml file in the specified pass and component.The XML must be less than 4 KB and must include the root element for the setting or feature that is being inserted."
+        }
+      },
+      "description": "Gets or sets additional XML formatted information that can be included in the Unattend.xml file, which is used by Windows Setup. Contents are defined by setting name, component name, and the pass in which the content is a applied."
+    },
+    "WinRMListener": {
+      "properties": {
+        "protocol": {
+          "type": "string",
+          "description": "Gets or sets the Protocol used by WinRM listener. Currently only Http and Https are supported.",
+          "enum": [
+            "Http",
+            "Https"
+          ],
+          "x-ms-enum": {
+            "name": "ProtocolTypes",
+            "modelAsString": false
+          }
+        },
+        "certificateUrl": {
+          "type": "string",
+          "description": "Gets or sets the Certificate URL in KMS for Https listeners. Should be null for Http listeners."
+        }
+      },
+      "description": "Describes Protocol and thumbprint of Windows Remote Management listener"
+    },
+    "WinRMConfiguration": {
+      "properties": {
+        "listeners": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/WinRMListener"
+          },
+          "description": "Gets or sets the list of Windows Remote Management listeners"
+        }
+      },
+      "description": "Describes Windows Remote Management configuration of the VM"
+    },
+    "WindowsConfiguration": {
+      "properties": {
+        "provisionVMAgent": {
+          "type": "boolean",
+          "description": "Gets or sets whether VM Agent should be provisioned on the Virtual Machine."
+        },
+        "enableAutomaticUpdates": {
+          "type": "boolean",
+          "description": "Gets or sets whether Windows updates are automatically installed on the VM"
+        },
+        "timeZone": {
+          "type": "string",
+          "description": "Gets or sets the Time Zone of the VM"
+        },
+        "additionalUnattendContent": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/AdditionalUnattendContent"
+          },
+          "description": "Gets or sets the additional base-64 encoded XML formatted information that can be included in the Unattend.xml file."
+        },
+        "winRM": {
+          "$ref": "#/definitions/WinRMConfiguration",
+          "description": "Gets or sets the Windows Remote Management configuration of the VM"
+        }
+      },
+      "description": "Describes Windows Configuration of the OS Profile."
+    },
+    "SshPublicKey": {
+      "properties": {
+        "path": {
+          "type": "string",
+          "description": "Gets or sets the full path on the created VM where SSH public key is stored. If the file already exists, the specified key is appended to the file."
+        },
+        "keyData": {
+          "type": "string",
+          "description": "Gets or sets Certificate public key used to authenticate with VM through SSH.The certificate must be in Pem format with or without headers."
+        }
+      },
+      "description": "Contains information about SSH certificate public key and the path on the Linux VM where the public key is placed."
+    },
+    "SshConfiguration": {
+      "properties": {
+        "publicKeys": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/SshPublicKey"
+          },
+          "description": "Gets or sets the list of SSH public keys used to authenticate with linux based VMs"
+        }
+      },
+      "description": "SSH configuration for Linux based VMs running on Azure"
+    },
+    "LinuxConfiguration": {
+      "properties": {
+        "disablePasswordAuthentication": {
+          "type": "boolean",
+          "description": "Gets or sets whether Authentication using user name and password is allowed or not"
+        },
+        "ssh": {
+          "$ref": "#/definitions/SshConfiguration",
+          "description": "Gets or sets the SSH configuration for linux VMs"
+        }
+      },
+      "description": "Describes Windows Configuration of the OS Profile."
+    },
+    "VaultCertificate": {
+      "properties": {
+        "certificateUrl": {
+          "type": "string",
+          "description": "Gets or sets the URL referencing a secret in a Key Vault which contains a properly formatted certificate."
+        },
+        "certificateStore": {
+          "type": "string",
+          "description": "Gets or sets the Certificate store in LocalMachine to add the certificate to on Windows, leave empty on Linux."
+        }
+      },
+      "description": "Describes a single certificate reference in a Key Vault, and where the certificate should reside on the VM."
+    },
+    "VaultSecretGroup": {
+      "properties": {
+        "sourceVault": {
+          "$ref": "#/definitions/SubResource",
+          "description": "Gets or sets the Relative URL of the Key Vault containing all of the certificates in VaultCertificates."
+        },
+        "vaultCertificates": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/VaultCertificate"
+          },
+          "description": "Gets or sets the list of key vault references in SourceVault which contain certificates"
+        }
+      },
+      "description": "Describes a set of certificates which are all in the same Key Vault."
+    },
+    "OSProfile": {
+      "properties": {
+        "computerName": {
+          "type": "string",
+          "description": "Gets or sets the computer name."
+        },
+        "adminUsername": {
+          "type": "string",
+          "description": "Gets or sets the admin user name."
+        },
+        "adminPassword": {
+          "type": "string",
+          "description": "Gets or sets the admin user password."
+        },
+        "customData": {
+          "type": "string",
+          "description": "Gets or sets a base-64 encoded string of custom data."
+        },
+        "windowsConfiguration": {
+          "$ref": "#/definitions/WindowsConfiguration",
+          "description": "Gets or sets the Windows Configuration of the OS profile."
+        },
+        "linuxConfiguration": {
+          "$ref": "#/definitions/LinuxConfiguration",
+          "description": "Gets or sets the Linux Configuration of the OS profile."
+        },
+        "secrets": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/VaultSecretGroup"
+          },
+          "description": "Gets or sets the List of certificates for addition to the VM."
+        }
+      },
+      "description": "Describes an OS profile."
+    },
+    "NetworkInterfaceReferenceProperties": {
+      "properties": {
+        "primary": {
+          "type": "boolean",
+          "description": "Gets or sets whether this is a primary NIC on a virtual machine"
+        }
+      },
+      "description": "Describes a network interface reference properties."
+    },
+    "NetworkInterfaceReference": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/NetworkInterfaceReferenceProperties"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/SubResource"
+        }
+      ],
+      "description": "Describes a network interface reference."
+    },
+    "NetworkProfile": {
+      "properties": {
+        "networkInterfaces": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/NetworkInterfaceReference"
+          },
+          "description": "Gets or sets the network interfaces."
+        }
+      },
+      "description": "Describes a network profile."
+    },
+    "BootDiagnostics": {
+      "properties": {
+        "enabled": {
+          "type": "boolean",
+          "description": "Gets or sets whether boot diagnostics should be enabled on the Virtual Machine."
+        },
+        "storageUri": {
+          "type": "string",
+          "description": "Gets or sets the boot diagnostics storage Uri. It should be a valid Uri"
+        }
+      },
+      "description": "Describes Boot Diagnostics."
+    },
+    "DiagnosticsProfile": {
+      "properties": {
+        "bootDiagnostics": {
+          "$ref": "#/definitions/BootDiagnostics",
+          "description": "Gets or sets the boot diagnostics."
+        }
+      },
+      "description": "Describes a diagnostics profile."
+    },
+    "VirtualMachineExtensionHandlerInstanceView": {
+      "properties": {
+        "type": {
+          "type": "string",
+          "description": "Gets or sets full type of the extension handler which includes both publisher and type."
+        },
+        "typeHandlerVersion": {
+          "type": "string",
+          "description": "Gets or sets the type version of the extension handler."
+        },
+        "status": {
+          "$ref": "#/definitions/InstanceViewStatus",
+          "description": "Gets or sets the extension handler status."
+        }
+      },
+      "description": "The instance view of a virtual machine extension handler."
+    },
+    "VirtualMachineAgentInstanceView": {
+      "properties": {
+        "vmAgentVersion": {
+          "type": "string",
+          "description": "Gets or sets the VM Agent full version."
+        },
+        "extensionHandlers": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/VirtualMachineExtensionHandlerInstanceView"
+          },
+          "description": "Gets or sets the virtual machine extension handler instance view."
+        },
+        "statuses": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/InstanceViewStatus"
+          },
+          "description": "Gets or sets the resource status information."
+        }
+      },
+      "description": "The instance view of the VM Agent running on the virtual machine."
+    },
+    "DiskInstanceView": {
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Gets or sets the disk name."
+        },
+        "statuses": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/InstanceViewStatus"
+          },
+          "description": "Gets or sets the resource status information."
+        }
+      },
+      "description": "The instance view of the disk."
+    },
+    "BootDiagnosticsInstanceView": {
+      "properties": {
+        "consoleScreenshotBlobUri": {
+          "type": "string",
+          "description": "Gets or sets the console screenshot blob Uri."
+        },
+        "serialConsoleLogBlobUri": {
+          "type": "string",
+          "description": "Gets or sets the Linux serial console log blob Uri."
+        }
+      },
+      "description": "The instance view of a virtual machine boot diagnostics."
+    },
+    "VirtualMachineInstanceView": {
+      "properties": {
+        "platformUpdateDomain": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or sets the Update Domain count."
+        },
+        "platformFaultDomain": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or sets the Fault Domain count."
+        },
+        "rdpThumbPrint": {
+          "type": "string",
+          "description": "Gets or sets the Remote desktop certificate thumbprint."
+        },
+        "vmAgent": {
+          "$ref": "#/definitions/VirtualMachineAgentInstanceView",
+          "description": "Gets or sets the VM Agent running on the virtual machine."
+        },
+        "disks": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/DiskInstanceView"
+          },
+          "description": "Gets or sets the disks information."
+        },
+        "extensions": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/VirtualMachineExtensionInstanceView"
+          },
+          "description": "Gets or sets the extensions information."
+        },
+        "bootDiagnostics": {
+          "$ref": "#/definitions/BootDiagnosticsInstanceView",
+          "description": "Gets or sets the boot diagnostics."
+        },
+        "statuses": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/InstanceViewStatus"
+          },
+          "description": "Gets or sets the resource status information."
+        }
+      },
+      "description": "The instance view of a virtual machine."
+    },
+    "VirtualMachineProperties": {
+      "properties": {
+        "hardwareProfile": {
+          "$ref": "#/definitions/HardwareProfile",
+          "description": "Gets or sets the hardware profile."
+        },
+        "storageProfile": {
+          "$ref": "#/definitions/StorageProfile",
+          "description": "Gets or sets the storage profile."
+        },
+        "osProfile": {
+          "$ref": "#/definitions/OSProfile",
+          "description": "Gets or sets the OS profile."
+        },
+        "networkProfile": {
+          "$ref": "#/definitions/NetworkProfile",
+          "description": "Gets or sets the network profile."
+        },
+        "diagnosticsProfile": {
+          "$ref": "#/definitions/DiagnosticsProfile",
+          "description": "Gets or sets the diagnostics profile."
+        },
+        "availabilitySet": {
+          "$ref": "#/definitions/SubResource",
+          "description": "Gets or sets the reference Id of the availability set to which this virtual machine belongs."
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets the provisioning state, which only appears in the response."
+        },
+        "instanceView": {
+          "$ref": "#/definitions/VirtualMachineInstanceView",
+          "readOnly": true,
+          "description": "Gets the virtual machine instance view."
+        },
+        "licenseType": {
+          "type": "string",
+          "description": "Gets or sets the license type, which is for bring your own license scenario."
+        },
+        "vmId": {
+          "type": "string",
+          "description": "Gets the virtual machine unique id."  
+        }
+      },
+      "description": "Describes the properties of a Virtual Machine."
+    },
+    "VirtualMachine": {
+      "properties": {
+        "plan": {
+          "$ref": "#/definitions/Plan",
+          "description": "Gets or sets the purchase plan when deploying virtual machine from VM Marketplace images."
+        },
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/VirtualMachineProperties"
+        },
+        "resources": {
+          "readOnly": true,
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/VirtualMachineExtension"
+          },
+          "description": "Gets the virtual machine child extension resources."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "description": "Describes a Virtual Machine."
+    },
+    "VirtualMachineListResult": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/VirtualMachine"
+          },
+          "description": "Gets or sets the list of virtual machines."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Gets or sets the uri to fetch the next page of VMs. Call ListNext() with this to fetch the next page of Virtual Machines."
+        }
+      },
+      "description": "The List Virtual Machine operation response."
+    },
+    "Sku": {
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Gets or sets the sku name."
+        },
+        "tier": {
+          "type": "string",
+          "description": "Gets or sets the sku tier."
+        },
+        "capacity": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Gets or sets the sku capacity."
+        }
+      },
+      "description": "Describes a virtual machine scale set sku."
+    },
+    "UpgradePolicy": {
+      "properties": {
+        "mode": {
+          "type": "string",
+          "description": "Gets or sets the upgrade mode.",
+          "enum": [
+            "Automatic",
+            "Manual"
+          ],
+          "x-ms-enum": {
+            "name": "UpgradeMode",
+            "modelAsString": false
+          }
+        }
+      },
+      "description": "Describes an upgrade policy - automatic or manual."
+    },
+    "VirtualMachineScaleSetOSProfile": {
+      "properties": {
+        "computerNamePrefix": {
+          "type": "string",
+          "description": "Gets or sets the computer name prefix."
+        },
+        "adminUsername": {
+          "type": "string",
+          "description": "Gets or sets the admin user name."
+        },
+        "adminPassword": {
+          "type": "string",
+          "description": "Gets or sets the admin user password."
+        },
+        "customData": {
+          "type": "string",
+          "description": "Gets or sets a base-64 encoded string of custom data."
+        },
+        "windowsConfiguration": {
+          "$ref": "#/definitions/WindowsConfiguration",
+          "description": "Gets or sets the Windows Configuration of the OS profile."
+        },
+        "linuxConfiguration": {
+          "$ref": "#/definitions/LinuxConfiguration",
+          "description": "Gets or sets the Linux Configuration of the OS profile."
+        },
+        "secrets": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/VaultSecretGroup"
+          },
+          "description": "Gets or sets the List of certificates for addition to the VM."
+        }
+      },
+      "description": "Describes a virtual machine scale set OS profile."
+    },
+    "VirtualMachineScaleSetOSDisk": {
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Gets or sets the disk name."
+        },
+        "caching": {
+          "type": "string",
+          "description": "Gets or sets the caching type.",
+          "enum": [
+            "None",
+            "ReadOnly",
+            "ReadWrite"
+          ],
+          "x-ms-enum": {
+            "name": "CachingTypes",
+            "modelAsString": false
+          }
+        },
+        "createOption": {
+          "type": "string",
+          "description": "Gets or sets the create option.",
+          "enum": [
+            "fromImage",
+            "empty",
+            "attach"
+          ],
+          "x-ms-enum": {
+            "name": "DiskCreateOptionTypes",
+            "modelAsString": false
+          }
+        },
+        "osType": {
+          "type": "string",
+          "description": "Gets or sets the Operating System type.",
+          "enum": [
+            "Windows",
+            "Linux"
+          ],
+          "x-ms-enum": {
+            "name": "OperatingSystemTypes",
+            "modelAsString": false
+          }
+        },
+        "image": {
+          "$ref": "#/definitions/VirtualHardDisk",
+          "description": "Gets or sets the Source User Image VirtualHardDisk. This VirtualHardDisk will be copied before using it to attach to the Virtual Machine.If SourceImage is provided, the destination VirtualHardDisk should not exist."
+        },
+        "vhdContainers": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "Gets or sets the list of virtual hard disk container uris."
+        }
+      },
+      "required": [
+        "name",
+        "createOption"
+      ],
+      "description": "Describes a virtual machine scale set operating system disk."
+    },
+    "VirtualMachineScaleSetStorageProfile": {
+      "properties": {
+        "imageReference": {
+          "$ref": "#/definitions/ImageReference",
+          "description": "Gets or sets the image reference."
+        },
+        "osDisk": {
+          "$ref": "#/definitions/VirtualMachineScaleSetOSDisk",
+          "description": "Gets or sets the OS disk."
+        }
+      },
+      "description": "Describes a virtual machine scale set storage profile."
+    },
+    "ApiEntityReference": {
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Gets or sets the ARM resource id in the form of /subscriptions/{SubcriptionId}/resourceGroups/{ResourceGroupName}/..."
+        }
+      },
+      "description": "The API entity reference."
+    },
+    "VirtualMachineScaleSetIPConfigurationProperties": {
+      "properties": {
+        "subnet": {
+          "$ref": "#/definitions/ApiEntityReference",
+          "description": "Gets or sets the subnet."
+        },
+        "applicationGatewayBackendAddressPools": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/SubResource"
+          },
+          "description": "Gets or sets the application gateway backend address pools."
+        },        
+        "loadBalancerBackendAddressPools": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/SubResource"
+          },
+          "description": "Gets or sets the load balancer backend address pools."
+        },
+        "loadBalancerInboundNatPools": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/SubResource"
+          },
+          "description": "Gets or sets the load balancer inbound nat pools."
+        }
+      },
+      "required": [
+        "subnet"
+      ],
+      "description": "Describes a virtual machine scale set network profile's IP configuration properties."
+    },
+    "VirtualMachineScaleSetIPConfiguration": {
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Gets or sets the IP configuration name."
+        },
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/VirtualMachineScaleSetIPConfigurationProperties"
+        }
+      },
+      "required": [
+        "name"
+      ],
+      "allOf": [
+        {
+          "$ref": "#/definitions/SubResource"
+        }
+      ],
+      "description": "Describes a virtual machine scale set network profile's IP configuration."
+    },
+    "VirtualMachineScaleSetNetworkConfigurationProperties": {
+      "properties": {
+        "primary": {
+          "type": "boolean",
+          "description": "Gets or sets whether this is a primary NIC on a virtual machine."
+        },
+        "ipConfigurations": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/VirtualMachineScaleSetIPConfiguration"
+          },
+          "description": "Gets or sets the virtual machine scale set IP Configuration."
+        }
+      },
+      "required": [
+        "ipConfigurations"
+      ],
+      "description": "Describes a virtual machine scale set network profile's IP configuration."
+    },
+    "VirtualMachineScaleSetNetworkConfiguration": {
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Gets or sets the network configuration name."
+        },
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/VirtualMachineScaleSetNetworkConfigurationProperties"
+        }
+      },
+      "required": [
+        "name"
+      ],
+      "allOf": [
+        {
+          "$ref": "#/definitions/SubResource"
+        }
+      ],
+      "description": "Describes a virtual machine scale set network profile's network configurations."
+    },
+    "VirtualMachineScaleSetNetworkProfile": {
+      "properties": {
+        "networkInterfaceConfigurations": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/VirtualMachineScaleSetNetworkConfiguration"
+          },
+          "description": "Gets or sets the list of network configurations."
+        }
+      },
+      "description": "Describes a virtual machine scale set network profile."
+    },
+    "VirtualMachineScaleSetExtensionProperties": {
+      "properties": {
+        "publisher": {
+          "type": "string",
+          "description": "Gets or sets the name of the extension handler publisher."
+        },
+        "type": {
+          "type": "string",
+          "description": "Gets or sets the type of the extension handler."
+        },
+        "typeHandlerVersion": {
+          "type": "string",
+          "description": "Gets or sets the type version of the extension handler."
+        },
+        "autoUpgradeMinorVersion": {
+          "type": "boolean",
+          "description": "Gets or sets whether the extension handler should be automatically upgraded across minor versions."
+        },
+        "settings": {
+          "type": "object",
+          "description": "Gets or sets Json formatted public settings for the extension."
+        },
+        "protectedSettings": {
+          "type": "object",
+          "description": "Gets or sets Json formatted protected settings for the extension."
+        },
+        "provisioningState": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Gets the provisioning state, which only appears in the response."
+        }
+      },
+      "description": "Describes the properties of a Virtual Machine Scale Set Extension."
+    },
+    "VirtualMachineScaleSetExtension": {
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Gets or sets the name of the extension."
+        },
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/VirtualMachineScaleSetExtensionProperties"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/SubResource"
+        }
+      ],
+      "description": "Describes a Virtual Machine Scale Set Extension."
+    },
+    "VirtualMachineScaleSetExtensionProfile": {
+      "properties": {
+        "extensions": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/VirtualMachineScaleSetExtension"
+          },
+          "description": "Gets the virtual machine scale set child extension resources."
+        }
+      },
+      "description": "Describes a virtual machine scale set extension profile."
+    },
+    "VirtualMachineScaleSetVMProfile": {
+      "properties": {
+        "osProfile": {
+          "$ref": "#/definitions/VirtualMachineScaleSetOSProfile",
+          "description": "Gets or sets the virtual machine scale set OS profile."
+        },
+        "storageProfile": {
+          "$ref": "#/definitions/VirtualMachineScaleSetStorageProfile",
+          "description": "Gets or sets the virtual machine scale set storage profile."
+        },
+        "networkProfile": {
+          "$ref": "#/definitions/VirtualMachineScaleSetNetworkProfile",
+          "description": "Gets or sets the virtual machine scale set network profile."
+        },
+        "extensionProfile": {
+          "$ref": "#/definitions/VirtualMachineScaleSetExtensionProfile",
+          "description": "Gets the virtual machine scale set extension profile."
+        }
+      },
+      "description": "Describes a virtual machine scale set virtual machine profile."
+    },
+    "VirtualMachineScaleSetProperties": {
+      "properties": {
+        "upgradePolicy": {
+          "$ref": "#/definitions/UpgradePolicy",
+          "description": "Gets or sets the upgrade policy."
+        },
+        "virtualMachineProfile": {
+          "$ref": "#/definitions/VirtualMachineScaleSetVMProfile",
+          "description": "Gets or sets the virtual machine profile."
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets the provisioning state, which only appears in the response."
+        },
+        "overProvision": {
+          "type": "boolean",
+          "description": "Specifies whether the Virtual Machine Scale Set should be overprovisioned."
+        }
+      },
+      "description": "Describes the properties of a Virtual Machine Scale Set."
+    },
+    "VirtualMachineScaleSet": {
+      "properties": {
+        "sku": {
+          "$ref": "#/definitions/Sku",
+          "description": "Gets or sets the virtual machine scale set sku."
+        },
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/VirtualMachineScaleSetProperties"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "description": "Describes a Virtual Machine Scale Set."
+    },
+    "VirtualMachineScaleSetVMInstanceIDs": {
+      "properties": {
+        "instanceIds": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "Gets or sets the virtual machine scale set instance ids."
+        }
+      },
+      "description": "Specifies the list of virtual machine scale set instance IDs."
+    },
+    "VirtualMachineScaleSetVMInstanceRequiredIDs": {
+      "properties": {
+        "instanceIds": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "Gets or sets the virtual machine scale set instance ids."
+        }
+      },
+      "required": [
+        "instanceIds"
+      ],
+      "description": "Specifies the list of virtual machine scale set instance IDs."
+    },
+    "VirtualMachineStatusCodeCount": {
+      "properties": {
+        "code": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Gets the instance view status code."
+        },
+        "count": {
+          "readOnly": true,
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets the number of instances having a particular status code."
+        }
+      },
+      "description": "The status code and count of the virtual machine scale set instance view status summary."
+    },
+    "VirtualMachineScaleSetInstanceViewStatusesSummary": {
+      "properties": {
+        "statusesSummary": {
+          "readOnly": true,
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/VirtualMachineStatusCodeCount"
+          },
+          "description": "Gets the extensions information."
+        }
+      },
+      "description": "Instance view statuses summary for virtual machines of a virtual machine scale set."
+    },
+    "VirtualMachineScaleSetVMExtensionsSummary": {
+      "properties": {
+        "name": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Gets the extension name."
+        },
+        "statusesSummary": {
+          "readOnly": true,
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/VirtualMachineStatusCodeCount"
+          },
+          "description": "Gets the extensions information."
+        }
+      },
+      "description": "Extensions summary for virtual machines of a virtual machine scale set."
+    },
+    "VirtualMachineScaleSetInstanceView": {
+      "properties": {
+        "virtualMachine": {
+          "$ref": "#/definitions/VirtualMachineScaleSetInstanceViewStatusesSummary",
+          "readOnly": true,
+          "description": "Gets the instance view status summary for the virtual machine scale set."
+        },
+        "extensions": {
+          "readOnly": true,
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/VirtualMachineScaleSetVMExtensionsSummary"
+          },
+          "description": "Gets the extensions information."
+        },
+        "statuses": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/InstanceViewStatus"
+          },
+          "description": "Gets or sets the resource status information."
+        }
+      },
+      "description": "The instance view of a virtual machine scale set."
+    },
+    "VirtualMachineScaleSetListResult": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/VirtualMachineScaleSet"
+          },
+          "description": "Gets or sets the list of virtual machine scale sets."
+        }
+      },
+      "description": "The List Virtual Machine operation response."
+    },
+    "VirtualMachineScaleSetListWithLinkResult": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/VirtualMachineScaleSet"
+          },
+          "description": "Gets or sets the list of virtual machine scale sets."
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Gets or sets the uri to fetch the next page of Virtual Machine Scale Sets. Call ListNext() with this to fetch the next page of Virtual Machine Scale Sets."
+        }
+      },
+      "description": "The List Virtual Machine operation response."
+    },
+    "VirtualMachineScaleSetSkuCapacity": {
+      "properties": {
+        "minimum": {
+          "readOnly": true,
+          "type": "integer",
+          "format": "int64",
+          "description": "Gets the minimum capacity."
+        },
+        "maximum": {
+          "readOnly": true,
+          "type": "integer",
+          "format": "int64",
+          "description": "Gets the maximum capacity that can be set."
+        },
+        "defaultCapacity": {
+          "readOnly": true,
+          "type": "integer",
+          "format": "int64",
+          "description": "Gets the default capacity."
+        },
+        "scaleType": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Gets the scale type applicable to the sku.",
+          "enum": [
+            "Automatic",
+            "None"
+          ],
+          "x-ms-enum": {
+            "name": "VirtualMachineScaleSetSkuScaleType",
+            "modelAsString": false
+          }
+        }
+      },
+      "description": "Describes scaling information of a sku."
+    },
+    "VirtualMachineScaleSetSku": {
+      "properties": {
+        "resourceType": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Gets the type of resource the sku applies to."
+        },
+        "sku": {
+          "$ref": "#/definitions/Sku",
+          "readOnly": true,
+          "description": "Gets the Sku."
+        },
+        "capacity": {
+          "$ref": "#/definitions/VirtualMachineScaleSetSkuCapacity",
+          "readOnly": true,
+          "description": "Gets available scaling information."
+        }
+      },
+      "description": "Describes an available virtual machine scale set sku."
+    },
+    "VirtualMachineScaleSetListSkusResult": {
+      "properties": {
+        "value": {
+          "readOnly": true,
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/VirtualMachineScaleSetSku"
+          },
+          "description": "Gets the list of skus available for the virtual machine scale set."
+        }
+      },
+      "description": "The Virtual Machine Scale Set List Skus operation response."
+    },
+    "VirtualMachineScaleSetVMProperties": {
+      "properties": {
+        "latestModelApplied": {
+          "readOnly": true,
+          "type": "boolean",
+          "description": "Specifies whether the latest model has been applied to the virtual machine."
+        },
+        "instanceView": {
+          "$ref": "#/definitions/VirtualMachineInstanceView",
+          "readOnly": true,
+          "description": "Gets the virtual machine instance view."
+        },
+        "hardwareProfile": {
+          "$ref": "#/definitions/HardwareProfile",
+          "description": "Gets or sets the hardware profile."
+        },
+        "storageProfile": {
+          "$ref": "#/definitions/StorageProfile",
+          "description": "Gets or sets the storage profile."
+        },
+        "osProfile": {
+          "$ref": "#/definitions/OSProfile",
+          "description": "Gets or sets the OS profile."
+        },
+        "networkProfile": {
+          "$ref": "#/definitions/NetworkProfile",
+          "description": "Gets or sets the network profile."
+        },
+        "diagnosticsProfile": {
+          "$ref": "#/definitions/DiagnosticsProfile",
+          "description": "Gets or sets the diagnostics profile."
+        },
+        "availabilitySet": {
+          "$ref": "#/definitions/SubResource",
+          "description": "Gets or sets the reference Id of the availability set to which this virtual machine belongs."
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets the provisioning state, which only appears in the response."
+        },
+        "licenseType": {
+          "type": "string",
+          "description": "Gets or sets the license type, which is for bring your own license scenario."
+        }
+      },
+      "description": "Describes the properties of a virtual machine scale set virtual machine."
+    },
+    "VirtualMachineScaleSetVM": {
+      "properties": {
+        "instanceId": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Gets the virtual machine instance id."
+        },
+        "sku": {
+          "$ref": "#/definitions/Sku",
+          "readOnly": true,
+          "description": "Gets the virtual machine sku."
+        },
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/VirtualMachineScaleSetVMProperties"
+        },
+        "plan": {
+          "$ref": "#/definitions/Plan",
+          "description": "Gets or sets the purchase plan when deploying virtual machine from VM Marketplace images."
+        },
+        "resources": {
+          "readOnly": true,
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/VirtualMachineExtension"
+          },
+          "description": "Gets the virtual machine child extension resources."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "description": "Describes a virtual machine scale set virtual machine."
+    },
+    "VirtualMachineScaleSetVMInstanceView": {
+      "properties": {
+        "platformUpdateDomain": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or sets the Update Domain count."
+        },
+        "platformFaultDomain": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or sets the Fault Domain count."
+        },
+        "rdpThumbPrint": {
+          "type": "string",
+          "description": "Gets or sets the Remote desktop certificate thumbprint."
+        },
+        "vmAgent": {
+          "$ref": "#/definitions/VirtualMachineAgentInstanceView",
+          "description": "Gets or sets the VM Agent running on the virtual machine."
+        },
+        "disks": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/DiskInstanceView"
+          },
+          "description": "Gets or sets the disks information."
+        },
+        "extensions": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/VirtualMachineExtensionInstanceView"
+          },
+          "description": "Gets or sets the extensions information."
+        },
+        "bootDiagnostics": {
+          "$ref": "#/definitions/BootDiagnosticsInstanceView",
+          "description": "Gets or sets the boot diagnostics."
+        },
+        "statuses": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/InstanceViewStatus"
+          },
+          "description": "Gets or sets the resource status information."
+        }
+      },
+      "description": "The instance view of a virtual machine scale set VM."
+    },
+    "VirtualMachineScaleSetVMListResult": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/VirtualMachineScaleSetVM"
+          },
+          "description": "Gets or sets the list of virtual machine scale sets VMs."
+        }
+      },
+      "description": "The List Virtual Machine Scale Set VMs operation response."
+    },
+    "ApiErrorBase": {
+      "properties": {
+        "code": {
+          "type": "string",
+          "description": "Gets or sets the error code."
+        },
+        "target": {
+          "type": "string",
+          "description": "Gets or sets the target of the particular error."
+        },
+        "message": {
+          "type": "string",
+          "description": "Gets or sets the error message."
+        }
+      },
+      "description": "Api error base."
+    },
+    "InnerError": {
+      "properties": {
+        "exceptiontype": {
+          "type": "string",
+          "description": "Gets or sets the exception type."
+        },
+        "errordetail": {
+          "type": "string",
+          "description": "Gets or sets the internal error message or exception dump."
+        }
+      },
+      "description": "Inner error details."
+    },
+    "ApiError": {
+      "properties": {
+        "details": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ApiErrorBase"
+          },
+          "description": "Gets or sets the Api error details"
+        },
+        "innererror": {
+          "$ref": "#/definitions/InnerError",
+          "description": "Gets or sets the Api inner error"
+        },
+        "code": {
+          "type": "string",
+          "description": "Gets or sets the error code."
+        },
+        "target": {
+          "type": "string",
+          "description": "Gets or sets the target of the particular error."
+        },
+        "message": {
+          "type": "string",
+          "description": "Gets or sets the error message."
+        }
+      },
+      "description": "Api error."
+    },
+    "ComputeLongRunningOperationProperties": {
+      "properties": {
+        "output": {
+          "type": "object",
+          "description": "Operation output data (raw JSON)"
+        }
+      },
+      "description": "Compute-specific operation properties, including output"
+    },
+    "Resource": {
+      "properties": {
+        "id": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "name": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Resource name"
+        },
+        "type": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Resource type"
+        },
+        "location": {
+          "type": "string",
+          "description": "Resource location"
+        },
+        "tags": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "description": "Resource tags"
+        }
+      },
+      "required": [
+        "location"
+      ],
+      "x-ms-azure-resource": true
+    },
+    "SubResource": {
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        }
+      },
+      "x-ms-azure-resource": true
+    }
+  },
+  "parameters": {
+    "SubscriptionIdParameter": {
+      "name": "subscriptionId",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "Gets subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call."
+    },
+    "ApiVersionParameter": {
+      "name": "api-version",
+      "in": "query",
+      "required": true,
+      "type": "string",
+      "description": "Client Api Version."
+    }
+  }
+}
\ No newline at end of file
diff --git a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/Swagger/network.json b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/Swagger/network.json
new file mode 100644
index 0000000000000..5daa6a5c77b1e
--- /dev/null
+++ b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/Swagger/network.json
@@ -0,0 +1,7399 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "NetworkManagementClient",
+    "description": "The Microsoft Azure Network management API provides a RESTful set of web services that interact with Microsoft Azure Networks service to manage your network resrources. The API has entities that capture the relationship between an end user and the Microsoft Azure Networks service.",
+    "version": "2016-03-30"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json",
+    "text/json"
+  ],
+  "produces": [
+    "application/json",
+    "text/json"
+  ],
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ],
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "flow": "implicit",
+      "description": "Azure Active Directory OAuth2 Flow",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/applicationGateways/{applicationGatewayName}": {
+      "delete": {
+        "tags": [
+          "ApplicationGateways"
+        ],
+        "operationId": "ApplicationGateways_Delete",
+        "description": "The delete applicationgateway operation deletes the specified applicationgateway.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "applicationGatewayName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the applicationgateway."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": ""
+          },
+          "204": {
+            "description": ""
+          },
+          "200": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      },
+      "get": {
+        "tags": [
+          "ApplicationGateways"
+        ],
+        "operationId": "ApplicationGateways_Get",
+        "description": "The Get applicationgateway operation retreives information about the specified applicationgateway.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "applicationGatewayName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the applicationgateway."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/ApplicationGateway"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "ApplicationGateways"
+        ],
+        "operationId": "ApplicationGateways_CreateOrUpdate",
+        "description": "The Put ApplicationGateway operation creates/updates a ApplicationGateway",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "applicationGatewayName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the ApplicationGateway."
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/ApplicationGateway"
+            },
+            "description": "Parameters supplied to the create/delete ApplicationGateway operation"
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/ApplicationGateway"
+            }
+          },
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/ApplicationGateway"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/applicationGateways": {
+      "get": {
+        "tags": [
+          "ApplicationGateways"
+        ],
+        "operationId": "ApplicationGateways_List",
+        "description": "The List ApplicationGateway opertion retrieves all the applicationgateways in a resource group.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/ApplicationGatewayListResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Network/applicationGateways": {
+      "get": {
+        "tags": [
+          "ApplicationGateways"
+        ],
+        "operationId": "ApplicationGateways_ListAll",
+        "description": "The List applicationgateway opertion retrieves all the applicationgateways in a subscription.",
+        "parameters": [
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/ApplicationGatewayListResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/applicationGateways/{applicationGatewayName}/start": {
+      "post": {
+        "tags": [
+          "ApplicationGateways"
+        ],
+        "operationId": "ApplicationGateways_Start",
+        "description": "The Start ApplicationGateway operation starts application gatewayin the specified resource group through Network resource provider.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "applicationGatewayName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the application gateway."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": ""
+          },
+          "202": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/applicationGateways/{applicationGatewayName}/stop": {
+      "post": {
+        "tags": [
+          "ApplicationGateways"
+        ],
+        "operationId": "ApplicationGateways_Stop",
+        "description": "The STOP ApplicationGateway operation stops application gatewayin the specified resource group through Network resource provider.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "applicationGatewayName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the application gateway."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": ""
+          },
+          "202": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/authorizations/{authorizationName}": {
+      "delete": {
+        "tags": [
+          "ExpressRouteCircuitAuthorizations"
+        ],
+        "operationId": "ExpressRouteCircuitAuthorizations_Delete",
+        "description": "The delete authorization operation deletes the specified authorization from the specified ExpressRouteCircuit.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "circuitName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the express route circuit."
+          },
+          {
+            "name": "authorizationName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the authorization."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": ""
+          },
+          "200": {
+            "description": ""
+          },
+          "204": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      },
+      "get": {
+        "tags": [
+          "ExpressRouteCircuitAuthorizations"
+        ],
+        "operationId": "ExpressRouteCircuitAuthorizations_Get",
+        "description": "The GET authorization operation retrieves the specified authorization from the specified ExpressRouteCircuit.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "circuitName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the express route circuit."
+          },
+          {
+            "name": "authorizationName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the authorization."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/ExpressRouteCircuitAuthorization"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "ExpressRouteCircuitAuthorizations"
+        ],
+        "operationId": "ExpressRouteCircuitAuthorizations_CreateOrUpdate",
+        "description": "The Put Authorization operation creates/updates an authorization in thespecified ExpressRouteCircuits",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "circuitName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the express route circuit."
+          },
+          {
+            "name": "authorizationName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the authorization."
+          },
+          {
+            "name": "authorizationParameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/ExpressRouteCircuitAuthorization"
+            },
+            "description": "Parameters supplied to the create/update ExpressRouteCircuitAuthorization operation"
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/ExpressRouteCircuitAuthorization"
+            }
+          },
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/ExpressRouteCircuitAuthorization"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/authorizations": {
+      "get": {
+        "tags": [
+          "ExpressRouteCircuitAuthorizations"
+        ],
+        "operationId": "ExpressRouteCircuitAuthorizations_List",
+        "description": "The List authorization operation retrieves all the authorizations in an ExpressRouteCircuit.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "circuitName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the curcuit."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/AuthorizationListResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/peerings/{peeringName}": {
+      "delete": {
+        "tags": [
+          "ExpressRouteCircuitPeerings"
+        ],
+        "operationId": "ExpressRouteCircuitPeerings_Delete",
+        "description": "The delete peering operation deletes the specified peering from the ExpressRouteCircuit.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "circuitName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the express route circuit."
+          },
+          {
+            "name": "peeringName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the peering."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": ""
+          },
+          "202": {
+            "description": ""
+          },
+          "204": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      },
+      "get": {
+        "tags": [
+          "ExpressRouteCircuitPeerings"
+        ],
+        "operationId": "ExpressRouteCircuitPeerings_Get",
+        "description": "The GET peering operation retrieves the specified authorization from the ExpressRouteCircuit.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "circuitName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the express route circuit."
+          },
+          {
+            "name": "peeringName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the peering."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/ExpressRouteCircuitPeering"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "ExpressRouteCircuitPeerings"
+        ],
+        "operationId": "ExpressRouteCircuitPeerings_CreateOrUpdate",
+        "description": "The Put Pering operation creates/updates an peering in the specified ExpressRouteCircuits",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "circuitName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the express route circuit."
+          },
+          {
+            "name": "peeringName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the peering."
+          },
+          {
+            "name": "peeringParameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/ExpressRouteCircuitPeering"
+            },
+            "description": "Parameters supplied to the create/update ExpressRouteCircuit Peering operation"
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/ExpressRouteCircuitPeering"
+            }
+          },
+          "201": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/ExpressRouteCircuitPeering"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/peerings": {
+      "get": {
+        "tags": [
+          "ExpressRouteCircuitPeerings"
+        ],
+        "operationId": "ExpressRouteCircuitPeerings_List",
+        "description": "The List peering operation retrieves all the peerings in an ExpressRouteCircuit.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "circuitName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the curcuit."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/ExpressRouteCircuitPeeringListResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}": {
+      "delete": {
+        "tags": [
+          "ExpressRouteCircuits"
+        ],
+        "operationId": "ExpressRouteCircuits_Delete",
+        "description": "The delete ExpressRouteCircuit operation deletes the specified ExpressRouteCircuit.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "circuitName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the express route Circuit."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": ""
+          },
+          "202": {
+            "description": ""
+          },
+          "200": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      },
+      "get": {
+        "tags": [
+          "ExpressRouteCircuits"
+        ],
+        "operationId": "ExpressRouteCircuits_Get",
+        "description": "The Get ExpressRouteCircuit operation retreives information about the specified ExpressRouteCircuit.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "circuitName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the circuit."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/ExpressRouteCircuit"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "ExpressRouteCircuits"
+        ],
+        "operationId": "ExpressRouteCircuits_CreateOrUpdate",
+        "description": "The Put ExpressRouteCircuit operation creates/updates a ExpressRouteCircuit",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "circuitName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the circuit."
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/ExpressRouteCircuit"
+            },
+            "description": "Parameters supplied to the create/delete ExpressRouteCircuit operation"
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/ExpressRouteCircuit"
+            }
+          },
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/ExpressRouteCircuit"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/peerings/{peeringName}/arpTables/{devicePath}": {
+      "post": {
+        "tags": [
+          "ExpressRouteCircuitArpTable"
+        ],
+        "operationId": "ExpressRouteCircuits_ListArpTable",
+        "description": "The ListArpTable from ExpressRouteCircuit opertion retrieves the currently advertised arp table associated with the ExpressRouteCircuits in a resource group.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "circuitName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the circuit."
+          },
+          {
+            "name": "peeringName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the peering."
+          },
+          {
+            "name": "devicePath",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The path of the device."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/ExpressRouteCircuitsArpTableListResult"
+            }
+          },
+          "202": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/peerings/{peeringName}/routesTable/{devicePath}": {
+      "post": {
+        "tags": [
+          "ExpressRouteCircuitRoutesTable"
+        ],
+        "operationId": "ExpressRouteCircuits_ListRoutesTable",
+        "description": "The ListRoutesTable from ExpressRouteCircuit opertion retrieves the currently advertised routes table associated with the ExpressRouteCircuits in a resource group.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "circuitName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the circuit."
+          },
+          {
+            "name": "peeringName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the peering."
+          },
+          {
+            "name": "devicePath",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The path of the device."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/ExpressRouteCircuitsRoutesTableListResult"
+            }
+          },
+          "202": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/peerings/{peeringName}/routeTablesSummary/{devicePath}": {
+      "post": {
+        "tags": [
+          "ExpressRouteCircuitRoutesTableSummary"
+        ],
+        "operationId": "ExpressRouteCircuits_ListRoutesTableSummary",
+        "description": "The ListRoutesTable from ExpressRouteCircuit opertion retrieves the currently advertised routes table associated with the ExpressRouteCircuits in a resource group.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "circuitName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the circuit."
+          },
+          {
+            "name": "peeringName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the peering."
+          },
+          {
+            "name": "devicePath",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The path of the device."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/ExpressRouteCircuitsRoutesTableSummaryListResult"
+            }
+          },
+          "202": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/stats": {
+      "get": {
+        "tags": [
+          "ExpressRouteCircuitStats"
+        ],
+        "operationId": "ExpressRouteCircuits_GetStats",
+        "description": "The Liststats ExpressRouteCircuit opertion retrieves all the stats from a ExpressRouteCircuits in a resource group.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "circuitName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the circuit."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/ExpressRouteCircuitStats"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/peerings/{peeringName}/stats": {
+      "get": {
+        "tags": [
+          "ExpressRouteCircuitStats"
+        ],
+        "operationId": "ExpressRouteCircuits_GetPeeringStats",
+        "description": "The Liststats ExpressRouteCircuit opertion retrieves all the stats from a ExpressRouteCircuits in a resource group.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "circuitName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the circuit."
+          },
+          {
+            "name": "peeringName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the peering."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/ExpressRouteCircuitStats"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits": {
+      "get": {
+        "tags": [
+          "ExpressRouteCircuits"
+        ],
+        "operationId": "ExpressRouteCircuits_List",
+        "description": "The List ExpressRouteCircuit opertion retrieves all the ExpressRouteCircuits in a resource group.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/ExpressRouteCircuitListResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Network/expressRouteCircuits": {
+      "get": {
+        "tags": [
+          "ExpressRouteCircuits"
+        ],
+        "operationId": "ExpressRouteCircuits_ListAll",
+        "description": "The List ExpressRouteCircuit opertion retrieves all the ExpressRouteCircuits in a subscription.",
+        "parameters": [
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/ExpressRouteCircuitListResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Network/expressRouteServiceProviders": {
+      "get": {
+        "tags": [
+          "ExpressRouteServiceProviders"
+        ],
+        "operationId": "ExpressRouteServiceProviders_List",
+        "description": "The List ExpressRouteServiceProvider opertion retrieves all the available ExpressRouteServiceProviders.",
+        "parameters": [
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/ExpressRouteServiceProviderListResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}": {
+      "delete": {
+        "tags": [
+          "LoadBalancers"
+        ],
+        "operationId": "LoadBalancers_Delete",
+        "description": "The delete loadbalancer operation deletes the specified loadbalancer.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "loadBalancerName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the loadBalancer."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": ""
+          },
+          "202": {
+            "description": ""
+          },
+          "200": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      },
+      "get": {
+        "tags": [
+          "LoadBalancers"
+        ],
+        "operationId": "LoadBalancers_Get",
+        "description": "The Get ntework interface operation retreives information about the specified network interface.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "loadBalancerName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the loadBalancer."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "name": "$expand",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "expand references resources."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/LoadBalancer"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "LoadBalancers"
+        ],
+        "operationId": "LoadBalancers_CreateOrUpdate",
+        "description": "The Put LoadBalancer operation creates/updates a LoadBalancer",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "loadBalancerName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the loadBalancer."
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/LoadBalancer"
+            },
+            "description": "Parameters supplied to the create/delete LoadBalancer operation"
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/LoadBalancer"
+            }
+          },
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/LoadBalancer"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Network/loadBalancers": {
+      "get": {
+        "tags": [
+          "LoadBalancers"
+        ],
+        "operationId": "LoadBalancers_ListAll",
+        "description": "The List loadBalancer opertion retrieves all the loadbalancers in a subscription.",
+        "parameters": [
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/LoadBalancerListResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers": {
+      "get": {
+        "tags": [
+          "LoadBalancers"
+        ],
+        "operationId": "LoadBalancers_List",
+        "description": "The List loadBalancer opertion retrieves all the loadbalancers in a resource group.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/LoadBalancerListResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/localNetworkGateways/{localNetworkGatewayName}": {
+      "put": {
+        "tags": [
+          "LocalNetworkGateways"
+        ],
+        "operationId": "LocalNetworkGateways_CreateOrUpdate",
+        "description": "The Put LocalNetworkGateway operation creates/updates a local network gateway in the specified resource group through Network resource provider.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "localNetworkGatewayName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the local network gateway."
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/LocalNetworkGateway"
+            },
+            "description": "Parameters supplied to the Begin Create or update Local Network Gateway operation through Network resource provider."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/LocalNetworkGateway"
+            }
+          },
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/LocalNetworkGateway"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      },
+      "get": {
+        "tags": [
+          "LocalNetworkGateways"
+        ],
+        "operationId": "LocalNetworkGateways_Get",
+        "description": "The Get LocalNetworkGateway operation retrieves information about the specified local network gateway through Network resource provider.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "localNetworkGatewayName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the local network gateway."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/LocalNetworkGateway"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "LocalNetworkGateways"
+        ],
+        "operationId": "LocalNetworkGateways_Delete",
+        "description": "The Delete LocalNetworkGateway operation deletes the specifed local network Gateway through Network resource provider.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "localNetworkGatewayName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the local network gateway."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": ""
+          },
+          "200": {
+            "description": ""
+          },
+          "202": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/localNetworkGateways": {
+      "get": {
+        "tags": [
+          "LocalNetworkGateways"
+        ],
+        "operationId": "LocalNetworkGateways_List",
+        "description": "The List LocalNetworkGateways opertion retrieves all the local network gateways stored.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/LocalNetworkGatewayListResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkInterfaces/{networkInterfaceName}": {
+      "delete": {
+        "tags": [
+          "NetworkInterfaces"
+        ],
+        "operationId": "NetworkInterfaces_Delete",
+        "description": "The delete netwokInterface operation deletes the specified netwokInterface.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "networkInterfaceName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the network interface."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": ""
+          },
+          "202": {
+            "description": ""
+          },
+          "200": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      },
+      "get": {
+        "tags": [
+          "NetworkInterfaces"
+        ],
+        "operationId": "NetworkInterfaces_Get",
+        "description": "The Get ntework interface operation retreives information about the specified network interface.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "networkInterfaceName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the network interface."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "name": "$expand",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "expand references resources."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/NetworkInterface"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "NetworkInterfaces"
+        ],
+        "operationId": "NetworkInterfaces_CreateOrUpdate",
+        "description": "The Put NetworkInterface operation creates/updates a networkInterface",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "networkInterfaceName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the network interface."
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/NetworkInterface"
+            },
+            "description": "Parameters supplied to the create/update NetworkInterface operation"
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/NetworkInterface"
+            }
+          },
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/NetworkInterface"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/microsoft.Compute/virtualMachineScaleSets/{virtualMachineScaleSetName}/virtualMachines/{virtualmachineIndex}/networkInterfaces": {
+      "get": {
+        "tags": [
+          "NetworkInterfaces"
+        ],
+        "operationId": "NetworkInterfaces_ListVirtualMachineScaleSetVMNetworkInterfaces",
+        "description": "The list network interface operation retrieves information about all network interfaces in a virtual machine from a virtual machine scale set.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "virtualMachineScaleSetName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual machine scale set."
+          },
+          {
+            "name": "virtualmachineIndex",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The virtual machine index."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/NetworkInterfaceListResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/microsoft.Compute/virtualMachineScaleSets/{virtualMachineScaleSetName}/networkInterfaces": {
+      "get": {
+        "tags": [
+          "NetworkInterfaces"
+        ],
+        "operationId": "NetworkInterfaces_ListVirtualMachineScaleSetNetworkInterfaces",
+        "description": "The list network interface operation retrieves information about all network interfaces in a virtual machine scale set.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "virtualMachineScaleSetName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual machine scale set."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/NetworkInterfaceListResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/microsoft.Compute/virtualMachineScaleSets/{virtualMachineScaleSetName}/virtualMachines/{virtualmachineIndex}/networkInterfaces/{networkInterfaceName}": {
+      "get": {
+        "tags": [
+          "NetworkInterfaces"
+        ],
+        "operationId": "NetworkInterfaces_GetVirtualMachineScaleSetNetworkInterface",
+        "description": "The Get ntework interface operation retreives information about the specified network interface in a virtual machine scale set.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "virtualMachineScaleSetName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual machine scale set."
+          },
+          {
+            "name": "virtualmachineIndex",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The virtual machine index."
+          },
+          {
+            "name": "networkInterfaceName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the network interface."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "name": "$expand",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "expand references resources."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/NetworkInterface"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Network/networkInterfaces": {
+      "get": {
+        "tags": [
+          "NetworkInterfaces"
+        ],
+        "operationId": "NetworkInterfaces_ListAll",
+        "description": "The List networkInterfaces opertion retrieves all the networkInterfaces in a subscription.",
+        "parameters": [
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/NetworkInterfaceListResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkInterfaces": {
+      "get": {
+        "tags": [
+          "NetworkInterfaces"
+        ],
+        "operationId": "NetworkInterfaces_List",
+        "description": "The List networkInterfaces opertion retrieves all the networkInterfaces in a resource group.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/NetworkInterfaceListResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkSecurityGroups/{networkSecurityGroupName}": {
+      "delete": {
+        "tags": [
+          "NetworkSecurityGroups"
+        ],
+        "operationId": "NetworkSecurityGroups_Delete",
+        "description": "The Delete NetworkSecurityGroup operation deletes the specifed network security group",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "networkSecurityGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the network security group."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": ""
+          },
+          "200": {
+            "description": ""
+          },
+          "204": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      },
+      "get": {
+        "tags": [
+          "NetworkSecurityGroups"
+        ],
+        "operationId": "NetworkSecurityGroups_Get",
+        "description": "The Get NetworkSecurityGroups operation retrieves information about the specified network security group.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "networkSecurityGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the network security group."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "name": "$expand",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "expand references resources."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/NetworkSecurityGroup"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "NetworkSecurityGroups"
+        ],
+        "operationId": "NetworkSecurityGroups_CreateOrUpdate",
+        "description": "The Put NetworkSecurityGroup operation creates/updates a network security groupin the specified resource group.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "networkSecurityGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the network security group."
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/NetworkSecurityGroup"
+            },
+            "description": "Parameters supplied to the create/update Network Security Group operation"
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/NetworkSecurityGroup"
+            }
+          },
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/NetworkSecurityGroup"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Network/networkSecurityGroups": {
+      "get": {
+        "tags": [
+          "NetworkSecurityGroups"
+        ],
+        "operationId": "NetworkSecurityGroups_ListAll",
+        "description": "The list NetworkSecurityGroups returns all network security groups in a subscription",
+        "parameters": [
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/NetworkSecurityGroupListResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkSecurityGroups": {
+      "get": {
+        "tags": [
+          "NetworkSecurityGroups"
+        ],
+        "operationId": "NetworkSecurityGroups_List",
+        "description": "The list NetworkSecurityGroups returns all network security groups in a resource group",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/NetworkSecurityGroupListResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/publicIPAddresses/{publicIpAddressName}": {
+      "delete": {
+        "tags": [
+          "PublicIPAddresses"
+        ],
+        "operationId": "PublicIPAddresses_Delete",
+        "description": "The delete publicIpAddress operation deletes the specified publicIpAddress.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "publicIpAddressName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the subnet."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": ""
+          },
+          "202": {
+            "description": ""
+          },
+          "200": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      },
+      "get": {
+        "tags": [
+          "PublicIPAddresses"
+        ],
+        "operationId": "PublicIPAddresses_Get",
+        "description": "The Get publicIpAddress operation retreives information about the specified pubicIpAddress",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "publicIpAddressName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the subnet."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "name": "$expand",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "expand references resources."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/PublicIPAddress"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "PublicIPAddresses"
+        ],
+        "operationId": "PublicIPAddresses_CreateOrUpdate",
+        "description": "The Put PublicIPAddress operation creates/updates a stable/dynamic PublicIP address",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "publicIpAddressName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the publicIpAddress."
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/PublicIPAddress"
+            },
+            "description": "Parameters supplied to the create/update PublicIPAddress operation"
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/PublicIPAddress"
+            }
+          },
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/PublicIPAddress"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Network/publicIPAddresses": {
+      "get": {
+        "tags": [
+          "PublicIPAddresses"
+        ],
+        "operationId": "PublicIPAddresses_ListAll",
+        "description": "The List publicIpAddress opertion retrieves all the publicIpAddresses in a subscription.",
+        "parameters": [
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/PublicIPAddressListResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/publicIPAddresses": {
+      "get": {
+        "tags": [
+          "PublicIPAddresses"
+        ],
+        "operationId": "PublicIPAddresses_List",
+        "description": "The List publicIpAddress opertion retrieves all the publicIpAddresses in a resource group.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/PublicIPAddressListResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/routeTables/{routeTableName}": {
+      "delete": {
+        "tags": [
+          "RouteTables"
+        ],
+        "operationId": "RouteTables_Delete",
+        "description": "The Delete RouteTable operation deletes the specifed Route Table",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "routeTableName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the route table."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": ""
+          },
+          "200": {
+            "description": ""
+          },
+          "202": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      },
+      "get": {
+        "tags": [
+          "RouteTables"
+        ],
+        "operationId": "RouteTables_Get",
+        "description": "The Get RouteTables operation retrieves information about the specified route table.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "routeTableName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the route table."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "name": "$expand",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "expand references resources."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/RouteTable"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "RouteTables"
+        ],
+        "operationId": "RouteTables_CreateOrUpdate",
+        "description": "The Put RouteTable operation creates/updates a route tablein the specified resource group.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "routeTableName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the route table."
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/RouteTable"
+            },
+            "description": "Parameters supplied to the create/update Route Table operation"
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/RouteTable"
+            }
+          },
+          "201": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/RouteTable"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/routeTables": {
+      "get": {
+        "tags": [
+          "RouteTables"
+        ],
+        "operationId": "RouteTables_List",
+        "description": "The list RouteTables returns all route tables in a resource group",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/RouteTableListResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Network/routeTables": {
+      "get": {
+        "tags": [
+          "RouteTables"
+        ],
+        "operationId": "RouteTables_ListAll",
+        "description": "The list RouteTables returns all route tables in a subscription",
+        "parameters": [
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/RouteTableListResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/routeTables/{routeTableName}/routes/{routeName}": {
+      "delete": {
+        "tags": [
+          "Routes"
+        ],
+        "operationId": "Routes_Delete",
+        "description": "The delete route operation deletes the specified route from a route table.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "routeTableName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the route table."
+          },
+          {
+            "name": "routeName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the route."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": ""
+          },
+          "200": {
+            "description": ""
+          },
+          "204": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      },
+      "get": {
+        "tags": [
+          "Routes"
+        ],
+        "operationId": "Routes_Get",
+        "description": "The Get route operation retreives information about the specified route from the route table.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "routeTableName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the route table."
+          },
+          {
+            "name": "routeName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the route."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/Route"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "Routes"
+        ],
+        "operationId": "Routes_CreateOrUpdate",
+        "description": "The Put route operation creates/updates a route in the specified route table",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "routeTableName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the route table."
+          },
+          {
+            "name": "routeName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the route."
+          },
+          {
+            "name": "routeParameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/Route"
+            },
+            "description": "Parameters supplied to the create/update routeoperation"
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/Route"
+            }
+          },
+          "201": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/Route"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/routeTables/{routeTableName}/routes": {
+      "get": {
+        "tags": [
+          "Routes"
+        ],
+        "operationId": "Routes_List",
+        "description": "The List network security rule opertion retrieves all the routes in a route table.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "routeTableName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the route table."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/RouteListResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkSecurityGroups/{networkSecurityGroupName}/securityRules/{securityRuleName}": {
+      "delete": {
+        "tags": [
+          "SecurityRules"
+        ],
+        "operationId": "SecurityRules_Delete",
+        "description": "The delete network security rule operation deletes the specified network security rule.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "networkSecurityGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the network security group."
+          },
+          {
+            "name": "securityRuleName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the security rule."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": ""
+          },
+          "202": {
+            "description": ""
+          },
+          "200": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      },
+      "get": {
+        "tags": [
+          "SecurityRules"
+        ],
+        "operationId": "SecurityRules_Get",
+        "description": "The Get NetworkSecurityRule operation retreives information about the specified network security rule.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "networkSecurityGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the network security group."
+          },
+          {
+            "name": "securityRuleName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the security rule."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/SecurityRule"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "SecurityRules"
+        ],
+        "operationId": "SecurityRules_CreateOrUpdate",
+        "description": "The Put network security rule operation creates/updates a security rule in the specified network security group",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "networkSecurityGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the network security group."
+          },
+          {
+            "name": "securityRuleName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the security rule."
+          },
+          {
+            "name": "securityRuleParameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/SecurityRule"
+            },
+            "description": "Parameters supplied to the create/update network security rule operation"
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/SecurityRule"
+            }
+          },
+          "201": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/SecurityRule"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkSecurityGroups/{networkSecurityGroupName}/securityRules": {
+      "get": {
+        "tags": [
+          "SecurityRules"
+        ],
+        "operationId": "SecurityRules_List",
+        "description": "The List network security rule opertion retrieves all the security rules in a network security group.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "networkSecurityGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the network security group."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/SecurityRuleListResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualnetworks/{virtualNetworkName}/subnets/{subnetName}": {
+      "delete": {
+        "tags": [
+          "Subnets"
+        ],
+        "operationId": "Subnets_Delete",
+        "description": "The delete subnet operation deletes the specified subnet.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "virtualNetworkName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual network."
+          },
+          {
+            "name": "subnetName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the subnet."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": ""
+          },
+          "204": {
+            "description": ""
+          },
+          "202": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      },
+      "get": {
+        "tags": [
+          "Subnets"
+        ],
+        "operationId": "Subnets_Get",
+        "description": "The Get subnet operation retreives information about the specified subnet.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "virtualNetworkName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual network."
+          },
+          {
+            "name": "subnetName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the subnet."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "name": "$expand",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "expand references resources."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/Subnet"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "Subnets"
+        ],
+        "operationId": "Subnets_CreateOrUpdate",
+        "description": "The Put Subnet operation creates/updates a subnet in thespecified virtual network",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "virtualNetworkName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual network."
+          },
+          {
+            "name": "subnetName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the subnet."
+          },
+          {
+            "name": "subnetParameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/Subnet"
+            },
+            "description": "Parameters supplied to the create/update Subnet operation"
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/Subnet"
+            }
+          },
+          "201": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/Subnet"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualnetworks/{virtualNetworkName}/subnets": {
+      "get": {
+        "tags": [
+          "Subnets"
+        ],
+        "operationId": "Subnets_List",
+        "description": "The List subnets opertion retrieves all the subnets in a virtual network.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "virtualNetworkName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual network."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/SubnetListResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/usages": {
+      "get": {
+        "tags": [
+          "Usages"
+        ],
+        "operationId": "Usages_List",
+        "description": "Lists compute usages for a subscription.",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The location upon which resource usage is queried.",
+            "pattern": "^[-\\w\\._]+$"
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/UsagesListResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections/{virtualNetworkGatewayConnectionName}": {
+      "put": {
+        "tags": [
+          "VirtualNetworkGatewayConnections"
+        ],
+        "operationId": "VirtualNetworkGatewayConnections_CreateOrUpdate",
+        "description": "The Put VirtualNetworkGatewayConnection operation creates/updates a virtual network gateway connection in the specified resource group through Network resource provider.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "virtualNetworkGatewayConnectionName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual network gateway conenction."
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/VirtualNetworkGatewayConnection"
+            },
+            "description": "Parameters supplied to the Begin Create or update Virtual Network Gateway connection operation through Network resource provider."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/VirtualNetworkGatewayConnection"
+            }
+          },
+          "201": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/VirtualNetworkGatewayConnection"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      },
+      "get": {
+        "tags": [
+          "VirtualNetworkGatewayConnections"
+        ],
+        "operationId": "VirtualNetworkGatewayConnections_Get",
+        "description": "The Get VirtualNetworkGatewayConnection operation retrieves information about the specified virtual network gateway connection through Network resource provider.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "virtualNetworkGatewayConnectionName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual network gateway connection."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/VirtualNetworkGatewayConnection"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "VirtualNetworkGatewayConnections"
+        ],
+        "operationId": "VirtualNetworkGatewayConnections_Delete",
+        "description": "The Delete VirtualNetworkGatewayConnection operation deletes the specifed virtual network Gateway connection through Network resource provider.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "virtualNetworkGatewayConnectionName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual network gateway connection."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": ""
+          },
+          "202": {
+            "description": ""
+          },
+          "204": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections/{connectionSharedKeyName}/sharedkey": {
+      "get": {
+        "tags": [
+          "VirtualNetworkGatewayConnections"
+        ],
+        "operationId": "VirtualNetworkGatewayConnections_GetSharedKey",
+        "description": "The Get VirtualNetworkGatewayConnectionSharedKey operation retrieves information about the specified virtual network gateway connection shared key through Network resource provider.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "connectionSharedKeyName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The virtual network gateway connection shared key name."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/ConnectionSharedKeyResult"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections": {
+      "get": {
+        "tags": [
+          "VirtualNetworkGatewayConnections"
+        ],
+        "operationId": "VirtualNetworkGatewayConnections_List",
+        "description": "The List VirtualNetworkGatewayConnections operation retrieves all the virtual network gateways connections created.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/VirtualNetworkGatewayConnectionListResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections/{virtualNetworkGatewayConnectionName}/sharedkey/reset": {
+      "post": {
+        "tags": [
+          "VirtualNetworkGatewayConnections"
+        ],
+        "operationId": "VirtualNetworkGatewayConnections_ResetSharedKey",
+        "description": "The VirtualNetworkGatewayConnectionResetSharedKey operation resets the virtual network gateway connection shared key for passed virtual network gateway connection in the specified resource group through Network resource provider.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "virtualNetworkGatewayConnectionName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The virtual network gateway connection reset shared key Name."
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/ConnectionResetSharedKey"
+            },
+            "description": "Parameters supplied to the Begin Reset Virtual Network Gateway connection shared key operation through Network resource provider."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/ConnectionResetSharedKey"
+            }
+          },
+          "202": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections/{virtualNetworkGatewayConnectionName}/sharedkey": {
+      "put": {
+        "tags": [
+          "VirtualNetworkGatewayConnections"
+        ],
+        "operationId": "VirtualNetworkGatewayConnections_SetSharedKey",
+        "description": "The Put VirtualNetworkGatewayConnectionSharedKey operation sets the virtual network gateway connection shared key for passed virtual network gateway connection in the specified resource group through Network resource provider.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "virtualNetworkGatewayConnectionName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The virtual network gateway connection name."
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/ConnectionSharedKey"
+            },
+            "description": "Parameters supplied to the Begin Set Virtual Network Gateway conection Shared key operation throughNetwork resource provider."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/ConnectionSharedKey"
+            }
+          },
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/ConnectionSharedKey"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualnetworkgateways/{virtualNetworkGatewayName}": {
+      "put": {
+        "tags": [
+          "VirtualNetworkGateways"
+        ],
+        "operationId": "VirtualNetworkGateways_CreateOrUpdate",
+        "description": "The Put VirtualNetworkGateway operation creates/updates a virtual network gateway in the specified resource group through Network resource provider.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "virtualNetworkGatewayName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual network gateway."
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/VirtualNetworkGateway"
+            },
+            "description": "Parameters supplied to the Begin Create or update Virtual Network Gateway operation through Network resource provider."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/VirtualNetworkGateway"
+            }
+          },
+          "201": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/VirtualNetworkGateway"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      },
+      "get": {
+        "tags": [
+          "VirtualNetworkGateways"
+        ],
+        "operationId": "VirtualNetworkGateways_Get",
+        "description": "The Get VirtualNetworkGateway operation retrieves information about the specified virtual network gateway through Network resource provider.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "virtualNetworkGatewayName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual network gateway."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/VirtualNetworkGateway"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "VirtualNetworkGateways"
+        ],
+        "operationId": "VirtualNetworkGateways_Delete",
+        "description": "The Delete VirtualNetworkGateway operation deletes the specifed virtual network Gateway through Network resource provider.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "virtualNetworkGatewayName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual network gateway."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": ""
+          },
+          "202": {
+            "description": ""
+          },
+          "200": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways": {
+      "get": {
+        "tags": [
+          "VirtualNetworkGateways"
+        ],
+        "operationId": "VirtualNetworkGateways_List",
+        "description": "The List VirtualNetworkGateways opertion retrieves all the virtual network gateways stored.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/VirtualNetworkGatewayListResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualnetworkgateways/{virtualNetworkGatewayName}/reset": {
+      "post": {
+        "tags": [
+          "VirtualNetworkGateways"
+        ],
+        "operationId": "VirtualNetworkGateways_Reset",
+        "description": "The Reset VirtualNetworkGateway operation resets the primary of the virtual network gateway in the specified resource group through Network resource provider.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "virtualNetworkGatewayName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual network gateway."
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/VirtualNetworkGateway"
+            },
+            "description": "Parameters supplied to the Begin Reset Virtual Network Gateway operation through Network resource provider."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": ""
+          },
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/VirtualNetworkGateway"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualnetworkgateways/{virtualNetworkGatewayName}/generatevpnclientpackage": {
+      "post": {
+        "tags": [
+          "VirtualNetworkGateways"
+        ],
+        "operationId": "VirtualNetworkGateways_Generatevpnclientpackage",
+        "description": "The Generatevpnclientpackage operation generates Vpn client package for P2S client of the virtual network gateway in the specified resource group through Network resource provider.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "virtualNetworkGatewayName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual network gateway."
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/VpnClientParameters"
+            },
+            "description": "Parameters supplied to the Begin Generating  Virtual Network Gateway Vpn client package operation through Network resource provider."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": "Vpn client package url",
+            "schema": {
+              "type": "string"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualnetworks/{virtualNetworkName}": {
+      "delete": {
+        "tags": [
+          "VirtualNetworks"
+        ],
+        "operationId": "VirtualNetworks_Delete",
+        "description": "The Delete VirtualNetwork operation deletes the specifed virtual network",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "virtualNetworkName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual network."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": ""
+          },
+          "204": {
+            "description": ""
+          },
+          "200": {
+            "description": ""
+          }
+        },
+        "x-ms-long-running-operation": true
+      },
+      "get": {
+        "tags": [
+          "VirtualNetworks"
+        ],
+        "operationId": "VirtualNetworks_Get",
+        "description": "The Get VirtualNetwork operation retrieves information about the specified virtual network.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "virtualNetworkName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual network."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "name": "$expand",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "expand references resources."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/VirtualNetwork"
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "VirtualNetworks"
+        ],
+        "operationId": "VirtualNetworks_CreateOrUpdate",
+        "description": "The Put VirtualNetwork operation creates/updates a virtual network in the specified resource group.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "virtualNetworkName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the virtual network."
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/VirtualNetwork"
+            },
+            "description": "Parameters supplied to the create/update Virtual Network operation"
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/VirtualNetwork"
+            }
+          },
+          "201": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/VirtualNetwork"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Network/virtualnetworks": {
+      "get": {
+        "tags": [
+          "VirtualNetworks"
+        ],
+        "operationId": "VirtualNetworks_ListAll",
+        "description": "The list VirtualNetwork returns all Virtual Networks in a subscription",
+        "parameters": [
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/VirtualNetworkListResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualnetworks": {
+      "get": {
+        "tags": [
+          "VirtualNetworks"
+        ],
+        "operationId": "VirtualNetworks_List",
+        "description": "The list VirtualNetwork returns all Virtual Networks in a resource group",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/VirtualNetworkListResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/CheckDnsNameAvailability": {
+      "get": {
+        "operationId": "CheckDnsNameAvailability",
+        "description": "Checks whether a domain name in the cloudapp.net zone is available for use.",
+        "parameters": [
+          {
+            "name": "location",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The location of the domain name"
+          },
+          {
+            "name": "domainNameLabel",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "The domain name to be verified. It must conform to the following regular expression: ^[a-z][a-z0-9-]{1,61}[a-z0-9]$."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/DnsNameAvailabilityResult"
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {
+    "ApplicationGatewaySku": {
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Gets or sets name of application gateway SKU",
+          "enum": [
+            "Standard_Small",
+            "Standard_Medium",
+            "Standard_Large"
+          ],
+          "x-ms-enum": {
+            "name": "ApplicationGatewaySkuName",
+            "modelAsString": true
+          }
+        },
+        "tier": {
+          "type": "string",
+          "description": "Gets or sets tier of application gateway",
+          "enum": [
+            "Standard"
+          ],
+          "x-ms-enum": {
+            "name": "ApplicationGatewayTier",
+            "modelAsString": true
+          }
+        },
+        "capacity": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or sets capacity (instance count) of application gateway"
+        }
+      },
+      "description": "SKU of application gateway"
+    },
+    "ApplicationGatewayIPConfigurationPropertiesFormat": {
+      "properties": {
+        "subnet": {
+          "$ref": "#/definitions/SubResource",
+          "description": "Gets or sets the reference of the subnet resource.A subnet from where appliation gateway gets its private address "
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the application gateway subnet resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Properties of IP configuration of application gateway"
+    },
+    "ApplicationGatewayIPConfiguration": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/ApplicationGatewayIPConfigurationPropertiesFormat"
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/SubResource"
+        }
+      ],
+      "description": "IP configuration of application gateway"
+    },
+    "ApplicationGatewaySslCertificatePropertiesFormat": {
+      "properties": {
+        "data": {
+          "type": "string",
+          "description": "Gets or sets the certificate data "
+        },
+        "password": {
+          "type": "string",
+          "description": "Gets or sets the certificate password "
+        },
+        "publicCertData": {
+          "type": "string",
+          "description": "Gets or sets the certificate public data "
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the ssl certificate resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Properties of SSL certificates of application gateway"
+    },
+    "ApplicationGatewaySslCertificate": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/ApplicationGatewaySslCertificatePropertiesFormat"
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/SubResource"
+        }
+      ],
+      "description": "SSL certificates of application gateway"
+    },
+    "ApplicationGatewayFrontendIPConfigurationPropertiesFormat": {
+      "properties": {
+        "privateIPAddress": {
+          "type": "string",
+          "description": "Gets or sets the privateIPAddress of the Network Interface IP Configuration"
+        },
+        "privateIPAllocationMethod": {
+          "type": "string",
+          "description": "Gets or sets PrivateIP allocation method (Static/Dynamic)",
+          "enum": [
+            "Static",
+            "Dynamic"
+          ],
+          "x-ms-enum": {
+            "name": "IPAllocationMethod",
+            "modelAsString": true
+          }
+        },
+        "subnet": {
+          "$ref": "#/definitions/SubResource",
+          "description": "Gets or sets the reference of the subnet resource"
+        },
+        "publicIPAddress": {
+          "$ref": "#/definitions/SubResource",
+          "description": "Gets or sets the reference of the PublicIP resource"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the PublicIP resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Properties of Frontend IP configuration of application gateway"
+    },
+    "ApplicationGatewayFrontendIPConfiguration": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/ApplicationGatewayFrontendIPConfigurationPropertiesFormat"
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/SubResource"
+        }
+      ],
+      "description": "Frontend IP configuration of application gateway"
+    },
+    "ApplicationGatewayFrontendPortPropertiesFormat": {
+      "properties": {
+        "port": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or sets the frontend port"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the frontend port resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Properties of Frontend Port of application gateway"
+    },
+    "ApplicationGatewayFrontendPort": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/ApplicationGatewayFrontendPortPropertiesFormat"
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/SubResource"
+        }
+      ],
+      "description": "Frontend Port of application gateway"
+    },
+    "ApplicationGatewayBackendAddress": {
+      "properties": {
+        "fqdn": {
+          "type": "string",
+          "description": "Gets or sets the dns name"
+        },
+        "ipAddress": {
+          "type": "string",
+          "description": "Gets or sets the ip address"
+        }
+      },
+      "description": "Backend Address of application gateway"
+    },
+    "ApplicationGatewayBackendAddressPoolPropertiesFormat": {
+      "properties": {
+        "backendIPConfigurations": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/NetworkInterfaceIPConfiguration"
+          },
+          "description": "Gets collection of references to IPs defined in NICs"
+        },
+        "backendAddresses": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ApplicationGatewayBackendAddress"
+          },
+          "description": "Gets or sets the backend addresses"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the backend address pool resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Properties of Backend Address Pool of application gateway"
+    },
+    "ApplicationGatewayBackendAddressPool": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/ApplicationGatewayBackendAddressPoolPropertiesFormat"
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/SubResource"
+        }
+      ],
+      "description": "Backend Address Pool of application gateway"
+    },
+    "ApplicationGatewayBackendHttpSettingsPropertiesFormat": {
+      "properties": {
+        "port": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or sets the port"
+        },
+        "protocol": {
+          "type": "string",
+          "description": "Gets or sets the protocol",
+          "enum": [
+            "Http",
+            "Https"
+          ],
+          "x-ms-enum": {
+            "name": "ApplicationGatewayProtocol",
+            "modelAsString": true
+          }
+        },
+        "cookieBasedAffinity": {
+          "type": "string",
+          "description": "Gets or sets the cookie affinity",
+          "enum": [
+            "Enabled",
+            "Disabled"
+          ],
+          "x-ms-enum": {
+            "name": "ApplicationGatewayCookieBasedAffinity",
+            "modelAsString": true
+          }
+        },
+        "requestTimeout": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or sets request timeout"
+        },
+        "probe": {
+          "$ref": "#/definitions/SubResource",
+          "description": "Gets or sets probe resource of application gateway "
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the backend http settings resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Properties of Backend address pool settings of application gateway"
+    },
+    "ApplicationGatewayBackendHttpSettings": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/ApplicationGatewayBackendHttpSettingsPropertiesFormat"
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/SubResource"
+        }
+      ],
+      "description": "Backend address pool settings of application gateway"
+    },
+    "ApplicationGatewayHttpListenerPropertiesFormat": {
+      "properties": {
+        "frontendIPConfiguration": {
+          "$ref": "#/definitions/SubResource",
+          "description": "Gets or sets frontend IP configuration resource of application gateway "
+        },
+        "frontendPort": {
+          "$ref": "#/definitions/SubResource",
+          "description": "Gets or sets frontend port resource of application gateway "
+        },
+        "protocol": {
+          "type": "string",
+          "description": "Gets or sets the protocol",
+          "enum": [
+            "Http",
+            "Https"
+          ],
+          "x-ms-enum": {
+            "name": "ApplicationGatewayProtocol",
+            "modelAsString": true
+          }
+        },
+        "hostName": {
+          "type": "string",
+          "description": "Gets or sets the host name of http listener "
+        },
+        "sslCertificate": {
+          "$ref": "#/definitions/SubResource",
+          "description": "Gets or sets ssl certificate resource of application gateway "
+        },
+        "requireServerNameIndication": {
+          "type": "boolean",
+          "description": "Gets or sets the requireServerNameIndication of http listener "
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the http listener resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Properties of Http listener of application gateway"
+    },
+    "ApplicationGatewayHttpListener": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/ApplicationGatewayHttpListenerPropertiesFormat"
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/SubResource"
+        }
+      ],
+      "description": "Http listener of application gateway"
+    },
+    "ApplicationGatewayPathRulePropertiesFormat": {
+      "properties": {
+        "paths": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "Gets or sets the path rules of URL path map"
+        },
+        "backendAddressPool": {
+          "$ref": "#/definitions/SubResource",
+          "description": "Gets or sets backend address pool resource of URL path map "
+        },
+        "backendHttpSettings": {
+          "$ref": "#/definitions/SubResource",
+          "description": "Gets or sets backend http settings resource of URL path map "
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets path rule of URL path map resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Properties of probe of application gateway"
+    },
+    "ApplicationGatewayPathRule": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/ApplicationGatewayPathRulePropertiesFormat"
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/SubResource"
+        }
+      ],
+      "description": "Path rule of URL path map of application gateway"
+    },
+    "ApplicationGatewayProbePropertiesFormat": {
+      "properties": {
+        "protocol": {
+          "type": "string",
+          "description": "Gets or sets the protocol",
+          "enum": [
+            "Http",
+            "Https"
+          ],
+          "x-ms-enum": {
+            "name": "ApplicationGatewayProtocol",
+            "modelAsString": true
+          }
+        },
+        "host": {
+          "type": "string",
+          "description": "Gets or sets the host to send probe to "
+        },
+        "path": {
+          "type": "string",
+          "description": "Gets or sets the relative path of probe "
+        },
+        "interval": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or sets probing interval in seconds "
+        },
+        "timeout": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or sets probing timeout in seconds "
+        },
+        "unhealthyThreshold": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or sets probing unhealthy threshold "
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the backend http settings resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Properties of probe of application gateway"
+    },
+    "ApplicationGatewayProbe": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/ApplicationGatewayProbePropertiesFormat"
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/SubResource"
+        }
+      ],
+      "description": "Probe of application gateway"
+    },
+    "ApplicationGatewayRequestRoutingRulePropertiesFormat": {
+      "properties": {
+        "ruleType": {
+          "type": "string",
+          "description": "Gets or sets the rule type",
+          "enum": [
+            "Basic",
+            "PathBasedRouting"
+          ],
+          "x-ms-enum": {
+            "name": "ApplicationGatewayRequestRoutingRuleType",
+            "modelAsString": true
+          }
+        },
+        "backendAddressPool": {
+          "$ref": "#/definitions/SubResource",
+          "description": "Gets or sets backend address pool resource of application gateway "
+        },
+        "backendHttpSettings": {
+          "$ref": "#/definitions/SubResource",
+          "description": "Gets or sets frontend port resource of application gateway "
+        },
+        "httpListener": {
+          "$ref": "#/definitions/SubResource",
+          "description": "Gets or sets http listener resource of application gateway "
+        },
+        "urlPathMap": {
+          "$ref": "#/definitions/SubResource",
+          "description": "Gets or sets url path map resource of application gateway "
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the request routing rule resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Properties of Request routing rule of application gateway"
+    },
+    "ApplicationGatewayRequestRoutingRule": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/ApplicationGatewayRequestRoutingRulePropertiesFormat"
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/SubResource"
+        }
+      ],
+      "description": "Request routing rule of application gateway"
+    },
+    "ApplicationGatewayPropertiesFormat": {
+      "properties": {
+        "sku": {
+          "$ref": "#/definitions/ApplicationGatewaySku",
+          "description": "Gets or sets sku of application gateway resource"
+        },
+        "operationalState": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Gets operational state of application gateway resource",
+          "enum": [
+            "Stopped",
+            "Starting",
+            "Running",
+            "Stopping"
+          ],
+          "x-ms-enum": {
+            "name": "ApplicationGatewayOperationalState",
+            "modelAsString": true
+          }
+        },
+        "gatewayIPConfigurations": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ApplicationGatewayIPConfiguration"
+          },
+          "description": "Gets or sets subnets of application gateway resource"
+        },
+        "sslCertificates": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ApplicationGatewaySslCertificate"
+          },
+          "description": "Gets or sets ssl certificates of application gateway resource"
+        },
+        "frontendIPConfigurations": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ApplicationGatewayFrontendIPConfiguration"
+          },
+          "description": "Gets or sets frontend IP addresses of application gateway resource"
+        },
+        "frontendPorts": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ApplicationGatewayFrontendPort"
+          },
+          "description": "Gets or sets frontend ports of application gateway resource"
+        },
+        "probes": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ApplicationGatewayProbe"
+          },
+          "description": "Gets or sets probes of application gateway resource"
+        },
+        "backendAddressPools": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ApplicationGatewayBackendAddressPool"
+          },
+          "description": "Gets or sets backend address pool of application gateway resource"
+        },
+        "backendHttpSettingsCollection": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ApplicationGatewayBackendHttpSettings"
+          },
+          "description": "Gets or sets backend http settings of application gateway resource"
+        },
+        "httpListeners": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ApplicationGatewayHttpListener"
+          },
+          "description": "Gets or sets HTTP listeners of application gateway resource"
+        },
+        "urlPathMaps": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ApplicationGatewayUrlPathMap"
+          },
+          "description": "Gets or sets URL path map of application gateway resource"
+        },
+        "requestRoutingRules": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ApplicationGatewayRequestRoutingRule"
+          },
+          "description": "Gets or sets request routing rules of application gateway resource"
+        },
+        "resourceGuid": {
+          "type": "string",
+          "description": "Gets or sets resource guid property of the ApplicationGateway resource"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the ApplicationGateway resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Properties of Application Gateway"
+    },
+    "ApplicationGateway": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/ApplicationGatewayPropertiesFormat"
+        },
+        "etag": {
+          "type": "string",
+          "description": "Gets a unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "description": "ApplicationGateways resource"
+    },
+    "ApplicationGatewayListResult": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ApplicationGateway"
+          },
+          "description": "Gets a list of ApplicationGateways in a resource group"
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Gets the URL to get the next set of results."
+        }
+      },
+      "description": "Response for ListLoadBalancers Api service call"
+    },
+    "ApplicationGatewayUrlPathMapPropertiesFormat": {
+      "properties": {
+        "defaultBackendAddressPool": {
+          "$ref": "#/definitions/SubResource",
+          "description": "Gets or sets default backend address pool resource of URL path map "
+        },
+        "defaultBackendHttpSettings": {
+          "$ref": "#/definitions/SubResource",
+          "description": "Gets or sets default backend http settings resource of URL path map "
+        },
+        "pathRules": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ApplicationGatewayPathRule"
+          },
+          "description": "Gets or sets path rule of URL path map resource"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the backend http settings resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Properties of probe of application gateway"
+    },
+    "ApplicationGatewayUrlPathMap": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/ApplicationGatewayUrlPathMapPropertiesFormat"
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/SubResource"
+        }
+      ],
+      "description": "UrlPathMap of application gateway"
+    },
+    "AuthorizationPropertiesFormat": {
+      "properties": {
+        "authorizationKey": {
+          "type": "string",
+          "description": "Gets or sets the authorization key"
+        },
+        "authorizationUseStatus": {
+          "type": "string",
+          "description": "Gets or sets AuthorizationUseStatus",
+          "enum": [
+            "Available",
+            "InUse"
+          ],
+          "x-ms-enum": {
+            "name": "AuthorizationUseStatus",
+            "modelAsString": true
+          }
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the PublicIP resource Updating/Deleting/Failed"
+        }
+      }
+    },
+    "ExpressRouteCircuitAuthorization": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/AuthorizationPropertiesFormat"
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/SubResource"
+        }
+      ],
+      "description": "Authorization in a ExpressRouteCircuit resource"
+    },
+    "AuthorizationListResult": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ExpressRouteCircuitAuthorization"
+          },
+          "description": "Gets the authorizations in an ExpressRoute Circuit"
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Gets the URL to get the next set of results."
+        }
+      },
+      "description": "Response for ListAuthorizations Api service callRetrieves all authorizations that belongs to an ExpressRouteCircuit"
+    },
+    "ExpressRouteCircuitPeeringConfig": {
+      "properties": {
+        "advertisedPublicPrefixes": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "Gets or sets the reference of AdvertisedPublicPrefixes"
+        },
+        "advertisedPublicPrefixesState": {
+          "type": "string",
+          "description": "Gets or sets AdvertisedPublicPrefixState of the Peering resource ",
+          "enum": [
+            "NotConfigured",
+            "Configuring",
+            "Configured",
+            "ValidationNeeded"
+          ],
+          "x-ms-enum": {
+            "name": "ExpressRouteCircuitPeeringAdvertisedPublicPrefixState",
+            "modelAsString": true
+          }
+        },
+        "customerASN": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or Sets CustomerAsn of the peering."
+        },
+        "routingRegistryName": {
+          "type": "string",
+          "description": "Gets or Sets RoutingRegistryName of the config."
+        }
+      },
+      "description": "Specfies the peering config"
+    },
+    "ExpressRouteCircuitStats": {
+      "properties": {
+        "primarybytesIn": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Gets BytesIn of the peering."
+        },
+        "primarybytesOut": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Gets BytesOut of the peering."
+        },
+        "secondarybytesIn": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Gets BytesIn of the peering."
+        },
+        "secondarybytesOut": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Gets BytesOut of the peering."
+        }
+      },
+      "description": "Contains Stats associated with the peering"
+    },
+    "ExpressRouteCircuitPeeringPropertiesFormat": {
+      "properties": {
+        "peeringType": {
+          "type": "string",
+          "description": "Gets or sets PeeringType",
+          "enum": [
+            "AzurePublicPeering",
+            "AzurePrivatePeering",
+            "MicrosoftPeering"
+          ],
+          "x-ms-enum": {
+            "name": "ExpressRouteCircuitPeeringType",
+            "modelAsString": true
+          }
+        },
+        "state": {
+          "type": "string",
+          "description": "Gets or sets state of Peering",
+          "enum": [
+            "Disabled",
+            "Enabled"
+          ],
+          "x-ms-enum": {
+            "name": "ExpressRouteCircuitPeeringState",
+            "modelAsString": true
+          }
+        },
+        "azureASN": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or sets the azure ASN"
+        },
+        "peerASN": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or sets the peer ASN"
+        },
+        "primaryPeerAddressPrefix": {
+          "type": "string",
+          "description": "Gets or sets the primary address prefix"
+        },
+        "secondaryPeerAddressPrefix": {
+          "type": "string",
+          "description": "Gets or sets the secondary address prefix"
+        },
+        "primaryAzurePort": {
+          "type": "string",
+          "description": "Gets or sets the primary port"
+        },
+        "secondaryAzurePort": {
+          "type": "string",
+          "description": "Gets or sets the secondary port"
+        },
+        "sharedKey": {
+          "type": "string",
+          "description": "Gets or sets the shared key"
+        },
+        "vlanId": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or sets the vlan id"
+        },
+        "microsoftPeeringConfig": {
+          "$ref": "#/definitions/ExpressRouteCircuitPeeringConfig",
+          "description": "Gets or sets the mircosoft peering config"
+        },
+        "stats": {
+          "$ref": "#/definitions/ExpressRouteCircuitStats",
+          "description": "Gets or peering stats"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the PublicIP resource Updating/Deleting/Failed"
+        }
+      }
+    },
+    "ExpressRouteCircuitPeering": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/ExpressRouteCircuitPeeringPropertiesFormat"
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/SubResource"
+        }
+      ],
+      "description": "Peering in a ExpressRouteCircuit resource"
+    },
+    "ExpressRouteCircuitPeeringListResult": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ExpressRouteCircuitPeering"
+          },
+          "description": "Gets the peerings in an express route circuit"
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Gets the URL to get the next set of results."
+        }
+      },
+      "description": "Response for ListPeering Api service callRetrieves all Peerings that belongs to an ExpressRouteCircuit"
+    },
+    "ExpressRouteCircuitSku": {
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Gets or sets name of the sku."
+        },
+        "tier": {
+          "type": "string",
+          "description": "Gets or sets tier of the sku.",
+          "enum": [
+            "Standard",
+            "Premium"
+          ],
+          "x-ms-enum": {
+            "name": "ExpressRouteCircuitSkuTier",
+            "modelAsString": true
+          }
+        },
+        "family": {
+          "type": "string",
+          "description": "Gets or sets family of the sku.",
+          "enum": [
+            "UnlimitedData",
+            "MeteredData"
+          ],
+          "x-ms-enum": {
+            "name": "ExpressRouteCircuitSkuFamily",
+            "modelAsString": true
+          }
+        }
+      },
+      "description": "Contains sku in an ExpressRouteCircuit"
+    },
+    "ExpressRouteCircuitServiceProviderProperties": {
+      "properties": {
+        "serviceProviderName": {
+          "type": "string",
+          "description": "Gets or sets serviceProviderName."
+        },
+        "peeringLocation": {
+          "type": "string",
+          "description": "Gets or sets peering location."
+        },
+        "bandwidthInMbps": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or sets BandwidthInMbps."
+        }
+      },
+      "description": "Contains ServiceProviderProperties in an ExpressRouteCircuit"
+    },
+    "ExpressRouteCircuitPropertiesFormat": {
+      "properties": {
+        "allowClassicOperations": {
+          "type": "boolean",
+          "description": "allow classic operations"
+        },
+        "circuitProvisioningState": {
+          "type": "string",
+          "description": "Gets or sets CircuitProvisioningState state of the resource "
+        },
+        "serviceProviderProvisioningState": {
+          "type": "string",
+          "description": "Gets or sets ServiceProviderProvisioningState state of the resource ",
+          "enum": [
+            "NotProvisioned",
+            "Provisioning",
+            "Provisioned",
+            "Deprovisioning"
+          ],
+          "x-ms-enum": {
+            "name": "ServiceProviderProvisioningState",
+            "modelAsString": true
+          }
+        },
+        "authorizations": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ExpressRouteCircuitAuthorization"
+          },
+          "description": "Gets or sets list of authorizations"
+        },
+        "peerings": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ExpressRouteCircuitPeering"
+          },
+          "description": "Gets or sets list of peerings"
+        },
+        "serviceKey": {
+          "type": "string",
+          "description": "Gets or sets ServiceKey"
+        },
+        "serviceProviderNotes": {
+          "type": "string",
+          "description": "Gets or sets ServiceProviderNotes"
+        },
+        "serviceProviderProperties": {
+          "$ref": "#/definitions/ExpressRouteCircuitServiceProviderProperties",
+          "description": "Gets or sets ServiceProviderProperties"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the PublicIP resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Properties of ExpressRouteCircuit"
+    },
+    "ExpressRouteCircuit": {
+      "properties": {
+        "sku": {
+          "$ref": "#/definitions/ExpressRouteCircuitSku",
+          "description": "Gets or sets sku"
+        },
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/ExpressRouteCircuitPropertiesFormat"
+        },
+        "etag": {
+          "type": "string",
+          "description": "Gets a unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "description": "ExpressRouteCircuit resource"
+    },
+    "ExpressRouteCircuitArpTable": {
+      "properties": {
+        "age": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Age."
+        },
+        "interface": {
+          "type": "string",
+          "description": "Interface."
+        },
+        "ipAddress": {
+          "type": "string",
+          "description": "Gets ipAddress."
+        },
+        "macAddress": {
+          "type": "string",
+          "description": "Gets macAddress."
+        }
+      },
+      "description": "The arp table associated with the ExpressRouteCircuit"
+    },
+    "ExpressRouteCircuitsArpTableListResult": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ExpressRouteCircuitArpTable"
+          },
+          "description": "Gets List of ArpTable"
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Gets the URL to get the next set of results."
+        }
+      },
+      "description": "Response for ListArpTable associated with the Express Route Circuits Api"
+    },
+    "ExpressRouteCircuitRoutesTable": {
+      "properties": {
+        "network": {
+          "type": "string",
+          "description": "network."
+        },
+        "nextHop": {
+          "type": "string",
+          "description": "nextHop"
+        },
+        "locPrf": {
+          "type": "string",
+          "description": "locPrf."
+        },
+        "weight": {
+          "type": "integer",
+          "format": "int32",
+          "description": "weight."
+        },
+        "path": {
+          "type": "string",
+          "description": "path ."
+        }
+      },
+      "required": [
+        "nextHopType"
+      ],
+      "description": "The routes table associated with the ExpressRouteCircuit"
+    },
+    "ExpressRouteCircuitsRoutesTableListResult": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ExpressRouteCircuitRoutesTable"
+          },
+          "description": "Gets List of RoutesTable"
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Gets the URL to get the next set of results."
+        }
+      },
+      "description": "Response for ListRoutesTable associated with the Express Route Circuits Api"
+    },
+    "ExpressRouteCircuitRoutesTableSummary": {
+      "properties": {
+        "neighbor": {
+          "type": "string",
+          "description": "Neighbor."
+        },
+        "v": {
+          "type": "integer",
+          "format": "int32",
+          "description": "BGP version number spoken to the neighbor."
+        },
+        "as": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Autonomous system number."
+        },
+        "upDown": {
+          "type": "string",
+          "description": "The length of time that the BGP session has been in the Established state, or the current status if not in the Established state."
+        },
+        "statePfxRcd": {
+          "type": "string",
+          "description": "Current state of the BGP session, and the number of prefixes that have been received from a neighbor or peer group."
+        }
+      },
+      "required": [
+        "nextHopType"
+      ],
+      "description": "The routes table associated with the ExpressRouteCircuit"
+    },
+    "ExpressRouteCircuitsRoutesTableSummaryListResult": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ExpressRouteCircuitRoutesTableSummary"
+          },
+          "description": "Gets List of RoutesTable"
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Gets the URL to get the next set of results."
+        }
+      },
+      "description": "Response for ListRoutesTable associated with the Express Route Circuits Api"
+    },
+    "ExpressRouteCircuitListResult": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ExpressRouteCircuit"
+          },
+          "description": "Gets a list of ExpressRouteCircuits in a resource group"
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Gets the URL to get the next set of results."
+        }
+      },
+      "description": "Response for ListExpressRouteCircuit Api service call"
+    },
+    "ExpressRouteServiceProviderBandwidthsOffered": {
+      "properties": {
+        "offerName": {
+          "type": "string",
+          "description": "Gets the OfferName"
+        },
+        "valueInMbps": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets the ValueInMbps."
+        }
+      },
+      "description": "Contains Bandwidths offered in ExpressRouteServiceProviders"
+    },
+    "ExpressRouteServiceProviderPropertiesFormat": {
+      "properties": {
+        "peeringLocations": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "Gets or list of peering locations"
+        },
+        "bandwidthsOffered": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ExpressRouteServiceProviderBandwidthsOffered"
+          },
+          "description": "Gets or bandwidths offered"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the resource "
+        }
+      },
+      "description": "Properties of ExpressRouteServiceProvider"
+    },
+    "ExpressRouteServiceProvider": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/ExpressRouteServiceProviderPropertiesFormat"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "description": "ExpressRouteResourceProvider object"
+    },
+    "ExpressRouteServiceProviderListResult": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ExpressRouteServiceProvider"
+          },
+          "description": "Gets List of ExpressRouteResourceProvider"
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Gets the URL to get the next set of results."
+        }
+      },
+      "description": "Response for ListExpressRouteServiceProvider Api service call"
+    },
+    "FrontendIPConfigurationPropertiesFormat": {
+      "properties": {
+        "inboundNatRules": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/SubResource"
+          },
+          "description": "Read only.Inbound rules URIs that use this frontend IP"
+        },
+        "inboundNatPools": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/SubResource"
+          },
+          "description": "Read only.Inbound pools URIs that use this frontend IP"
+        },
+        "outboundNatRules": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/SubResource"
+          },
+          "description": "Read only.Outbound rules URIs that use this frontend IP"
+        },
+        "loadBalancingRules": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/SubResource"
+          },
+          "description": "Gets Load Balancing rules URIs that use this frontend IP"
+        },
+        "privateIPAddress": {
+          "type": "string",
+          "description": "Gets or sets the privateIPAddress of the IP Configuration"
+        },
+        "privateIPAllocationMethod": {
+          "type": "string",
+          "description": "Gets or sets PrivateIP allocation method (Static/Dynamic)",
+          "enum": [
+            "Static",
+            "Dynamic"
+          ],
+          "x-ms-enum": {
+            "name": "IPAllocationMethod",
+            "modelAsString": true
+          }
+        },
+        "subnet": {
+          "$ref": "#/definitions/Subnet",
+          "description": "Gets or sets the reference of the subnet resource"
+        },
+        "publicIPAddress": {
+          "$ref": "#/definitions/PublicIPAddress",
+          "description": "Gets or sets the reference of the PublicIP resource"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the PublicIP resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Properties of Frontend IP Configuration of the load balancer"
+    },
+    "FrontendIPConfiguration": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/FrontendIPConfigurationPropertiesFormat"
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/SubResource"
+        }
+      ],
+      "description": "Frontend IP address of the load balancer"
+    },
+    "BackendAddressPoolPropertiesFormat": {
+      "properties": {
+        "backendIPConfigurations": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/NetworkInterfaceIPConfiguration"
+          },
+          "description": "Gets collection of references to IPs defined in NICs"
+        },
+        "loadBalancingRules": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/SubResource"
+          },
+          "description": "Gets Load Balancing rules that use this Backend Address Pool"
+        },
+        "outboundNatRule": {
+          "$ref": "#/definitions/SubResource",
+          "description": "Gets outbound rules that use this Backend Address Pool"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Provisioning state of the PublicIP resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Properties of BackendAddressPool"
+    },
+    "BackendAddressPool": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/BackendAddressPoolPropertiesFormat"
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/SubResource"
+        }
+      ],
+      "description": "Pool of backend IP addresseses"
+    },
+    "LoadBalancingRulePropertiesFormat": {
+      "properties": {
+        "frontendIPConfiguration": {
+          "$ref": "#/definitions/SubResource",
+          "description": "Gets or sets a reference to frontend IP Addresses"
+        },
+        "backendAddressPool": {
+          "$ref": "#/definitions/SubResource",
+          "description": "Gets or sets  a reference to a pool of DIPs. Inbound traffic is randomly load balanced across IPs in the backend IPs"
+        },
+        "probe": {
+          "$ref": "#/definitions/SubResource",
+          "description": "Gets or sets the reference of the load balancer probe used by the Load Balancing rule."
+        },
+        "protocol": {
+          "type": "string",
+          "description": "Gets or sets the transport protocol for the external endpoint. Possible values are Udp or Tcp",
+          "enum": [
+            "Udp",
+            "Tcp"
+          ],
+          "x-ms-enum": {
+            "name": "TransportProtocol",
+            "modelAsString": true
+          }
+        },
+        "loadDistribution": {
+          "type": "string",
+          "description": "Gets or sets the load distribution policy for this rule",
+          "enum": [
+            "Default",
+            "SourceIP",
+            "SourceIPProtocol"
+          ],
+          "x-ms-enum": {
+            "name": "LoadDistribution",
+            "modelAsString": true
+          }
+        },
+        "frontendPort": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or sets the port for the external endpoint. You can specify any port number you choose, but the port numbers specified for each role in the service must be unique. Possible values range between 1 and 65535, inclusive"
+        },
+        "backendPort": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or sets a port used for internal connections on the endpoint. The localPort attribute maps the eternal port of the endpoint to an internal port on a role. This is useful in scenarios where a role must communicate to an internal compotnent on a port that is different from the one that is exposed externally. If not specified, the value of localPort is the same as the port attribute. Set the value of localPort to '*' to automatically assign an unallocated port that is discoverable using the runtime API"
+        },
+        "idleTimeoutInMinutes": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or sets the timeout for the Tcp idle connection. The value can be set between 4 and 30 minutes. The default value is 4 minutes. This emlement is only used when the protocol is set to Tcp"
+        },
+        "enableFloatingIP": {
+          "type": "boolean",
+          "description": "Configures a virtual machine's endpoint for the floating IP capability required to configure a SQL AlwaysOn availability Group. This setting is required when using the SQL Always ON availability Groups in SQL server. This setting can't be changed after you create the endpoint"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the PublicIP resource Updating/Deleting/Failed"
+        }
+      },
+      "required": [
+        "protocol",
+        "frontendPort"
+      ],
+      "description": "Properties of the load balancer"
+    },
+    "LoadBalancingRule": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/LoadBalancingRulePropertiesFormat"
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/SubResource"
+        }
+      ],
+      "description": "Rules of the load balancer"
+    },
+    "ProbePropertiesFormat": {
+      "properties": {
+        "loadBalancingRules": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/SubResource"
+          },
+          "description": "Gets Load balancer rules that use this probe"
+        },
+        "protocol": {
+          "type": "string",
+          "description": "Gets or sets the protocol of the end point. Possible values are http pr Tcp. If Tcp is specified, a received ACK is required for the probe to be successful. If http is specified,a 200 OK response from the specifies URI is required for the probe to be successful",
+          "enum": [
+            "Http",
+            "Tcp"
+          ],
+          "x-ms-enum": {
+            "name": "ProbeProtocol",
+            "modelAsString": true
+          }
+        },
+        "port": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or sets Port for communicating the probe. Possible values range from 1 to 65535, inclusive."
+        },
+        "intervalInSeconds": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or sets the interval, in seconds, for how frequently to probe the endpoint for health status. Typically, the interval is slightly less than half the allocated timeout period (in seconds) which allows two full probes before taking the instance out of rotation. The default value is 15, the minimum value is 5"
+        },
+        "numberOfProbes": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or sets the number of probes where if no response, will result in stopping further traffic from being delivered to the endpoint. This values allows endponints to be taken out of rotation faster or slower than the typical times used in Azure. "
+        },
+        "requestPath": {
+          "type": "string",
+          "description": "Gets or sets the URI used for requesting health status from the VM. Path is required if a protocol is set to http. Otherwise, it is not allowed. There is no default value"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the PublicIP resource Updating/Deleting/Failed"
+        }
+      },
+      "required": [
+        "protocol",
+        "port"
+      ]
+    },
+    "Probe": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/ProbePropertiesFormat"
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/SubResource"
+        }
+      ],
+      "description": "Load balancer Probe"
+    },
+    "InboundNatRulePropertiesFormat": {
+      "properties": {
+        "frontendIPConfiguration": {
+          "$ref": "#/definitions/SubResource",
+          "description": "Gets or sets a reference to frontend IP Addresses"
+        },
+        "backendIPConfiguration": {
+          "$ref": "#/definitions/NetworkInterfaceIPConfiguration",
+          "description": "Gets or sets a reference to a private ip address defined on a NetworkInterface of a VM. Traffic sent to frontendPort of each of the frontendIPConfigurations is forwarded to the backed IP"
+        },
+        "protocol": {
+          "type": "string",
+          "description": "Gets or sets the transport potocol for the external endpoint. Possible values are Udp or Tcp",
+          "enum": [
+            "Udp",
+            "Tcp"
+          ],
+          "x-ms-enum": {
+            "name": "TransportProtocol",
+            "modelAsString": true
+          }
+        },
+        "frontendPort": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or sets the port for the external endpoint. You can spcify any port number you choose, but the port numbers specified for each role in the service must be unique. Possible values range between 1 and 65535, inclusive"
+        },
+        "backendPort": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or sets a port used for internal connections on the endpoint. The localPort attribute maps the eternal port of the endpoint to an internal port on a role. This is useful in scenarios where a role must communicate to an internal compotnent on a port that is different from the one that is exposed externally. If not specified, the value of localPort is the same as the port attribute. Set the value of localPort to '*' to automatically assign an unallocated port that is discoverable using the runtime API"
+        },
+        "idleTimeoutInMinutes": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or sets the timeout for the Tcp idle connection. The value can be set between 4 and 30 minutes. The default value is 4 minutes. This emlement is only used when the protocol is set to Tcp"
+        },
+        "enableFloatingIP": {
+          "type": "boolean",
+          "description": "Configures a virtual machine's endpoint for the floating IP capability required to configure a SQL AlwaysOn availability Group. This setting is required when using the SQL Always ON availability Groups in SQL server. This setting can't be changed after you create the endpoint"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the PublicIP resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Properties of Inbound NAT rule"
+    },
+    "InboundNatRule": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/InboundNatRulePropertiesFormat"
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/SubResource"
+        }
+      ],
+      "description": "Inbound NAT rule of the loadbalancer"
+    },
+    "InboundNatPoolPropertiesFormat": {
+      "properties": {
+        "frontendIPConfiguration": {
+          "$ref": "#/definitions/SubResource",
+          "description": "Gets or sets a reference to frontend IP Addresses"
+        },
+        "protocol": {
+          "type": "string",
+          "description": "Gets or sets the transport potocol for the external endpoint. Possible values are Udp or Tcp",
+          "enum": [
+            "Udp",
+            "Tcp"
+          ],
+          "x-ms-enum": {
+            "name": "TransportProtocol",
+            "modelAsString": true
+          }
+        },
+        "frontendPortRangeStart": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or sets the starting port range for the NAT pool. You can spcify any port number you choose, but the port numbers specified for each role in the service must be unique. Possible values range between 1 and 65535, inclusive"
+        },
+        "frontendPortRangeEnd": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or sets the ending port range for the NAT pool. You can spcify any port number you choose, but the port numbers specified for each role in the service must be unique. Possible values range between 1 and 65535, inclusive"
+        },
+        "backendPort": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or sets a port used for internal connections on the endpoint. The localPort attribute maps the eternal port of the endpoint to an internal port on a role. This is useful in scenarios where a role must communicate to an internal compotnent on a port that is different from the one that is exposed externally. If not specified, the value of localPort is the same as the port attribute. Set the value of localPort to '*' to automatically assign an unallocated port that is discoverable using the runtime API"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the PublicIP resource Updating/Deleting/Failed"
+        }
+      },
+      "required": [
+        "protocol",
+        "frontendPortRangeStart",
+        "frontendPortRangeEnd",
+        "backendPort"
+      ],
+      "description": "Properties of Inbound NAT pool"
+    },
+    "InboundNatPool": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/InboundNatPoolPropertiesFormat"
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/SubResource"
+        }
+      ],
+      "description": "Inbound NAT pool of the loadbalancer"
+    },
+    "OutboundNatRulePropertiesFormat": {
+      "properties": {
+        "allocatedOutboundPorts": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or sets the number of outbound ports to be used for SNAT"
+        },
+        "frontendIPConfigurations": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/SubResource"
+          },
+          "description": "Gets or sets Frontend IP addresses of the load balancer"
+        },
+        "backendAddressPool": {
+          "$ref": "#/definitions/SubResource",
+          "description": "Gets or sets a reference to a pool of DIPs. Outbound traffic is randomly load balanced across IPs in the backend IPs"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the PublicIP resource Updating/Deleting/Failed"
+        }
+      },
+      "required": [
+        "backendAddressPool"
+      ],
+      "description": "Outbound NAT pool of the loadbalancer"
+    },
+    "OutboundNatRule": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/OutboundNatRulePropertiesFormat"
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/SubResource"
+        }
+      ],
+      "description": "Outbound NAT pool of the loadbalancer"
+    },
+    "LoadBalancerPropertiesFormat": {
+      "properties": {
+        "frontendIPConfigurations": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/FrontendIPConfiguration"
+          },
+          "description": "Gets or sets frontend IP addresses of the load balancer"
+        },
+        "backendAddressPools": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/BackendAddressPool"
+          },
+          "description": "Gets or sets Pools of backend IP addresseses"
+        },
+        "loadBalancingRules": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/LoadBalancingRule"
+          },
+          "description": "Gets or sets loadbalancing rules"
+        },
+        "probes": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Probe"
+          },
+          "description": "Gets or sets list of Load balancer probes"
+        },
+        "inboundNatRules": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/InboundNatRule"
+          },
+          "description": "Gets or sets list of inbound rules"
+        },
+        "inboundNatPools": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/InboundNatPool"
+          },
+          "description": "Gets or sets inbound NAT pools"
+        },
+        "outboundNatRules": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/OutboundNatRule"
+          },
+          "description": "Gets or sets outbound NAT rules"
+        },
+        "resourceGuid": {
+          "type": "string",
+          "description": "Gets or sets resource guid property of the Load balancer resource"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the PublicIP resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Properties of Load Balancer"
+    },
+    "LoadBalancer": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/LoadBalancerPropertiesFormat"
+        },
+        "etag": {
+          "type": "string",
+          "description": "Gets a unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "description": "LoadBalancer resource"
+    },
+    "LoadBalancerListResult": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/LoadBalancer"
+          },
+          "description": "Gets a list of LoadBalancers in a resource group"
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Gets the URL to get the next set of results."
+        }
+      },
+      "description": "Response for ListLoadBalancers Api service call"
+    },
+    "AddressSpace": {
+      "properties": {
+        "addressPrefixes": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "Gets or sets List of address blocks reserved for this virtual network in CIDR notation"
+        }
+      },
+      "description": "AddressSpace contains an array of IP address ranges that can be used by subnets"
+    },
+    "BgpSettings": {
+      "properties": {
+        "asn": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Gets or sets this BGP speaker's ASN"
+        },
+        "bgpPeeringAddress": {
+          "type": "string",
+          "description": "Gets or sets the BGP peering address and BGP identifier of this BGP speaker"
+        },
+        "peerWeight": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or sets the weight added to routes learned from this BGP speaker"
+        }
+      }
+    },
+    "LocalNetworkGatewayPropertiesFormat": {
+      "properties": {
+        "localNetworkAddressSpace": {
+          "$ref": "#/definitions/AddressSpace",
+          "description": "Local network site Address space"
+        },
+        "gatewayIpAddress": {
+          "type": "string",
+          "description": "IP address of local network gateway."
+        },
+        "bgpSettings": {
+          "$ref": "#/definitions/BgpSettings",
+          "description": "Local network gateway's BGP speaker settings"
+        },
+        "resourceGuid": {
+          "type": "string",
+          "description": "Gets or sets resource guid property of the LocalNetworkGateway resource"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the LocalNetworkGateway resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "LocalNetworkGateway properties"
+    },
+    "LocalNetworkGateway": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/LocalNetworkGatewayPropertiesFormat"
+        },
+        "etag": {
+          "type": "string",
+          "description": "Gets a unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "description": "A common class for general resource information"
+    },
+    "LocalNetworkGatewayListResult": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/LocalNetworkGateway"
+          },
+          "description": "Gets List of LocalNetworkGateways that exists in a resource group"
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Gets the URL to get the next set of results."
+        }
+      },
+      "description": "Response for ListLocalNetworkGateways Api service call"
+    },
+    "NetworkInterfaceIPConfigurationPropertiesFormat": {
+      "properties": {
+        "applicationGatewayBackendAddressPools": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ApplicationGatewayBackendAddressPool"
+          },
+          "description": "Gets or sets the reference of ApplicationGatewayBackendAddressPool resource"
+        },
+        "loadBalancerBackendAddressPools": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/BackendAddressPool"
+          },
+          "description": "Gets or sets the reference of LoadBalancerBackendAddressPool resource"
+        },
+        "loadBalancerInboundNatRules": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/InboundNatRule"
+          },
+          "description": "Gets or sets list of references of LoadBalancerInboundNatRules"
+        },
+        "privateIPAddress": {
+          "type": "string"
+        },
+        "privateIPAllocationMethod": {
+          "type": "string",
+          "description": "Gets or sets PrivateIP allocation method (Static/Dynamic)",
+          "enum": [
+            "Static",
+            "Dynamic"
+          ],
+          "x-ms-enum": {
+            "name": "IPAllocationMethod",
+            "modelAsString": true
+          }
+        },
+        "privateIPAddressVersion": {
+          "type": "string",
+          "description": "Gets or sets PrivateIP address version (IPv4/IPv6)",
+          "enum": [
+            "IPv4",
+            "IPv6"
+          ],
+          "x-ms-enum": {
+            "name": "IPVersion",
+            "modelAsString": true
+          }
+        },
+        "subnet": {
+          "$ref": "#/definitions/Subnet"
+        },
+        "publicIPAddress": {
+          "$ref": "#/definitions/PublicIPAddress"
+        },
+        "provisioningState": {
+          "type": "string"
+        }
+      },
+      "description": "Properties of IPConfiguration"
+    },
+    "NetworkInterfaceIPConfiguration": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/NetworkInterfaceIPConfigurationPropertiesFormat"
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/SubResource"
+        }
+      ],
+      "description": "IPConfiguration in a NetworkInterface"
+    },
+    "NetworkInterfaceDnsSettings": {
+      "properties": {
+        "dnsServers": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "Gets or sets list of DNS servers IP addresses"
+        },
+        "appliedDnsServers": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "Gets or sets list of Applied DNS servers IP addresses"
+        },
+        "internalDnsNameLabel": {
+          "type": "string",
+          "description": "Gets or sets the Internal DNS name"
+        },
+        "internalFqdn": {
+          "type": "string",
+          "description": "Gets or sets the internal fqdn."
+        },
+        "internalDomainNameSuffix": {
+          "type": "string",
+          "description": "Gets or sets internal domain name suffix of the NIC."
+        }
+      },
+      "description": "Dns Settings of a network interface"
+    },
+    "NetworkInterfacePropertiesFormat": {
+      "properties": {
+        "virtualMachine": {
+          "$ref": "#/definitions/SubResource",
+          "description": "Gets or sets the reference of a VirtualMachine"
+        },
+        "networkSecurityGroup": {
+          "$ref": "#/definitions/NetworkSecurityGroup",
+          "description": "Gets or sets the reference of the NetworkSecurityGroup resource"
+        },
+        "ipConfigurations": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/NetworkInterfaceIPConfiguration"
+          },
+          "description": "Gets or sets list of IPConfigurations of the NetworkInterface"
+        },
+        "dnsSettings": {
+          "$ref": "#/definitions/NetworkInterfaceDnsSettings",
+          "description": "Gets or sets DNS Settings in  NetworkInterface"
+        },
+        "macAddress": {
+          "type": "string",
+          "description": "Gets the MAC Address of the network interface"
+        },
+        "primary": {
+          "type": "boolean",
+          "description": "Gets whether this is a primary NIC on a virtual machine"
+        },
+        "enableIPForwarding": {
+          "type": "boolean",
+          "description": "Gets or sets whether IPForwarding is enabled on the NIC"
+        },
+        "resourceGuid": {
+          "type": "string",
+          "description": "Gets or sets resource guid property of the network interface resource"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the PublicIP resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "NetworkInterface properties. "
+    },
+    "NetworkInterface": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/NetworkInterfacePropertiesFormat"
+        },
+        "etag": {
+          "type": "string",
+          "description": "Gets a unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "description": "A NetworkInterface in a resource group"
+    },
+    "NetworkInterfaceListResult": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/NetworkInterface"
+          },
+          "description": "Gets or sets list of NetworkInterfaces in a resource group"
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Gets the URL to get the next set of results."
+        }
+      },
+      "description": "Response for ListNetworkInterface Api service call"
+    },
+    "SecurityRulePropertiesFormat": {
+      "properties": {
+        "description": {
+          "type": "string",
+          "description": "Gets or sets a description for this rule. Restricted to 140 chars."
+        },
+        "protocol": {
+          "type": "string",
+          "description": "Gets or sets Network protocol this rule applies to. Can be Tcp, Udp or All(*).",
+          "enum": [
+            "Tcp",
+            "Udp",
+            "*"
+          ],
+          "x-ms-enum": {
+            "name": "SecurityRuleProtocol",
+            "modelAsString": true
+          }
+        },
+        "sourcePortRange": {
+          "type": "string",
+          "description": "Gets or sets Source Port or Range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports."
+        },
+        "destinationPortRange": {
+          "type": "string",
+          "description": "Gets or sets Destination Port or Range. Integer or range between 0 and 65535. Asterix '*' can also be used to match all ports."
+        },
+        "sourceAddressPrefix": {
+          "type": "string",
+          "description": "Gets or sets source address prefix. CIDR or source IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. If this is an ingress rule, specifies where network traffic originates from. "
+        },
+        "destinationAddressPrefix": {
+          "type": "string",
+          "description": "Gets or sets destination address prefix. CIDR or source IP range. Asterix '*' can also be used to match all source IPs. Default tags such as 'VirtualNetwork', 'AzureLoadBalancer' and 'Internet' can also be used. "
+        },
+        "access": {
+          "type": "string",
+          "description": "Gets or sets network traffic is allowed or denied. Possible values are 'Allow' and 'Deny'",
+          "enum": [
+            "Allow",
+            "Deny"
+          ],
+          "x-ms-enum": {
+            "name": "SecurityRuleAccess",
+            "modelAsString": true
+          }
+        },
+        "priority": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or sets the priority of the rule. The value can be between 100 and 4096. The priority number must be unique for each rule in the collection. The lower the priority number, the higher the priority of the rule."
+        },
+        "direction": {
+          "type": "string",
+          "description": "Gets or sets the direction of the rule.InBound or Outbound. The direction specifies if rule will be evaluated on incoming or outcoming traffic.",
+          "enum": [
+            "Inbound",
+            "Outbound"
+          ],
+          "x-ms-enum": {
+            "name": "SecurityRuleDirection",
+            "modelAsString": true
+          }
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the PublicIP resource Updating/Deleting/Failed"
+        }
+      },
+      "required": [
+        "protocol",
+        "sourceAddressPrefix",
+        "destinationAddressPrefix",
+        "access",
+        "direction"
+      ]
+    },
+    "SecurityRule": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/SecurityRulePropertiesFormat"
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/SubResource"
+        }
+      ],
+      "description": "Network security rule"
+    },
+    "NetworkSecurityGroupPropertiesFormat": {
+      "properties": {
+        "securityRules": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/SecurityRule"
+          },
+          "description": "Gets or sets Security rules of network security group"
+        },
+        "defaultSecurityRules": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/SecurityRule"
+          },
+          "description": "Gets or sets Default security rules of network security group"
+        },
+        "networkInterfaces": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/NetworkInterface"
+          },
+          "description": "Gets collection of references to Network Interfaces"
+        },
+        "subnets": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Subnet"
+          },
+          "description": "Gets collection of references to subnets"
+        },
+        "resourceGuid": {
+          "type": "string",
+          "description": "Gets or sets resource guid property of the network security group resource"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the PublicIP resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Network Security Group resource"
+    },
+    "NetworkSecurityGroup": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/NetworkSecurityGroupPropertiesFormat"
+        },
+        "etag": {
+          "type": "string",
+          "description": "Gets a unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "description": "NetworkSecurityGroup resource"
+    },
+    "NetworkSecurityGroupListResult": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/NetworkSecurityGroup"
+          },
+          "description": "Gets List of NetworkSecurityGroups in a resource group"
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Gets the URL to get the next set of results."
+        }
+      },
+      "description": "Response for ListNetworkSecurityGroups Api servive call"
+    },
+    "PublicIPAddressDnsSettings": {
+      "properties": {
+        "domainNameLabel": {
+          "type": "string",
+          "description": "Gets or sets the Domain name label.The concatenation of the domain name label and the regionalized DNS zone make up the fully qualified domain name associated with the public IP address. If a domain name label is specified, an A DNS record is created for the public IP in the Microsoft Azure DNS system."
+        },
+        "fqdn": {
+          "type": "string",
+          "description": "Gets the FQDN, Fully qualified domain name of the A DNS record associated with the public IP. This is the concatenation of the domainNameLabel and the regionalized DNS zone."
+        },
+        "reverseFqdn": {
+          "type": "string",
+          "description": "Gets or Sests the Reverse FQDN. A user-visible, fully qualified domain name that resolves to this public IP address. If the reverseFqdn is specified, then a PTR DNS record is created pointing from the IP address in the in-addr.arpa domain to the reverse FQDN. "
+        }
+      },
+      "description": "Contains FQDN of the DNS record associated with the public IP address"
+    },
+    "PublicIPAddressPropertiesFormat": {
+      "properties": {
+        "publicIPAllocationMethod": {
+          "type": "string",
+          "description": "Gets or sets PublicIP allocation method (Static/Dynamic)",
+          "enum": [
+            "Static",
+            "Dynamic"
+          ],
+          "x-ms-enum": {
+            "name": "IPAllocationMethod",
+            "modelAsString": true
+          }
+        },
+        "publicIPAddressVersion": {
+          "type": "string",
+          "description": "Gets or sets PublicIP address version (IPv4/IPv6)",
+          "enum": [
+            "IPv4",
+            "IPv6"
+          ],
+          "x-ms-enum": {
+            "name": "IPVersion",
+            "modelAsString": true
+          }
+        },
+        "ipConfiguration": {
+          "$ref": "#/definitions/IPConfiguration"
+        },
+        "dnsSettings": {
+          "$ref": "#/definitions/PublicIPAddressDnsSettings",
+          "description": "Gets or sets FQDN of the DNS record associated with the public IP address"
+        },
+        "ipAddress": {
+          "type": "string"
+        },
+        "idleTimeoutInMinutes": {
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets or sets the Idletimeout of the public IP address"
+        },
+        "resourceGuid": {
+          "type": "string",
+          "description": "Gets or sets resource guid property of the PublicIP resource"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the PublicIP resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "PublicIpAddress properties"
+    },
+    "PublicIPAddress": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/PublicIPAddressPropertiesFormat"
+        },
+        "etag": {
+          "type": "string",
+          "description": "Gets a unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "description": "PublicIPAddress resource"
+    },
+    "PublicIPAddressListResult": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/PublicIPAddress"
+          },
+          "description": "Gets List of publicIP addresses that exists in a resource group"
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Gets the URL to get the next set of results."
+        }
+      },
+      "description": "Response for ListPublicIpAddresses Api service call"
+    },
+    "RoutePropertiesFormat": {
+      "properties": {
+        "addressPrefix": {
+          "type": "string",
+          "description": "Gets or sets the destination CIDR to which the route applies."
+        },
+        "nextHopType": {
+          "type": "string",
+          "description": "Gets or sets the type of Azure hop the packet should be sent to.",
+          "enum": [
+            "VirtualNetworkGateway",
+            "VnetLocal",
+            "Internet",
+            "VirtualAppliance",
+            "None"
+          ],
+          "x-ms-enum": {
+            "name": "RouteNextHopType",
+            "modelAsString": true
+          }
+        },
+        "nextHopIpAddress": {
+          "type": "string",
+          "description": "Gets or sets the IP address packets should be forwarded to. Next hop values are only allowed in routes where the next hop type is VirtualAppliance."
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the resource Updating/Deleting/Failed"
+        }
+      },
+      "required": [
+        "nextHopType"
+      ],
+      "description": "Route resource"
+    },
+    "Route": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/RoutePropertiesFormat"
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/SubResource"
+        }
+      ],
+      "description": "Route resource"
+    },
+    "RouteTablePropertiesFormat": {
+      "properties": {
+        "routes": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Route"
+          },
+          "description": "Gets or sets Routes in a Route Table"
+        },
+        "subnets": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Subnet"
+          },
+          "description": "Gets collection of references to subnets"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Route Table resource"
+    },
+    "RouteTable": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/RouteTablePropertiesFormat"
+        },
+        "etag": {
+          "type": "string",
+          "description": "Gets a unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "description": "RouteTable resource"
+    },
+    "RouteTableListResult": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/RouteTable"
+          },
+          "description": "Gets List of RouteTables in a resource group"
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Gets the URL to get the next set of results."
+        }
+      },
+      "description": "Response for ListRouteTable Api servive call"
+    },
+    "RouteListResult": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Route"
+          },
+          "description": "Gets List of Routes in a resource group"
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Gets the URL to get the next set of results."
+        }
+      },
+      "description": "Response for ListRoute Api servive call"
+    },
+    "SecurityRuleListResult": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/SecurityRule"
+          },
+          "description": "Gets security rules in a network security group"
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Gets the URL to get the next set of results."
+        }
+      },
+      "description": "Response for ListSecurityRule Api service callRetrieves all security rules that belongs to a network security group"
+    },
+    "IPConfigurationPropertiesFormat": {
+      "properties": {
+        "privateIPAddress": {
+          "type": "string",
+          "description": "Gets or sets the privateIPAddress of the IP Configuration"
+        },
+        "privateIPAllocationMethod": {
+          "type": "string",
+          "description": "Gets or sets PrivateIP allocation method (Static/Dynamic)",
+          "enum": [
+            "Static",
+            "Dynamic"
+          ],
+          "x-ms-enum": {
+            "name": "IPAllocationMethod",
+            "modelAsString": true
+          }
+        },
+        "subnet": {
+          "$ref": "#/definitions/Subnet",
+          "description": "Gets or sets the reference of the subnet resource"
+        },
+        "publicIPAddress": {
+          "$ref": "#/definitions/PublicIPAddress",
+          "description": "Gets or sets the reference of the PublicIP resource"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the PublicIP resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Properties of IPConfiguration"
+    },
+    "IPConfiguration": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/IPConfigurationPropertiesFormat"
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/SubResource"
+        }
+      ],
+      "description": "IPConfiguration"
+    },
+    "SubnetPropertiesFormat": {
+      "properties": {
+        "addressPrefix": {
+          "type": "string",
+          "description": "Gets or sets Address prefix for the subnet."
+        },
+        "networkSecurityGroup": {
+          "$ref": "#/definitions/NetworkSecurityGroup",
+          "description": "Gets or sets the reference of the NetworkSecurityGroup resource"
+        },
+        "routeTable": {
+          "$ref": "#/definitions/RouteTable",
+          "description": "Gets or sets the reference of the RouteTable resource"
+        },
+        "ipConfigurations": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/IPConfiguration"
+          },
+          "description": "Gets array of references to the network interface IP configurations using subnet"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the PublicIP resource Updating/Deleting/Failed"
+        }
+      }
+    },
+    "Subnet": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/SubnetPropertiesFormat"
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/SubResource"
+        }
+      ],
+      "description": "Subnet in a VirtualNework resource"
+    },
+    "SubnetListResult": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Subnet"
+          },
+          "description": "Gets the subnets in a virtual network"
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Gets the URL to get the next set of results."
+        }
+      },
+      "description": "Response for ListSubnets Api service callRetrieves all subnet that belongs to a virtual network"
+    },
+    "UsageName": {
+      "properties": {
+        "value": {
+          "type": "string",
+          "description": "Gets or sets a string describing the resource name."
+        },
+        "localizedValue": {
+          "type": "string",
+          "description": "Gets or sets a localized string describing the resource name."
+        }
+      },
+      "description": "The Usage Names."
+    },
+    "Usage": {
+      "properties": {
+        "unit": {
+          "type": "string",
+          "description": "Gets or sets an enum describing the unit of measurement.",
+          "enum": [
+            "Count"
+          ],
+          "x-ms-enum": {
+            "name": "UsageUnit",
+            "modelAsString": true
+          }
+        },
+        "currentValue": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Gets or sets the current value of the usage."
+        },
+        "limit": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Gets or sets the limit of usage."
+        },
+        "name": {
+          "$ref": "#/definitions/UsageName",
+          "description": "Gets or sets the name of the type of usage."
+        }
+      },
+      "required": [
+        "unit",
+        "currentValue",
+        "limit",
+        "name"
+      ],
+      "description": "Describes Network Resource Usage."
+    },
+    "UsagesListResult": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Usage"
+          },
+          "description": "Gets or sets the list Network Resource Usages."
+        }
+      },
+      "description": "The List Usages operation response."
+    },
+    "VirtualNetworkGatewayIPConfigurationPropertiesFormat": {
+      "properties": {
+        "privateIPAddress": {
+          "type": "string",
+          "description": "Gets or sets the privateIPAddress of the IP Configuration"
+        },
+        "privateIPAllocationMethod": {
+          "type": "string",
+          "description": "Gets or sets PrivateIP allocation method (Static/Dynamic)",
+          "enum": [
+            "Static",
+            "Dynamic"
+          ],
+          "x-ms-enum": {
+            "name": "IPAllocationMethod",
+            "modelAsString": true
+          }
+        },
+        "subnet": {
+          "$ref": "#/definitions/SubResource",
+          "description": "Gets or sets the reference of the subnet resource"
+        },
+        "publicIPAddress": {
+          "$ref": "#/definitions/SubResource",
+          "description": "Gets or sets the reference of the PublicIP resource"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the PublicIP resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Properties of VirtualNetworkGatewayIPConfiguration"
+    },
+    "VirtualNetworkGatewayIPConfiguration": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/VirtualNetworkGatewayIPConfigurationPropertiesFormat"
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/SubResource"
+        }
+      ],
+      "description": "IpConfiguration for Virtual network gateway"
+    },
+    "VirtualNetworkGatewayPropertiesFormat": {
+      "properties": {
+        "ipConfigurations": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/VirtualNetworkGatewayIPConfiguration"
+          },
+          "description": "IpConfigurations for Virtual network gateway."
+        },
+        "gatewayType": {
+          "type": "string",
+          "description": "The type of this virtual network gateway.",
+          "enum": [
+            "Vpn",
+            "ExpressRoute"
+          ],
+          "x-ms-enum": {
+            "name": "VirtualNetworkGatewayType",
+            "modelAsString": true
+          }
+        },
+        "vpnType": {
+          "type": "string",
+          "description": "The type of this virtual network gateway.",
+          "enum": [
+            "PolicyBased",
+            "RouteBased"
+          ],
+          "x-ms-enum": {
+            "name": "VpnType",
+            "modelAsString": true
+          }
+        },
+        "enableBgp": {
+          "type": "boolean",
+          "description": "EnableBgp Flag"
+        },
+        "gatewayDefaultSite": {
+          "$ref": "#/definitions/SubResource",
+          "description": "Gets or sets the reference of the LocalNetworkGateway resource which represents Local network site having default routes. Assign Null value in case of removing existing default site setting."
+        },
+        "sku": {
+          "$ref": "#/definitions/VirtualNetworkGatewaySku",
+          "description": "Gets or sets the reference of the VirtualNetworkGatewaySku resource which represents the sku selected for Virtual network gateway."
+        },
+        "vpnClientConfiguration": {
+          "$ref": "#/definitions/VpnClientConfiguration",
+          "description": "Gets or sets the reference of the VpnClientConfiguration resource which represents the P2S VpnClient configurations."
+        },
+        "bgpSettings": {
+          "$ref": "#/definitions/BgpSettings",
+          "description": "Virtual network gateway's BGP speaker settings"
+        },
+        "resourceGuid": {
+          "type": "string",
+          "description": "Gets or sets resource guid property of the VirtualNetworkGateway resource"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the VirtualNetworkGateway resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "VirtualNeworkGateay properties"
+    },
+    "VirtualNetworkGateway": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/VirtualNetworkGatewayPropertiesFormat"
+        },
+        "etag": {
+          "type": "string",
+          "description": "Gets a unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "description": "A common class for general resource information"
+    },
+    "VpnClientConfiguration": {
+      "properties": {
+        "vpnClientAddressPool": {
+          "$ref": "#/definitions/AddressSpace",
+          "description": "Gets or sets the reference of the Address space resource which represents Address space for P2S VpnClient."
+        },
+        "vpnClientRootCertificates": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/VpnClientRootCertificate"
+          },
+          "description": "VpnClientRootCertificate for Virtual network gateway."
+        },
+        "vpnClientRevokedCertificates": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/VpnClientRevokedCertificate"
+          },
+          "description": "VpnClientRevokedCertificate for Virtual network gateway."
+        }
+      },
+      "description": "VpnClientConfiguration for P2S client"
+    },
+    "VirtualNetworkGatewaySku": {
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Gateway sku name -Basic/HighPerformance/Standard",
+          "enum": [
+            "Basic",
+            "HighPerformance",
+            "Standard"
+          ],
+          "x-ms-enum": {
+            "name": "VirtualNetworkGatewaySkuName",
+            "modelAsString": true
+          }
+        },
+        "tier": {
+          "type": "string",
+          "description": "Gateway sku tier -Basic/HighPerformance/Standard",
+          "enum": [
+            "Basic",
+            "HighPerformance",
+            "Standard"
+          ],
+          "x-ms-enum": {
+            "name": "VirtualNetworkGatewaySkuTier",
+            "modelAsString": true
+          }
+        },
+        "capacity": {
+          "type": "integer",
+          "format": "int32",
+          "description": "The capacity"
+        }
+      },
+      "description": "VirtualNetworkGatewaySku details"
+    },
+    "VpnClientParameters": {
+      "properties": {
+        "ProcessorArchitecture": {
+          "type": "string",
+          "description": "VPN client Processor Architecture -Amd64/X86",
+          "enum": [
+            "Amd64",
+            "X86"
+          ],
+          "x-ms-enum": {
+            "name": "ProcessorArchitecture",
+            "modelAsString": true
+          }
+        }
+      },
+      "description": "VpnClientParameters"
+    },
+    "VirtualNetworkGatewayConnectionPropertiesFormat": {
+      "properties": {
+        "authorizationKey": {
+          "type": "string",
+          "description": "The authorizationKey."
+        },
+        "virtualNetworkGateway1": {
+          "$ref": "#/definitions/VirtualNetworkGateway"
+        },
+        "virtualNetworkGateway2": {
+          "$ref": "#/definitions/VirtualNetworkGateway"
+        },
+        "localNetworkGateway2": {
+          "$ref": "#/definitions/LocalNetworkGateway"
+        },
+        "connectionType": {
+          "type": "string",
+          "description": "Gateway connection type -Ipsec/Dedicated/VpnClient/Vnet2Vnet",
+          "enum": [
+            "IPsec",
+            "Vnet2Vnet",
+            "ExpressRoute",
+            "VPNClient"
+          ],
+          "x-ms-enum": {
+            "name": "VirtualNetworkGatewayConnectionType",
+            "modelAsString": true
+          }
+        },
+        "routingWeight": {
+          "type": "integer",
+          "format": "int32",
+          "description": "The Routing weight."
+        },
+        "sharedKey": {
+          "type": "string",
+          "description": "The Ipsec share key."
+        },
+        "connectionStatus": {
+          "type": "string",
+          "description": "Virtual network Gateway connection status",
+          "enum": [
+            "Unknown",
+            "Connecting",
+            "Connected",
+            "NotConnected"
+          ],
+          "x-ms-enum": {
+            "name": "VirtualNetworkGatewayConnectionStatus",
+            "modelAsString": true
+          }
+        },
+        "egressBytesTransferred": {
+          "type": "integer",
+          "format": "int64",
+          "description": "The Egress Bytes Transferred in this connection"
+        },
+        "ingressBytesTransferred": {
+          "type": "integer",
+          "format": "int64",
+          "description": "The Ingress Bytes Transferred in this connection"
+        },
+        "peer": {
+          "$ref": "#/definitions/SubResource",
+          "description": "The reference to peerings resource."
+        },
+        "enableBgp": {
+          "type": "boolean",
+          "description": "EnableBgp Flag"
+        },
+        "resourceGuid": {
+          "type": "string",
+          "description": "Gets or sets resource guid property of the VirtualNetworkGatewayConnection resource"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the VirtualNetworkGatewayConnection resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "VirtualNeworkGatewayConnection properties"
+    },
+    "VirtualNetworkGatewayConnection": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/VirtualNetworkGatewayConnectionPropertiesFormat"
+        },
+        "etag": {
+          "type": "string",
+          "description": "Gets a unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "description": "A common class for general resource information"
+    },
+    "VpnClientRevokedCertificatePropertiesFormat": {
+      "properties": {
+        "thumbprint": {
+          "type": "string",
+          "description": "Gets or sets the revoked Vpn client certificate thumbprint"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the VPN client revoked certificate resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Properties of the revoked VPN client certificate of virtual network gateway"
+    },
+    "VpnClientRevokedCertificate": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/VpnClientRevokedCertificatePropertiesFormat"
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/SubResource"
+        }
+      ],
+      "description": "VPN client revoked certificate of virtual network gateway"
+    },
+    "VpnClientRootCertificatePropertiesFormat": {
+      "properties": {
+        "publicCertData": {
+          "type": "string",
+          "description": "Gets or sets the certificate public data"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the VPN client root certificate resource Updating/Deleting/Failed"
+        }
+      },
+      "description": "Properties of SSL certificates of application gateway"
+    },
+    "VpnClientRootCertificate": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/VpnClientRootCertificatePropertiesFormat"
+        },
+        "name": {
+          "type": "string",
+          "description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
+        },
+        "etag": {
+          "type": "string",
+          "description": "A unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/SubResource"
+        }
+      ],
+      "description": "VPN client root certificate of virtual network gateway"
+    },
+    "ConnectionSharedKeyResult": {
+      "properties": {
+        "value": {
+          "type": "string",
+          "description": "The virtual network connection shared key value"
+        }
+      },
+      "description": "Response for CheckConnectionSharedKey Api servive call"
+    },
+    "VirtualNetworkGatewayConnectionListResult": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/VirtualNetworkGatewayConnection"
+          },
+          "description": "Gets List of VirtualNetworkGatewayConnections that exists in a resource group"
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Gets the URL to get the next set of results."
+        }
+      },
+      "description": "Response for ListVirtualNetworkGatewayConnections Api service call"
+    },
+    "ConnectionResetSharedKey": {
+      "properties": {
+        "keyLength": {
+          "type": "integer",
+          "format": "int64",
+          "description": "The virtual network connection reset shared key length"
+        }
+      }
+    },
+    "ConnectionSharedKey": {
+      "properties": {
+        "value": {
+          "type": "string",
+          "description": "The virtual network connection shared key value"
+        }
+      },
+      "description": "Response for GetConnectionSharedKey Api servive call"
+    },
+    "VirtualNetworkGatewayListResult": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/VirtualNetworkGateway"
+          },
+          "description": "Gets List of VirtualNetworkGateways that exists in a resource group"
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Gets the URL to get the next set of results."
+        }
+      },
+      "description": "Response for ListVirtualNetworkGateways Api service call"
+    },
+    "DhcpOptions": {
+      "properties": {
+        "dnsServers": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "Gets or sets list of DNS servers IP addresses"
+        }
+      },
+      "description": "DHCPOptions contains an array of DNS servers available to VMs deployed in the virtual networkStandard DHCP option for a subnet overrides VNET DHCP options."
+    },
+    "VirtualNetworkPropertiesFormat": {
+      "properties": {
+        "addressSpace": {
+          "$ref": "#/definitions/AddressSpace",
+          "description": "Gets or sets AddressSpace that contains an array of IP address ranges that can be used by subnets"
+        },
+        "dhcpOptions": {
+          "$ref": "#/definitions/DhcpOptions",
+          "description": "Gets or sets DHCPOptions that contains an array of DNS servers available to VMs deployed in the virtual network"
+        },
+        "subnets": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Subnet"
+          },
+          "description": "Gets or sets List of subnets in a VirtualNetwork"
+        },
+        "resourceGuid": {
+          "type": "string",
+          "description": "Gets or sets resource guid property of the VirtualNetwork resource"
+        },
+        "provisioningState": {
+          "type": "string",
+          "description": "Gets or sets Provisioning state of the PublicIP resource Updating/Deleting/Failed"
+        }
+      }
+    },
+    "VirtualNetwork": {
+      "properties": {
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/VirtualNetworkPropertiesFormat"
+        },
+        "etag": {
+          "type": "string",
+          "description": "Gets a unique read-only string that changes whenever the resource is updated"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "description": "Virtual Network resource"
+    },
+    "VirtualNetworkListResult": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/VirtualNetwork"
+          },
+          "description": "Gets list of VirtualNetworks in a resource group"
+        },
+        "nextLink": {
+          "type": "string",
+          "description": "Gets the URL to get the next set of results."
+        }
+      },
+      "description": "Response for ListVirtualNetworks Api servive call"
+    },
+    "DnsNameAvailabilityResult": {
+      "properties": {
+        "available": {
+          "type": "boolean",
+          "description": "Domain availability (True/False)"
+        }
+      },
+      "description": "Response for CheckDnsNameAvailability Api servive call"
+    },
+    "ErrorDetails": {
+      "properties": {
+        "code": {
+          "type": "string"
+        },
+        "target": {
+          "type": "string"
+        },
+        "message": {
+          "type": "string"
+        }
+      }
+    },
+    "Error": {
+      "properties": {
+        "code": {
+          "type": "string"
+        },
+        "message": {
+          "type": "string"
+        },
+        "target": {
+          "type": "string"
+        },
+        "details": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ErrorDetails"
+          }
+        },
+        "innerError": {
+          "type": "string"
+        }
+      }
+    },
+    "AzureAsyncOperationResult": {
+      "properties": {
+        "status": {
+          "type": "string",
+          "description": "Status of the AzureAsuncOperation",
+          "enum": [
+            "InProgress",
+            "Succeeded",
+            "Failed"
+          ],
+          "x-ms-enum": {
+            "name": "NetworkOperationStatus",
+            "modelAsString": true
+          }
+        },
+        "error": {
+          "$ref": "#/definitions/Error"
+        }
+      },
+      "description": "The response body contains the status of the specified asynchronous operation, indicating whether it has succeeded, is inprogress, or has failed. Note that this status is distinct from the HTTP status code returned for the Get Operation Status operation itself. If the asynchronous operation succeeded, the response body includes the HTTP status code for the successful request. If the asynchronous operation failed, the response body includes the HTTP status code for the failed request and error information regarding the failure."
+    },
+    "Resource": {
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "name": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Resource name"
+        },
+        "type": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Resource type"
+        },
+        "location": {
+          "type": "string",
+          "description": "Resource location"
+        },
+        "tags": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "description": "Resource tags"
+        }
+      },
+      "x-ms-azure-resource": true
+    },
+    "SubResource": {
+      "properties": {
+        "id": {
+          "type": "string",
+          "description": "Resource Id"
+        }
+      },
+      "x-ms-azure-resource": true
+    }
+  },
+  "parameters": {
+    "SubscriptionIdParameter": {
+      "name": "subscriptionId",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "Gets subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call."
+    },
+    "ApiVersionParameter": {
+      "name": "api-version",
+      "in": "query",
+      "required": true,
+      "type": "string",
+      "description": "Client Api Version."
+    }
+  }
+}
diff --git a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/Swagger/storage.json b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/Swagger/storage.json
new file mode 100644
index 0000000000000..20faa6a487ef9
--- /dev/null
+++ b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/Swagger/storage.json
@@ -0,0 +1,993 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "StorageManagementClient",
+    "description": "The Storage Management Client.",
+    "version": "2016-01-01"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "consumes": [
+    "application/json",
+    "text/json"
+  ],
+  "produces": [
+    "application/json",
+    "text/json"
+  ],
+  "paths": {
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Storage/checkNameAvailability": {
+      "post": {
+        "tags": [
+          "StorageAccounts"
+        ],
+        "operationId": "StorageAccounts_CheckNameAvailability",
+        "description": "Checks that account name is valid and is not in use.",
+        "parameters": [
+          {
+            "name": "accountName",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/StorageAccountCheckNameAvailabilityParameters"
+            },
+            "description": "The name of the storage account within the specified resource group. Storage account names must be between 3 and 24 characters in length and use numbers and lower-case letters only."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/CheckNameAvailabilityResult"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}": {
+      "put": {
+        "tags": [
+          "StorageAccounts"
+        ],
+        "operationId": "StorageAccounts_Create",
+        "description": "Asynchronously creates a new storage account with the specified parameters. If an account is already created and subsequent create request is issued with different properties, the account properties will be updated. If an account is already created and subsequent create or update request is issued with exact same set of properties, the request will succeed.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group within the user's subscription."
+          },
+          {
+            "name": "accountName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the storage account within the specified resource group. Storage account names must be between 3 and 24 characters in length and use numbers and lower-case letters only.  ",
+            "maxLength": 24,
+            "minLength": 3
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/StorageAccountCreateParameters"
+            },
+            "description": "The parameters to provide for the created account."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": ""
+          },
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/StorageAccount"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true
+      },
+      "delete": {
+        "tags": [
+          "StorageAccounts"
+        ],
+        "operationId": "StorageAccounts_Delete",
+        "description": "Deletes a storage account in Microsoft Azure.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group within the user's subscription."
+          },
+          {
+            "name": "accountName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the storage account within the specified resource group. Storage account names must be between 3 and 24 characters in length and use numbers and lower-case letters only.  ",
+            "maxLength": 24,
+            "minLength": 3
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": ""
+          },
+          "204": {
+            "description": ""
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "StorageAccounts"
+        ],
+        "operationId": "StorageAccounts_GetProperties",
+        "description": "Returns the properties for the specified storage account including but not limited to name, account type, location, and account status. The ListKeys operation should be used to retrieve storage keys.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group within the user's subscription."
+          },
+          {
+            "name": "accountName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the storage account within the specified resource group. Storage account names must be between 3 and 24 characters in length and use numbers and lower-case letters only.  ",
+            "maxLength": 24,
+            "minLength": 3
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/StorageAccount"
+            }
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "StorageAccounts"
+        ],
+        "operationId": "StorageAccounts_Update",
+        "description": "The update operation can be used to update the account type, encryption, or tags for a storage account. It can also be used to map the account to a custom domain. Only one custom domain is supported per storage account and. replacement/change of custom domain is not supported. In order to replace an old custom domain, the old value must be cleared/unregistered before a new value may be set. Update of multiple properties is supported. This call does not change the storage keys for the account. If you want to change storage account keys, use the regenerate keys operation.  The location and name of the storage account cannot be changed after creation.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group within the user's subscription."
+          },
+          {
+            "name": "accountName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the storage account within the specified resource group. Storage account names must be between 3 and 24 characters in length and use numbers and lower-case letters only.  ",
+            "maxLength": 24,
+            "minLength": 3
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/StorageAccountUpdateParameters"
+            },
+            "description": "The parameters to provide for the updated account."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/StorageAccount"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Storage/storageAccounts": {
+      "get": {
+        "tags": [
+          "StorageAccounts"
+        ],
+        "operationId": "StorageAccounts_List",
+        "description": "Lists all the storage accounts available under the subscription. Note that storage keys are not returned; use the ListKeys operation for this.",
+        "parameters": [
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/StorageAccountListResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": null
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts": {
+      "get": {
+        "tags": [
+          "StorageAccounts"
+        ],
+        "operationId": "StorageAccounts_ListByResourceGroup",
+        "description": "Lists all the storage accounts available under the given resource group. Note that storage keys are not returned; use the ListKeys operation for this.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group within the user's subscription."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/StorageAccountListResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": null
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/listKeys": {
+      "post": {
+        "tags": [
+          "StorageAccounts"
+        ],
+        "operationId": "StorageAccounts_ListKeys",
+        "description": "Lists the access keys for the specified storage account.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "accountName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the storage account.",
+            "maxLength": 24,
+            "minLength": 3
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/StorageAccountListKeysResult"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{accountName}/regenerateKey": {
+      "post": {
+        "tags": [
+          "StorageAccounts"
+        ],
+        "operationId": "StorageAccounts_RegenerateKey",
+        "description": "Regenerates the access keys for the specified storage account.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group within the user's subscription."
+          },
+          {
+            "name": "accountName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the storage account within the specified resource group. Storage account names must be between 3 and 24 characters in length and use numbers and lower-case letters only.  ",
+            "maxLength": 24,
+            "minLength": 3
+          },
+          {
+            "name": "regenerateKey",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/StorageAccountRegenerateKeyParameters"
+            },
+            "description": "Specifies name of the key which should be regenerated. key1 or key2 for the default keys"
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/StorageAccountListKeysResult"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Storage/usages": {
+      "get": {
+        "tags": [
+          "Usage"
+        ],
+        "operationId": "Usage_List",
+        "description": "Gets the current usage count and the limit for the resources under the subscription.",
+        "parameters": [
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/UsageListResult"
+            }
+          }
+        }
+      }
+    }
+  },
+  "definitions": {
+    "StorageAccountCheckNameAvailabilityParameters": {
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "type": {
+          "type": "string",
+          "enum": [ "Microsoft.Storage/storageAccounts" ]
+        }
+      },
+      "required": [
+        "name",
+        "type"
+      ]
+    },
+    "CheckNameAvailabilityResult": {
+      "properties": {
+        "nameAvailable": {
+          "readOnly": true,
+          "type": "boolean",
+          "description": "Gets a boolean value that indicates whether the name is available for you to use. If true, the name is available. If false, the name has already been taken or invalid and cannot be used."
+        },
+        "reason": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Gets the reason that a storage account name could not be used. The Reason element is only returned if NameAvailable is false.",
+          "enum": [
+            "AccountNameInvalid",
+            "AlreadyExists"
+          ],
+          "x-ms-enum": {
+            "name": "Reason",
+            "modelAsString": false
+          }
+        },
+        "message": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Gets an error message explaining the Reason value in more detail."
+        }
+      },
+      "description": "The CheckNameAvailability operation response."
+    },
+    "Sku": {
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Gets or sets the sku name. Required for account creation, optional for update. Note that in older versions, sku name was called accountType.",
+          "enum": [
+            "Standard_LRS",
+            "Standard_GRS",
+            "Standard_RAGRS",
+            "Standard_ZRS",
+            "Premium_LRS"
+          ],
+          "x-ms-enum": {
+            "name": "SkuName",
+            "modelAsString": false
+          }
+        },
+        "tier": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Gets the sku tier. This is based on the SKU name.",
+          "enum": [
+            "Standard",
+            "Premium"
+          ],
+          "x-ms-enum": {
+            "name": "SkuTier",
+            "modelAsString": false
+          }
+        }
+      },
+      "required": [
+        "name"
+      ],
+      "description": "The SKU of the storage account."
+    },
+    "CustomDomain": {
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Gets or sets the custom domain name. Name is the CNAME source."
+        },
+        "useSubDomain": {
+          "type": "boolean",
+          "description": "Indicates whether indirect CName validation is enabled. Default value is false. This should only be set on updates"
+        }
+      },
+      "required": [
+        "name"
+      ],
+      "description": "The custom domain assigned to this storage account. This can be set via Update."
+    },
+    "EncryptionService": {
+      "properties": {
+        "enabled": {
+          "type": "boolean",
+          "description": "A boolean indicating whether or not the service is encrypted."
+        },
+        "lastEnabledTime": {
+          "readOnly": true,
+          "type": "string",
+          "format": "date-time",
+          "description": "Gets a time value indicating when was the encryption enabled by the user last time. We return this value only when encryption is enabled. There might be some unencrypted blobs which were written after this time. This time is just to give a rough estimate of when encryption was enabled."
+        }
+      },
+      "description": "An encrypted service."
+    },
+    "EncryptionServices": {
+      "properties": {
+        "blob": {
+          "$ref": "#/definitions/EncryptionService",
+          "description": "The blob service."
+        }
+      },
+      "description": "The encrypted services."
+    },
+    "Encryption": {
+      "properties": {
+        "services": {
+          "$ref": "#/definitions/EncryptionServices",
+          "description": "Gets the services which are encrypted."
+        },
+        "keySource": {
+          "type": "string",
+          "description": "Gets the encryption keySource(provider). Possible values (case-insensitive):  Microsoft.Storage",
+          "enum": [ "Microsoft.Storage" ]
+        }
+      },
+      "required": [ "keySource" ],
+      "description": "The encryption settings on the account."
+    },
+    "StorageAccountPropertiesCreateParameters": {
+      "properties": {
+        "customDomain": {
+          "$ref": "#/definitions/CustomDomain",
+          "description": "User domain assigned to the storage account. Name is the CNAME source. Only one custom domain is supported per storage account at this time. To clear the existing custom domain, use an empty string for the custom domain name property."
+        },
+        "encryption": {
+          "$ref": "#/definitions/Encryption",
+          "description": "Provides the encryption settings on the account. If left unspecified the account encryption settings will remain. The default setting is unencrypted."
+        },
+        "accessTier": {
+          "type": "string",
+          "description": "Required for StandardBlob accounts. The access tier used for billing. Access tier cannot be changed more than once every 7 days (168 hours). Access tier cannot be set for StandardLRS, StandardGRS, StandardRAGRS, or PremiumLRS account types.",
+          "enum": [
+            "Hot",
+            "Cool"
+          ],
+          "x-ms-enum": {
+            "name": "AccessTier",
+            "modelAsString": false
+          }
+        }
+      }
+    },
+    "StorageAccountCreateParameters": {
+      "properties": {
+        "sku": {
+          "$ref": "#/definitions/Sku",
+          "description": "Required. Gets or sets the sku type."
+        },
+        "kind": {
+          "type": "string",
+          "description": "Required. Indicates the type of storage account.",
+          "enum": [
+            "Storage",
+            "BlobStorage"
+          ],
+          "x-ms-enum": {
+            "name": "Kind",
+            "modelAsString": false
+          }
+        },
+        "location": {
+          "type": "string",
+          "description": "Required. Gets or sets the location of the resource. This will be one of the supported and registered Azure Geo Regions (e.g. West US, East US, Southeast Asia, etc.). The geo region of a resource cannot be changed once it is created, but if an identical geo region is specified on update the request will succeed."
+        },
+        "tags": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "description": "Gets or sets a list of key value pairs that describe the resource. These tags can be used in viewing and grouping this resource (across resource groups). A maximum of 15 tags can be provided for a resource. Each tag must have a key no greater than 128 characters and value no greater than 256 characters."
+        },
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/StorageAccountPropertiesCreateParameters"
+        }
+      },
+      "required": [
+        "sku",
+        "kind",
+        "location"
+      ],
+      "description": "The parameters to provide for the account."
+    },
+    "Endpoints": {
+      "properties": {
+        "blob": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Gets the blob endpoint."
+        },
+        "queue": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Gets the queue endpoint."
+        },
+        "table": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Gets the table endpoint."
+        },
+        "file": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Gets the file endpoint."
+        }
+      },
+      "description": "The URIs that are used to perform a retrieval of a public blob, queue or table object."
+    },
+    "StorageAccountProperties": {
+      "properties": {
+        "provisioningState": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Gets the status of the storage account at the time the operation was called.",
+          "enum": [
+            "Creating",
+            "ResolvingDNS",
+            "Succeeded"
+          ],
+          "x-ms-enum": {
+            "name": "ProvisioningState",
+            "modelAsString": false
+          }
+        },
+        "primaryEndpoints": {
+          "$ref": "#/definitions/Endpoints",
+          "readOnly": true,
+          "description": "Gets the URLs that are used to perform a retrieval of a public blob, queue or table object.Note that StandardZRS and PremiumLRS accounts only return the blob endpoint."
+        },
+        "primaryLocation": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Gets the location of the primary for the storage account."
+        },
+        "statusOfPrimary": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Gets the status indicating whether the primary location of the storage account is available or unavailable.",
+          "enum": [
+            "Available",
+            "Unavailable"
+          ],
+          "x-ms-enum": {
+            "name": "AccountStatus",
+            "modelAsString": false
+          }
+        },
+        "lastGeoFailoverTime": {
+          "readOnly": true,
+          "type": "string",
+          "format": "date-time",
+          "description": "Gets the timestamp of the most recent instance of a failover to the secondary location. Only the most recent timestamp is retained. This element is not returned if there has never been a failover instance. Only available if the accountType is StandardGRS or StandardRAGRS."
+        },
+        "secondaryLocation": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Gets the location of the geo replicated secondary for the storage account. Only available if the accountType is StandardGRS or StandardRAGRS."
+        },
+        "statusOfSecondary": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Gets the status indicating whether the secondary location of the storage account is available or unavailable. Only available if the accountType is StandardGRS or StandardRAGRS.",
+          "enum": [
+            "Available",
+            "Unavailable"
+          ],
+          "x-ms-enum": {
+            "name": "AccountStatus",
+            "modelAsString": false
+          }
+        },
+        "creationTime": {
+          "readOnly": true,
+          "type": "string",
+          "format": "date-time",
+          "description": "Gets the creation date and time of the storage account in UTC."
+        },
+        "customDomain": {
+          "$ref": "#/definitions/CustomDomain",
+          "readOnly": true,
+          "description": "Gets the user assigned custom domain assigned to this storage account."
+        },
+        "secondaryEndpoints": {
+          "$ref": "#/definitions/Endpoints",
+          "readOnly": true,
+          "description": "Gets the URLs that are used to perform a retrieval of a public blob, queue or table object from the secondary location of the storage account. Only available if the accountType is StandardRAGRS."
+        },
+        "encryption": {
+          "$ref": "#/definitions/Encryption",
+          "readOnly": true,
+          "description": "Gets the encryption settings on the account. If unspecified the account is unencrypted."
+        },
+        "accessTier": {
+          "readOnly": true,
+          "type": "string",
+          "description": "The access tier used for billing. Access tier cannot be changed more than once every 7 days (168 hours). Access tier cannot be set for StandardLRS, StandardGRS, StandardRAGRS, or PremiumLRS account types.",
+          "enum": [
+            "Hot",
+            "Cool"
+          ],
+          "x-ms-enum": {
+            "name": "AccessTier",
+            "modelAsString": false
+          }
+        }
+      }
+    },
+    "StorageAccount": {
+      "properties": {
+        "sku": {
+          "$ref": "#/definitions/Sku",
+          "readOnly": true,
+          "description": "Gets the SKU."
+        },
+        "kind": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Gets the Kind.",
+          "enum": [
+            "Storage",
+            "BlobStorage"
+          ],
+          "x-ms-enum": {
+            "name": "Kind",
+            "modelAsString": false
+          }
+        },
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/StorageAccountProperties"
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "description": "The storage account."
+    },
+    "StorageAccountKey": {
+      "properties": {
+        "keyName": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Name of the key."
+        },
+        "value": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Base 64 encoded value of the key."
+        },
+        "permissions": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Permissions for the key.",
+          "enum": [
+            "READ",
+            "FULL"
+          ],
+          "x-ms-enum": {
+            "name": "KeyPermission",
+            "modelAsString": false
+          }
+        }
+      },
+      "description": "An access key for the storage account."
+    },
+    "StorageAccountListResult": {
+      "properties": {
+        "value": {
+          "readOnly": true,
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/StorageAccount"
+          },
+          "description": "Gets the list of storage accounts and their properties."
+        }
+      },
+      "description": "The list storage accounts operation response."
+    },
+    "StorageAccountListKeysResult": {
+      "properties": {
+        "keys": {
+          "readOnly": true,
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/StorageAccountKey"
+          },
+          "description": "Gets the list of account keys and their properties."
+        }
+      },
+      "description": "The ListKeys operation response."
+    },
+    "StorageAccountRegenerateKeyParameters": {
+      "properties": {
+        "keyName": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "keyName"
+      ]
+    },
+    "StorageAccountPropertiesUpdateParameters": {
+      "properties": {
+        "customDomain": {
+          "$ref": "#/definitions/CustomDomain",
+          "description": "User domain assigned to the storage account. Name is the CNAME source. Only one custom domain is supported per storage account at this time. To clear the existing custom domain, use an empty string for the custom domain name property."
+        },
+        "encryption": {
+          "$ref": "#/definitions/Encryption",
+          "description": "Provides the encryption settings on the account. The default setting is unencrypted."
+        },
+        "accessTier": {
+          "type": "string",
+          "description": "The access tier used for billing. Access tier cannot be changed more than once every 7 days (168 hours). Access tier cannot be set for StandardLRS, StandardGRS, StandardRAGRS, or PremiumLRS account types.",
+          "enum": [
+            "Hot",
+            "Cool"
+          ],
+          "x-ms-enum": {
+            "name": "AccessTier",
+            "modelAsString": false
+          }
+        }
+      }
+    },
+    "StorageAccountUpdateParameters": {
+      "properties": {
+        "sku": {
+          "$ref": "#/definitions/Sku",
+          "description": "Gets or sets the sku type. Note that sku cannot be updated to StandardZRS or ProvisionedLRS, nor can accounts of that sku type be updated to any other value."
+        },
+        "tags": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "description": "Gets or sets a list of key value pairs that describe the resource. These tags can be used in viewing and grouping this resource (across resource groups). A maximum of 15 tags can be provided for a resource. Each tag must have a key no greater than 128 characters and value no greater than 256 characters."
+        },
+        "properties": {
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/StorageAccountPropertiesUpdateParameters"
+        }
+      },
+      "description": "The parameters to provide for the account."
+    },
+    "UsageName": {
+      "properties": {
+        "value": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Gets a string describing the resource name."
+        },
+        "localizedValue": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Gets a localized string describing the resource name."
+        }
+      },
+      "description": "The Usage Names."
+    },
+    "Usage": {
+      "properties": {
+        "unit": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Gets the unit of measurement.",
+          "enum": [
+            "Count",
+            "Bytes",
+            "Seconds",
+            "Percent",
+            "CountsPerSecond",
+            "BytesPerSecond"
+          ],
+          "x-ms-enum": {
+            "name": "UsageUnit",
+            "modelAsString": false
+          }
+        },
+        "currentValue": {
+          "readOnly": true,
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets the current count of the allocated resources in the subscription."
+        },
+        "limit": {
+          "readOnly": true,
+          "type": "integer",
+          "format": "int32",
+          "description": "Gets the maximum count of the resources that can be allocated in the subscription."
+        },
+        "name": {
+          "$ref": "#/definitions/UsageName",
+          "readOnly": true,
+          "description": "Gets the name of the type of usage."
+        }
+      },
+      "description": "Describes Storage Resource Usage."
+    },
+    "UsageListResult": {
+      "properties": {
+        "value": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Usage"
+          },
+          "description": "Gets or sets the list Storage Resource Usages."
+        }
+      },
+      "description": "The List Usages operation response."
+    },
+    "Resource": {
+      "properties": {
+        "id": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "name": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Resource name"
+        },
+        "type": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Resource type"
+        },
+        "location": {
+          "type": "string",
+          "description": "Resource location"
+        },
+        "tags": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "description": "Resource tags"
+        }
+      },
+      "x-ms-azure-resource": true
+    }
+  },
+  "parameters": {
+    "SubscriptionIdParameter": {
+      "name": "subscriptionId",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "Gets subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call."
+    },
+    "ApiVersionParameter": {
+      "name": "api-version",
+      "in": "query",
+      "required": true,
+      "type": "string",
+      "description": "Client Api Version."
+    }
+  }
+}
\ No newline at end of file
diff --git a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/Swagger/web.json b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/Swagger/web.json
new file mode 100644
index 0000000000000..ceea725997993
--- /dev/null
+++ b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/Swagger/web.json
@@ -0,0 +1,21507 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "version": "2015-08-01",
+    "title": "WebSite Management Client",
+    "description": "Use these APIs to manage Azure Websites resources through the Azure Resource Manager. All task operations conform to the HTTP/1.1 protocol specification and each operation returns an x-ms-request-id header that can be used to obtain information about the request. You must make sure that requests made to these resources are secure. For more information, see <a href=\"https://msdn.microsoft.com/en-us/library/azure/dn790557.aspx\">Authenticating Azure Resource Manager requests.</a>"
+  },
+  "host": "management.azure.com",
+  "schemes": [
+    "https"
+  ],
+  "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CertificateRegistration/certificateOrders/{certificateOrderName}/certificates/{name}": {
+      "get": {
+        "tags": [
+          "CertificateOrders"
+        ],
+        "summary": "Get certificate associated with the certificate order",
+        "operationId": "CertificateOrders_GetCertificate",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Azure resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "certificateOrderName",
+            "in": "path",
+            "description": "Certificate name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Certificate name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/CertificateOrderCertificate"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "put": {
+        "tags": [
+          "CertificateOrders"
+        ],
+        "summary": "Associates a Key Vault secret to a certificate store that will be used for storing the certificate once it's ready",
+        "operationId": "CertificateOrders_CreateOrUpdateCertificate",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Azure resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "certificateOrderName",
+            "in": "path",
+            "description": "Certificate name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Certificate name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "keyVaultCertificate",
+            "in": "body",
+            "description": "Key Vault secret csm Id",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/CertificateOrderCertificate"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/CertificateOrderCertificate"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "delete": {
+        "tags": [
+          "CertificateOrders"
+        ],
+        "summary": "Deletes the certificate associated with the certificate order",
+        "operationId": "CertificateOrders_DeleteCertificate",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Azure resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "certificateOrderName",
+            "in": "path",
+            "description": "Certificate name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Certificate name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "patch": {
+        "tags": [
+          "CertificateOrders"
+        ],
+        "summary": "Associates a Key Vault secret to a certificate store that will be used for storing the certificate once it's ready",
+        "operationId": "CertificateOrders_UpdateCertificate",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Azure resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "certificateOrderName",
+            "in": "path",
+            "description": "Certificate name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Certificate name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "keyVaultCertificate",
+            "in": "body",
+            "description": "Key Vault secret csm Id",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/CertificateOrderCertificate"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/CertificateOrderCertificate"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CertificateRegistration/certificateOrders/{name}": {
+      "get": {
+        "tags": [
+          "CertificateOrders"
+        ],
+        "summary": "Get a certificate order",
+        "operationId": "CertificateOrders_GetCertificateOrder",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Azure resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Certificate name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/CertificateOrder"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "put": {
+        "tags": [
+          "CertificateOrders"
+        ],
+        "summary": "Create or update a certificate purchase order",
+        "operationId": "CertificateOrders_CreateOrUpdateCertificateOrder",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Azure resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Certificate name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "certificateDistinguishedName",
+            "in": "body",
+            "description": "Distinguished name to be used for purchasing certificate",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/CertificateOrder"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/CertificateOrder"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "delete": {
+        "tags": [
+          "CertificateOrders"
+        ],
+        "summary": "Delete an existing certificate order",
+        "operationId": "CertificateOrders_DeleteCertificateOrder",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Azure resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Certificate name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "patch": {
+        "tags": [
+          "CertificateOrders"
+        ],
+        "summary": "Create or update a certificate purchase order",
+        "operationId": "CertificateOrders_UpdateCertificateOrder",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Azure resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Certificate name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "certificateDistinguishedName",
+            "in": "body",
+            "description": "Distinguished name to be used for purchasing certificate",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/CertificateOrder"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/CertificateOrder"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CertificateRegistration/certificateOrders": {
+      "get": {
+        "tags": [
+          "CertificateOrders"
+        ],
+        "summary": "Get certificate orders in a resource group",
+        "operationId": "CertificateOrders_GetCertificateOrders",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Azure resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/CertificateOrderCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CertificateRegistration/certificateOrders/{certificateOrderName}/certificates": {
+      "get": {
+        "tags": [
+          "CertificateOrders"
+        ],
+        "summary": "List all certificates associated with a certificate order (only one certificate can be associated with an order at a time)",
+        "operationId": "CertificateOrders_GetCertificates",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Azure resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "certificateOrderName",
+            "in": "path",
+            "description": "Certificate name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/CertificateOrderCertificateCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CertificateRegistration/certificateOrders/{name}/reissue": {
+      "post": {
+        "tags": [
+          "CertificateOrders"
+        ],
+        "summary": "Reissue an existing certificate order",
+        "operationId": "CertificateOrders_ReissueCertificateOrder",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Azure resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Certificate name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "reissueCertificateOrderRequest",
+            "in": "body",
+            "description": "Reissue parameters",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/ReissueCertificateOrderRequest"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CertificateRegistration/certificateOrders/{name}/renew": {
+      "post": {
+        "tags": [
+          "CertificateOrders"
+        ],
+        "summary": "Renew an existing certificate order",
+        "operationId": "CertificateOrders_RenewCertificateOrder",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Azure resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Certificate name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "renewCertificateOrderRequest",
+            "in": "body",
+            "description": "Renew parameters",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/RenewCertificateOrderRequest"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CertificateRegistration/certificateOrders/{name}/retrieveCertificateActions": {
+      "post": {
+        "tags": [
+          "CertificateOrders"
+        ],
+        "summary": "Retrieve the list of certificate actions",
+        "operationId": "CertificateOrders_RetrieveCertificateActions",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Azure resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Certificate order name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/CertificateOrderAction"
+              }
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CertificateRegistration/certificateOrders/{name}/retrieveEmailHistory": {
+      "post": {
+        "tags": [
+          "CertificateOrders"
+        ],
+        "summary": "Retrive email history",
+        "operationId": "CertificateOrders_RetrieveCertificateEmailHistory",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Azure resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Certificate order name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/CertificateEmail"
+              }
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CertificateRegistration/certificateOrders/{name}/resendEmail": {
+      "post": {
+        "tags": [
+          "CertificateOrders"
+        ],
+        "summary": "Resend certificate email",
+        "operationId": "CertificateOrders_ResendCertificateEmail",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Azure resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Certificate order name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CertificateRegistration/certificateOrders/{name}/verifyDomainOwnership": {
+      "post": {
+        "tags": [
+          "CertificateOrders"
+        ],
+        "summary": "Verify domain ownership for this certificate order",
+        "operationId": "CertificateOrders_VerifyDomainOwnership",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Azure resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Certificate order name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/certificates": {
+      "get": {
+        "tags": [
+          "Certificates"
+        ],
+        "summary": "Get certificates for a subscription in the specified resource group.",
+        "operationId": "Certificates_GetCertificates",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/CertificateCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/certificates/{name}": {
+      "get": {
+        "tags": [
+          "Certificates"
+        ],
+        "summary": "Get a certificate by certificate name for a subscription in the specified resource group.",
+        "operationId": "Certificates_GetCertificate",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of the certificate.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Certificate"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "put": {
+        "tags": [
+          "Certificates"
+        ],
+        "summary": "Creates or modifies an existing certificate.",
+        "operationId": "Certificates_CreateOrUpdateCertificate",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of the certificate.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "certificateEnvelope",
+            "in": "body",
+            "description": "Details of certificate if it exists already.",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/Certificate"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Certificate"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "delete": {
+        "tags": [
+          "Certificates"
+        ],
+        "summary": "Delete a certificate by name in a specificed subscription and resourcegroup.",
+        "operationId": "Certificates_DeleteCertificate",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of the certificate to be deleted.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "patch": {
+        "tags": [
+          "Certificates"
+        ],
+        "summary": "Creates or modifies an existing certificate.",
+        "operationId": "Certificates_UpdateCertificate",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of the certificate.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "certificateEnvelope",
+            "in": "body",
+            "description": "Details of certificate if it exists already.",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/Certificate"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Certificate"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/csrs": {
+      "get": {
+        "tags": [
+          "Certificates"
+        ],
+        "summary": "Gets the certificate signing requests for a subscription in the specified resource group",
+        "operationId": "Certificates_GetCsrs",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/Csr"
+              }
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/csrs/{name}": {
+      "get": {
+        "tags": [
+          "Certificates"
+        ],
+        "summary": "Gets a certificate signing request by certificate name for a subscription in the specified resource group",
+        "operationId": "Certificates_GetCsr",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of the certificate.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Csr"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "put": {
+        "tags": [
+          "Certificates"
+        ],
+        "summary": "Creates or modifies an existing certificate signing request.",
+        "operationId": "Certificates_CreateOrUpdateCsr",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of the certificate.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "csrEnvelope",
+            "in": "body",
+            "description": "Details of certificate signing request if it exists already.",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/Csr"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Csr"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "delete": {
+        "tags": [
+          "Certificates"
+        ],
+        "summary": "Delete the certificate signing request.",
+        "operationId": "Certificates_DeleteCsr",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of the certificate signing request.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "patch": {
+        "tags": [
+          "Certificates"
+        ],
+        "summary": "Creates or modifies an existing certificate signing request.",
+        "operationId": "Certificates_UpdateCsr",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of the certificate.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "csrEnvelope",
+            "in": "body",
+            "description": "Details of certificate signing request if it exists already.",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/Csr"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Csr"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/classicMobileServices": {
+      "get": {
+        "tags": [
+          "ClassicMobileServices"
+        ],
+        "summary": "Get all mobile services in a resource group.",
+        "operationId": "ClassicMobileServices_GetClassicMobileServices",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/ClassicMobileServiceCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/classicMobileServices/{name}": {
+      "get": {
+        "tags": [
+          "ClassicMobileServices"
+        ],
+        "summary": "Get a mobile service.",
+        "operationId": "ClassicMobileServices_GetClassicMobileService",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of mobile service",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/ClassicMobileService"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "delete": {
+        "tags": [
+          "ClassicMobileServices"
+        ],
+        "summary": "Delete a mobile service.",
+        "operationId": "ClassicMobileServices_DeleteClassicMobileService",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of mobile service",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DomainRegistration/domains": {
+      "get": {
+        "tags": [
+          "Domains"
+        ],
+        "summary": "Lists domains under a resource group",
+        "operationId": "Domains_GetDomains",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/DomainCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DomainRegistration/domains/{domainName}": {
+      "get": {
+        "tags": [
+          "Domains"
+        ],
+        "summary": "Gets details of a domain",
+        "operationId": "Domains_GetDomain",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "domainName",
+            "in": "path",
+            "description": "Name of the domain",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Domain"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "put": {
+        "tags": [
+          "Domains"
+        ],
+        "summary": "Creates a domain",
+        "operationId": "Domains_CreateOrUpdateDomain",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "&gt;Name of the resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "domainName",
+            "in": "path",
+            "description": "Name of the domain",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "domain",
+            "in": "body",
+            "description": "Domain registration information",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/Domain"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": "Domain purchase is in progress",
+            "schema": {
+              "$ref": "#/definitions/Domain"
+            }
+          },
+          "200": {
+            "description": "Domain purchase was successful",
+            "schema": {
+              "$ref": "#/definitions/Domain"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "delete": {
+        "tags": [
+          "Domains"
+        ],
+        "summary": "Deletes a domain",
+        "operationId": "Domains_DeleteDomain",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "domainName",
+            "in": "path",
+            "description": "Name of the domain",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "forceHardDeleteDomain",
+            "in": "query",
+            "description": "If true then the domain will be deleted immediately instead of after 24 hours",
+            "type": "boolean"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "Domain does not exist in Azure database probably because it has already been deleted",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "patch": {
+        "tags": [
+          "Domains"
+        ],
+        "summary": "Creates a domain",
+        "operationId": "Domains_UpdateDomain",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "&gt;Name of the resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "domainName",
+            "in": "path",
+            "description": "Name of the domain",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "domain",
+            "in": "body",
+            "description": "Domain registration information",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/Domain"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": "Domain purchase is in progress",
+            "schema": {
+              "$ref": "#/definitions/Domain"
+            }
+          },
+          "200": {
+            "description": "Domain purchase was successful",
+            "schema": {
+              "$ref": "#/definitions/Domain"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DomainRegistration/domains/{domainName}/operationresults/{operationId}": {
+      "get": {
+        "tags": [
+          "Domains"
+        ],
+        "summary": "Retrieves the latest status of a domain purchase operation",
+        "operationId": "Domains_GetDomainOperation",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "domainName",
+            "in": "path",
+            "description": "Name of the domain",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "operationId",
+            "in": "path",
+            "description": "Domain purchase operation Id",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": "Domain purchase is in progress",
+            "schema": {
+              "$ref": "#/definitions/Domain"
+            }
+          },
+          "200": {
+            "description": "Domain purchase was successful",
+            "schema": {
+              "$ref": "#/definitions/Domain"
+            }
+          },
+          "500": {
+            "description": "Domain purchase request failed"
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Web/publishingCredentials": {
+      "get": {
+        "tags": [
+          "Global"
+        ],
+        "summary": "Gets publishing credentials for the subscription owner",
+        "operationId": "Global_GetSubscriptionPublishingCredentials",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/User"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "put": {
+        "tags": [
+          "Global"
+        ],
+        "summary": "Updates publishing credentials for the subscription owner",
+        "operationId": "Global_UpdateSubscriptionPublishingCredentials",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "requestMessage",
+            "in": "body",
+            "description": "requestMessage with new publishing credentials",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/User"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/User"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Web/geoRegions": {
+      "get": {
+        "tags": [
+          "Global"
+        ],
+        "summary": "Gets list of available geo regions",
+        "operationId": "Global_GetSubscriptionGeoRegions",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "sku",
+            "in": "query",
+            "description": "Filter only to regions that support this sku",
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/GeoRegionCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Web/certificates": {
+      "get": {
+        "tags": [
+          "Global"
+        ],
+        "summary": "Get all certificates for a subscription",
+        "operationId": "Global_GetAllCertificates",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/CertificateCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Web/serverfarms": {
+      "get": {
+        "tags": [
+          "Global"
+        ],
+        "summary": "Gets all App Service Plans for a subcription",
+        "operationId": "Global_GetAllServerFarms",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "detailed",
+            "in": "query",
+            "description": "False to return a subset of App Service Plan properties, true to return all of the properties.\r\n            Retrieval of all properties may increase the API latency.",
+            "type": "boolean"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/ServerFarmCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Web/sites": {
+      "get": {
+        "tags": [
+          "Global"
+        ],
+        "summary": "Gets all Web Apps for a subscription",
+        "operationId": "Global_GetAllSites",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SiteCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Web/hostingEnvironments": {
+      "get": {
+        "tags": [
+          "Global"
+        ],
+        "summary": "Gets all hostingEnvironments (App Service Environment) for a subscription",
+        "operationId": "Global_GetAllHostingEnvironments",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/HostingEnvironmentCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Web/managedHostingEnvironments": {
+      "get": {
+        "tags": [
+          "Global"
+        ],
+        "summary": "Gets all managed hosting environments for a subscription",
+        "operationId": "Global_GetAllManagedHostingEnvironments",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/ManagedHostingEnvironmentCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Web/classicMobileServices": {
+      "get": {
+        "tags": [
+          "Global"
+        ],
+        "summary": "Gets all mobile services for a subscription",
+        "operationId": "Global_GetAllClassicMobileServices",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/ClassicMobileServiceCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Web/premieraddonoffers": {
+      "get": {
+        "tags": [
+          "Global"
+        ],
+        "summary": "List premier add on offers",
+        "operationId": "Global_ListPremierAddOnOffers",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Web/ishostingenvironmentnameavailable": {
+      "get": {
+        "tags": [
+          "Global"
+        ],
+        "summary": "Whether hosting environment name is available",
+        "operationId": "Global_IsHostingEnvironmentNameAvailable",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "name",
+            "in": "query",
+            "description": "Hosting environment name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Web/ishostingenvironmentnameavailable/{name}": {
+      "get": {
+        "tags": [
+          "Global"
+        ],
+        "summary": "Whether hosting environment name is available",
+        "operationId": "Global_IsHostingEnvironmentWithLegacyNameAvailable",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Hosting environment name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Web/checknameavailability": {
+      "post": {
+        "tags": [
+          "Global"
+        ],
+        "summary": "Check if resource name is available",
+        "operationId": "Global_CheckNameAvailability",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "request",
+            "in": "body",
+            "description": "Name availability request",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/ResourceNameAvailabilityRequest"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/ResourceNameAvailability"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.CertificateRegistration/certificateOrders": {
+      "get": {
+        "tags": [
+          "GlobalCertificateOrder"
+        ],
+        "summary": "Lists all domains in a subscription",
+        "operationId": "GlobalCertificateOrder_GetAllCertificateOrders",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/CertificateOrderCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.CertificateRegistration/validateCertificateRegistrationInformation": {
+      "post": {
+        "tags": [
+          "GlobalCertificateOrder"
+        ],
+        "summary": "Validate certificate purchase information",
+        "operationId": "GlobalCertificateOrder_ValidateCertificatePurchaseInformation",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "certificateOrder",
+            "in": "body",
+            "description": "Certificate order",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/CertificateOrder"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.DomainRegistration/domains": {
+      "get": {
+        "tags": [
+          "GlobalDomainRegistration"
+        ],
+        "summary": "Lists all domains in a subscription",
+        "operationId": "GlobalDomainRegistration_GetAllDomains",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/DomainCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.DomainRegistration/generateSsoRequest": {
+      "post": {
+        "tags": [
+          "GlobalDomainRegistration"
+        ],
+        "summary": "Generates a single sign on request for domain management portal",
+        "operationId": "GlobalDomainRegistration_GetDomainControlCenterSsoRequest",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/DomainControlCenterSsoRequest"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.DomainRegistration/validateDomainRegistrationInformation": {
+      "post": {
+        "tags": [
+          "GlobalDomainRegistration"
+        ],
+        "summary": "Validates domain registration information",
+        "operationId": "GlobalDomainRegistration_ValidateDomainPurchaseInformation",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "domainRegistrationInput",
+            "in": "body",
+            "description": "Domain registration information",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/DomainRegistrationInput"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.DomainRegistration/checkDomainAvailability": {
+      "post": {
+        "tags": [
+          "GlobalDomainRegistration"
+        ],
+        "summary": "Checks if a domain is available for registration",
+        "operationId": "GlobalDomainRegistration_CheckDomainAvailability",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "identifier",
+            "in": "body",
+            "description": "Name of the domain",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/NameIdentifier"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/DomainAvailablilityCheckResult"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.DomainRegistration/listDomainRecommendations": {
+      "post": {
+        "tags": [
+          "GlobalDomainRegistration"
+        ],
+        "summary": "Lists domain recommendations based on keywords",
+        "operationId": "GlobalDomainRegistration_ListDomainRecommendations",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "parameters",
+            "in": "body",
+            "description": "Domain recommendation search parameters",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/DomainRecommendationSearchParameters"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/NameIdentifierCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/moveResources": {
+      "post": {
+        "tags": [
+          "GlobalResourceGroups"
+        ],
+        "operationId": "GlobalResourceGroups_MoveResources",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "moveResourceEnvelope",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/CsmMoveResourceEnvelope"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "No Content"
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}": {
+      "get": {
+        "tags": [
+          "HostingEnvironments"
+        ],
+        "summary": "Get properties of hostingEnvironment (App Service Environment).",
+        "operationId": "HostingEnvironments_GetHostingEnvironment",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of hostingEnvironment (App Service Environment)",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/HostingEnvironment"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "put": {
+        "tags": [
+          "HostingEnvironments"
+        ],
+        "summary": "Create or update a hostingEnvironment (App Service Environment).",
+        "operationId": "HostingEnvironments_CreateOrUpdateHostingEnvironment",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of hostingEnvironment (App Service Environment)",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "hostingEnvironmentEnvelope",
+            "in": "body",
+            "description": "Properties of hostingEnvironment (App Service Environment)",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/HostingEnvironment"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/HostingEnvironment"
+            }
+          },
+          "202": {
+            "description": "Operation is in progress",
+            "schema": {
+              "$ref": "#/definitions/HostingEnvironment"
+            }
+          },
+          "400": {
+            "description": "Bad request"
+          },
+          "404": {
+            "description": "Not found"
+          },
+          "409": {
+            "description": "Conflict"
+          }
+        },
+        "deprecated": false,
+        "x-ms-long-running-operation": true
+      },
+      "delete": {
+        "tags": [
+          "HostingEnvironments"
+        ],
+        "summary": "Delete a hostingEnvironment (App Service Environment).",
+        "operationId": "HostingEnvironments_DeleteHostingEnvironment",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of hostingEnvironment (App Service Environment)",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "forceDelete",
+            "in": "query",
+            "description": "Delete even if the hostingEnvironment (App Service Environment) contains resources",
+            "type": "boolean"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          },
+          "202": {
+            "description": "Operation is in progress",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          },
+          "400": {
+            "description": "Bad request"
+          },
+          "404": {
+            "description": "Not found"
+          },
+          "409": {
+            "description": "Conflict"
+          }
+        },
+        "deprecated": false,
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/diagnostics": {
+      "get": {
+        "tags": [
+          "HostingEnvironments"
+        ],
+        "summary": "Get diagnostic information for hostingEnvironment (App Service Environment).",
+        "operationId": "HostingEnvironments_GetHostingEnvironmentDiagnostics",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of hostingEnvironment (App Service Environment)",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/HostingEnvironmentDiagnostics"
+              }
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/diagnostics/{diagnosticsName}": {
+      "get": {
+        "tags": [
+          "HostingEnvironments"
+        ],
+        "summary": "Get diagnostic information for hostingEnvironment (App Service Environment).",
+        "operationId": "HostingEnvironments_GetHostingEnvironmentDiagnosticsItem",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of hostingEnvironment (App Service Environment)",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "diagnosticsName",
+            "in": "path",
+            "description": "Name of the diagnostics",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/HostingEnvironmentDiagnostics"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/capacities/compute": {
+      "get": {
+        "tags": [
+          "HostingEnvironments"
+        ],
+        "summary": "Get used, available, and total worker capacity for hostingEnvironment (App Service Environment).",
+        "operationId": "HostingEnvironments_GetHostingEnvironmentCapacities",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of hostingEnvironment (App Service Environment)",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/StampCapacityCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/capacities/virtualip": {
+      "get": {
+        "tags": [
+          "HostingEnvironments"
+        ],
+        "summary": "Get IP addresses assigned to the hostingEnvironment (App Service Environment).",
+        "operationId": "HostingEnvironments_GetHostingEnvironmentVips",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of hostingEnvironment (App Service Environment)",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/AddressResponse"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments": {
+      "get": {
+        "tags": [
+          "HostingEnvironments"
+        ],
+        "summary": "Get all hostingEnvironments (App Service Environments) in a resource group.",
+        "operationId": "HostingEnvironments_GetHostingEnvironments",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/HostingEnvironmentCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/reboot": {
+      "post": {
+        "tags": [
+          "HostingEnvironments"
+        ],
+        "summary": "Reboots all machines in a hostingEnvironment (App Service Environment).",
+        "operationId": "HostingEnvironments_RebootHostingEnvironment",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of hostingEnvironment (App Service Environment)",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": "Asynchronous operation in progress",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          },
+          "400": {
+            "description": "Bad request"
+          },
+          "404": {
+            "description": "Not found"
+          },
+          "409": {
+            "description": "Conflict"
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/operations": {
+      "get": {
+        "tags": [
+          "HostingEnvironments"
+        ],
+        "summary": "List all currently running operations on the hostingEnvironment (App Service Environment)",
+        "operationId": "HostingEnvironments_GetHostingEnvironmentOperations",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of hostingEnvironment (App Service Environment)",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/operations/{operationId}": {
+      "get": {
+        "tags": [
+          "HostingEnvironments"
+        ],
+        "summary": "Get status of an operation on a hostingEnvironment (App Service Environment).",
+        "operationId": "HostingEnvironments_GetHostingEnvironmentOperation",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of hostingEnvironment (App Service Environment)",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "operationId",
+            "in": "path",
+            "description": "operation identifier GUID",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Operation completed successfully",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          },
+          "202": {
+            "description": "Asynchronous operation in progress",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          },
+          "404": {
+            "description": "Not found"
+          },
+          "500": {
+            "description": "Operation failed"
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/metrics": {
+      "get": {
+        "tags": [
+          "HostingEnvironments"
+        ],
+        "summary": "Get global metrics of hostingEnvironment (App Service Environment).",
+        "operationId": "HostingEnvironments_GetHostingEnvironmentMetrics",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of hostingEnvironment (App Service Environment)",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "details",
+            "in": "query",
+            "description": "Include instance details",
+            "type": "boolean"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "description": "Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.",
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/ResourceMetricCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/metricdefinitions": {
+      "get": {
+        "tags": [
+          "HostingEnvironments"
+        ],
+        "summary": "Get global metric definitions of hostingEnvironment (App Service Environment).",
+        "operationId": "HostingEnvironments_GetHostingEnvironmentMetricDefinitions",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of hostingEnvironment (App Service Environment)",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/MetricDefinition"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/usages": {
+      "get": {
+        "tags": [
+          "HostingEnvironments"
+        ],
+        "summary": "Get global usages of hostingEnvironment (App Service Environment).",
+        "operationId": "HostingEnvironments_GetHostingEnvironmentUsages",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of hostingEnvironment (App Service Environment)",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "description": "Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.",
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/CsmUsageQuotaCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools/default/metrics": {
+      "get": {
+        "tags": [
+          "HostingEnvironments"
+        ],
+        "summary": "Get metrics for a multiRole pool of a hostingEnvironment (App Service Environment).",
+        "operationId": "HostingEnvironments_GetHostingEnvironmentMultiRoleMetrics",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of hostingEnvironment (App Service Environment)",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "startTime",
+            "in": "query",
+            "description": "Beginning time of metrics query",
+            "type": "string"
+          },
+          {
+            "name": "endTime",
+            "in": "query",
+            "description": "End time of metrics query",
+            "type": "string"
+          },
+          {
+            "name": "timeGrain",
+            "in": "query",
+            "description": "Time granularity of metrics query",
+            "type": "string"
+          },
+          {
+            "name": "details",
+            "in": "query",
+            "description": "Include instance details",
+            "type": "boolean"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "description": "Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.",
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/ResourceMetricCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/workerPools/{workerPoolName}/metrics": {
+      "get": {
+        "tags": [
+          "HostingEnvironments"
+        ],
+        "summary": "Get metrics for a worker pool of a hostingEnvironment (App Service Environment).",
+        "operationId": "HostingEnvironments_GetHostingEnvironmentWebWorkerMetrics",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of hostingEnvironment (App Service Environment)",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "workerPoolName",
+            "in": "path",
+            "description": "Name of worker pool",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "details",
+            "in": "query",
+            "description": "Include instance details",
+            "type": "boolean"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "description": "Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.",
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/ResourceMetricCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools/default/metricdefinitions": {
+      "get": {
+        "tags": [
+          "HostingEnvironments"
+        ],
+        "summary": "Get metric definitions for a multiRole pool of a hostingEnvironment (App Service Environment).",
+        "operationId": "HostingEnvironments_GetHostingEnvironmentMultiRoleMetricDefinitions",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of hostingEnvironment (App Service Environment)",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/MetricDefinitionCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/workerPools/{workerPoolName}/metricdefinitions": {
+      "get": {
+        "tags": [
+          "HostingEnvironments"
+        ],
+        "summary": "Get metric definitions for a worker pool of a hostingEnvironment (App Service Environment).",
+        "operationId": "HostingEnvironments_GetHostingEnvironmentWebWorkerMetricDefinitions",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of hostingEnvironment (App Service Environment)",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "workerPoolName",
+            "in": "path",
+            "description": "Name of worker pool",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/MetricDefinitionCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools/default/usages": {
+      "get": {
+        "tags": [
+          "HostingEnvironments"
+        ],
+        "summary": "Get usages for a multiRole pool of a hostingEnvironment (App Service Environment).",
+        "operationId": "HostingEnvironments_GetHostingEnvironmentMultiRoleUsages",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of hostingEnvironment (App Service Environment)",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/UsageCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/workerPools/{workerPoolName}/usages": {
+      "get": {
+        "tags": [
+          "HostingEnvironments"
+        ],
+        "summary": "Get usages for a worker pool of a hostingEnvironment (App Service Environment).",
+        "operationId": "HostingEnvironments_GetHostingEnvironmentWebWorkerUsages",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of hostingEnvironment (App Service Environment)",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "workerPoolName",
+            "in": "path",
+            "description": "Name of worker pool",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/UsageCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/sites": {
+      "get": {
+        "tags": [
+          "HostingEnvironments"
+        ],
+        "summary": "Get all sites on the hostingEnvironment (App Service Environment).",
+        "operationId": "HostingEnvironments_GetHostingEnvironmentSites",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of hostingEnvironment (App Service Environment)",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "propertiesToInclude",
+            "in": "query",
+            "description": "Comma separated list of site properties to include",
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SiteCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/webhostingplans": {
+      "get": {
+        "tags": [
+          "HostingEnvironments"
+        ],
+        "summary": "Get all serverfarms (App Service Plans) on the hostingEnvironment (App Service Environment).",
+        "operationId": "HostingEnvironments_GetHostingEnvironmentWebHostingPlans",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of hostingEnvironment (App Service Environment)",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/ServerFarmCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/serverfarms": {
+      "get": {
+        "tags": [
+          "HostingEnvironments"
+        ],
+        "summary": "Get all serverfarms (App Service Plans) on the hostingEnvironment (App Service Environment).",
+        "operationId": "HostingEnvironments_GetHostingEnvironmentServerFarms",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of hostingEnvironment (App Service Environment)",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/ServerFarmCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools": {
+      "get": {
+        "tags": [
+          "HostingEnvironments"
+        ],
+        "summary": "Get all multi role pools",
+        "operationId": "HostingEnvironments_GetMultiRolePools",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of hostingEnvironment (App Service Environment)",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/WorkerPoolCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools/default": {
+      "get": {
+        "tags": [
+          "HostingEnvironments"
+        ],
+        "summary": "Get properties of a multiRool pool.",
+        "operationId": "HostingEnvironments_GetMultiRolePool",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of hostingEnvironment (App Service Environment)",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/WorkerPool"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "put": {
+        "tags": [
+          "HostingEnvironments"
+        ],
+        "summary": "Create or update a multiRole pool.",
+        "operationId": "HostingEnvironments_CreateOrUpdateMultiRolePool",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of hostingEnvironment (App Service Environment)",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "multiRolePoolEnvelope",
+            "in": "body",
+            "description": "Properties of multiRole pool",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/WorkerPool"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/WorkerPool"
+            }
+          },
+          "202": {
+            "description": "Operation is in progress",
+            "schema": {
+              "$ref": "#/definitions/WorkerPool"
+            }
+          },
+          "400": {
+            "description": "Bad request"
+          },
+          "404": {
+            "description": "Not found"
+          },
+          "409": {
+            "description": "Conflict"
+          }
+        },
+        "deprecated": false,
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools/default/skus": {
+      "get": {
+        "tags": [
+          "HostingEnvironments"
+        ],
+        "summary": "Get available skus for scaling a multiRole pool.",
+        "operationId": "HostingEnvironments_GetMultiRolePoolSkus",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of hostingEnvironment (App Service Environment)",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SkuInfoCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/workerPools": {
+      "get": {
+        "tags": [
+          "HostingEnvironments"
+        ],
+        "summary": "Get all worker pools",
+        "operationId": "HostingEnvironments_GetWorkerPools",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of hostingEnvironment (App Service Environment)",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/WorkerPoolCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/workerPools/{workerPoolName}": {
+      "get": {
+        "tags": [
+          "HostingEnvironments"
+        ],
+        "summary": "Get properties of a worker pool.",
+        "operationId": "HostingEnvironments_GetWorkerPool",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of hostingEnvironment (App Service Environment)",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "workerPoolName",
+            "in": "path",
+            "description": "Name of worker pool",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/WorkerPool"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "put": {
+        "tags": [
+          "HostingEnvironments"
+        ],
+        "summary": "Create or update a worker pool.",
+        "operationId": "HostingEnvironments_CreateOrUpdateWorkerPool",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of hostingEnvironment (App Service Environment)",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "workerPoolName",
+            "in": "path",
+            "description": "Name of worker pool",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "workerPoolEnvelope",
+            "in": "body",
+            "description": "Properties of worker pool",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/WorkerPool"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/WorkerPool"
+            }
+          },
+          "202": {
+            "description": "Operation is in progress",
+            "schema": {
+              "$ref": "#/definitions/WorkerPool"
+            }
+          },
+          "400": {
+            "description": "Bad request"
+          },
+          "404": {
+            "description": "Not found"
+          },
+          "409": {
+            "description": "Conflict"
+          }
+        },
+        "deprecated": false,
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/workerPools/{workerPoolName}/skus": {
+      "get": {
+        "tags": [
+          "HostingEnvironments"
+        ],
+        "summary": "Get available skus for scaling a worker pool.",
+        "operationId": "HostingEnvironments_GetWorkerPoolSkus",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of hostingEnvironment (App Service Environment)",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "workerPoolName",
+            "in": "path",
+            "description": "Name of worker pool",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SkuInfoCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/workerPools/{workerPoolName}/instances/{instance}/metrics": {
+      "get": {
+        "tags": [
+          "HostingEnvironments"
+        ],
+        "summary": "Get metrics for a specific instance of a worker pool of a hostingEnvironment (App Service Environment).",
+        "operationId": "HostingEnvironments_GetWorkerPoolInstanceMetrics",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of hostingEnvironment (App Service Environment)",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "workerPoolName",
+            "in": "path",
+            "description": "Name of worker pool",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "instance",
+            "in": "path",
+            "description": "Name of instance in the worker pool",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "details",
+            "in": "query",
+            "description": "Include instance details",
+            "type": "boolean"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "description": "Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.",
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/workerPools/{workerPoolName}/instances/{instance}/metricdefinitions": {
+      "get": {
+        "tags": [
+          "HostingEnvironments"
+        ],
+        "summary": "Get metric definitions for a specific instance of a worker pool of a hostingEnvironment (App Service Environment).",
+        "operationId": "HostingEnvironments_GetWorkerPoolInstanceMetricDefinitions",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of hostingEnvironment (App Service Environment)",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "workerPoolName",
+            "in": "path",
+            "description": "Name of worker pool",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "instance",
+            "in": "path",
+            "description": "Name of instance in the worker pool",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools/default/instances/{instance}/metrics": {
+      "get": {
+        "tags": [
+          "HostingEnvironments"
+        ],
+        "summary": "Get metrics for a specific instance of a multiRole pool of a hostingEnvironment (App Service Environment).",
+        "operationId": "HostingEnvironments_GetMultiRolePoolInstanceMetrics",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of hostingEnvironment (App Service Environment)",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "instance",
+            "in": "path",
+            "description": "Name of instance in the multiRole pool",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "details",
+            "in": "query",
+            "description": "Include instance details",
+            "type": "boolean"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools/default/instances/{instance}/metricdefinitions": {
+      "get": {
+        "tags": [
+          "HostingEnvironments"
+        ],
+        "summary": "Get metric definitions for a specific instance of a multiRole pool of a hostingEnvironment (App Service Environment).",
+        "operationId": "HostingEnvironments_GetMultiRolePoolInstanceMetricDefinitions",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of hostingEnvironment (App Service Environment)",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "instance",
+            "in": "path",
+            "description": "Name of instance in the multiRole pool&gt;",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/suspend": {
+      "post": {
+        "tags": [
+          "HostingEnvironments"
+        ],
+        "summary": "Suspends the hostingEnvironment.",
+        "operationId": "HostingEnvironments_SuspendHostingEnvironment",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of hostingEnvironment (App Service Environment)",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SiteCollection"
+            }
+          },
+          "202": {
+            "description": "Operation is in progress",
+            "schema": {
+              "$ref": "#/definitions/SiteCollection"
+            }
+          }
+        },
+        "deprecated": false,
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/resume": {
+      "post": {
+        "tags": [
+          "HostingEnvironments"
+        ],
+        "summary": "Resumes the hostingEnvironment.",
+        "operationId": "HostingEnvironments_ResumeHostingEnvironment",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of hostingEnvironment (App Service Environment)",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SiteCollection"
+            }
+          },
+          "202": {
+            "description": "Operation is in progress",
+            "schema": {
+              "$ref": "#/definitions/SiteCollection"
+            }
+          }
+        },
+        "deprecated": false,
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/managedHostingEnvironments/{name}": {
+      "get": {
+        "tags": [
+          "ManagedHostingEnvironments"
+        ],
+        "summary": "Get properties of a managed hosting environment.",
+        "operationId": "ManagedHostingEnvironments_GetManagedHostingEnvironment",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of managed hosting environment",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/ManagedHostingEnvironment"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "put": {
+        "tags": [
+          "ManagedHostingEnvironments"
+        ],
+        "summary": "Create or update a managed hosting environment.",
+        "operationId": "ManagedHostingEnvironments_CreateOrUpdateManagedHostingEnvironment",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of managed hosting environment",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "ManagedHostingEnvironmentEnvelope",
+            "in": "body",
+            "description": "Properties of managed hosting environment",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/HostingEnvironment"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": "Asynchronous operation in progress",
+            "schema": {
+              "$ref": "#/definitions/HostingEnvironment"
+            }
+          },
+          "400": {
+            "description": "Bad request"
+          },
+          "404": {
+            "description": "Not found"
+          },
+          "409": {
+            "description": "Conflict"
+          }
+        },
+        "deprecated": false,
+        "x-ms-long-running-operation": true
+      },
+      "delete": {
+        "tags": [
+          "ManagedHostingEnvironments"
+        ],
+        "summary": "Delete a managed hosting environment.",
+        "operationId": "ManagedHostingEnvironments_DeleteManagedHostingEnvironment",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of managed hosting environment",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "forceDelete",
+            "in": "query",
+            "description": "Delete even if the managed hosting environment contains resources",
+            "type": "boolean"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": "Asynchronous operation in progress",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          },
+          "400": {
+            "description": "Bad request"
+          },
+          "404": {
+            "description": "Not found"
+          },
+          "409": {
+            "description": "Conflict"
+          }
+        },
+        "deprecated": false,
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/managedHostingEnvironments": {
+      "get": {
+        "tags": [
+          "ManagedHostingEnvironments"
+        ],
+        "summary": "Get all managed hosting environments in a resource group.",
+        "operationId": "ManagedHostingEnvironments_GetManagedHostingEnvironments",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/HostingEnvironmentCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/managedHostingEnvironments/{name}/capacities/virtualip": {
+      "get": {
+        "tags": [
+          "ManagedHostingEnvironments"
+        ],
+        "summary": "Get list of ip addresses assigned to a managed hosting environment",
+        "operationId": "ManagedHostingEnvironments_GetManagedHostingEnvironmentVips",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of managed hosting environment",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/AddressResponse"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/managedHostingEnvironments/{name}/operations/{operationId}": {
+      "get": {
+        "tags": [
+          "ManagedHostingEnvironments"
+        ],
+        "summary": "Get status of an operation on a managed hosting environment.",
+        "operationId": "ManagedHostingEnvironments_GetManagedHostingEnvironmentOperation",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of managed hosting environment",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "operationId",
+            "in": "path",
+            "description": "operation identifier GUID",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Operation completed successfully",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          },
+          "202": {
+            "description": "Asynchronous operation in progress",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          },
+          "404": {
+            "description": "Not found"
+          },
+          "500": {
+            "description": "Operation failed"
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/managedHostingEnvironments/{name}/sites": {
+      "get": {
+        "tags": [
+          "ManagedHostingEnvironments"
+        ],
+        "summary": "Get all sites on the managed hosting environment.",
+        "operationId": "ManagedHostingEnvironments_GetManagedHostingEnvironmentSites",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of managed hosting environment",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "propertiesToInclude",
+            "in": "query",
+            "description": "Comma separated list of site properties to include",
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SiteCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/managedHostingEnvironments/{name}/webhostingplans": {
+      "get": {
+        "tags": [
+          "ManagedHostingEnvironments"
+        ],
+        "summary": "Get all serverfarms (App Service Plans) on the managed hosting environment.",
+        "operationId": "ManagedHostingEnvironments_GetManagedHostingEnvironmentWebHostingPlans",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of managed hosting environment",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/ServerFarmCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/managedHostingEnvironments/{name}/serverfarms": {
+      "get": {
+        "tags": [
+          "ManagedHostingEnvironments"
+        ],
+        "summary": "Get all serverfarms (App Service Plans) on the managed hosting environment.",
+        "operationId": "ManagedHostingEnvironments_GetManagedHostingEnvironmentServerFarms",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of managed hosting environment",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/ServerFarmCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/providers/Microsoft.Web/sourcecontrols": {
+      "get": {
+        "tags": [
+          "Provider"
+        ],
+        "summary": "Gets the source controls available for Azure websites",
+        "operationId": "Provider_GetSourceControls",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SourceControlCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/providers/Microsoft.Web/sourcecontrols/{sourceControlType}": {
+      "get": {
+        "tags": [
+          "Provider"
+        ],
+        "summary": "Gets source control token",
+        "operationId": "Provider_GetSourceControl",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "sourceControlType",
+            "in": "path",
+            "description": "Type of source control",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SourceControl"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "put": {
+        "tags": [
+          "Provider"
+        ],
+        "summary": "Updates source control token",
+        "operationId": "Provider_UpdateSourceControl",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "sourceControlType",
+            "in": "path",
+            "description": "Type of source control",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "requestMessage",
+            "in": "body",
+            "description": "Source control token information",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/SourceControl"
+            }
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SourceControl"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/providers/Microsoft.Web/publishingUsers/web": {
+      "get": {
+        "tags": [
+          "Provider"
+        ],
+        "summary": "Gets publishing user",
+        "operationId": "Provider_GetPublishingUser",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/User"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "put": {
+        "tags": [
+          "Provider"
+        ],
+        "summary": "Updates publishing user",
+        "operationId": "Provider_UpdatePublishingUser",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "requestMessage",
+            "in": "body",
+            "description": "Details of publishing user",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/User"
+            }
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/User"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Web/recommendations": {
+      "get": {
+        "tags": [
+          "Recommendations"
+        ],
+        "summary": "Gets a list of recommendations associated with the specified subscription.",
+        "operationId": "Recommendations_GetRecommendationBySubscription",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "featured",
+            "in": "query",
+            "description": "If set, this API returns only the most critical recommendation among the others. Otherwise this API returns all recommendations available",
+            "type": "boolean"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "description": "Return only channels specified in the filter. Filter is specified by using OData syntax. Example: $filter=channels eq 'Api' or channel eq 'Notification'",
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/Recommendation"
+              }
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{siteName}/recommendations/{name}": {
+      "get": {
+        "tags": [
+          "Recommendations"
+        ],
+        "summary": "Gets the detailed properties of the recommendation object for the specified web site.",
+        "operationId": "Recommendations_GetRuleDetailsBySiteName",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "siteName",
+            "in": "path",
+            "description": "Site name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Recommendation rule name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/RecommendationRule"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{siteName}/recommendations": {
+      "get": {
+        "tags": [
+          "Recommendations"
+        ],
+        "summary": "Gets a list of recommendations associated with the specified web site.",
+        "operationId": "Recommendations_GetRecommendedRulesForSite",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "siteName",
+            "in": "path",
+            "description": "Site name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "featured",
+            "in": "query",
+            "description": "If set, this API returns only the most critical recommendation among the others. Otherwise this API returns all recommendations available",
+            "type": "boolean"
+          },
+          {
+            "name": "siteSku",
+            "in": "query",
+            "description": "The name of site SKU.",
+            "type": "string"
+          },
+          {
+            "name": "numSlots",
+            "in": "query",
+            "description": "The number of site slots associated to the site",
+            "type": "integer",
+            "format": "int32"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/Recommendation"
+              }
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{siteName}/recommendationHistory": {
+      "get": {
+        "tags": [
+          "Recommendations"
+        ],
+        "summary": "Gets the list of past recommendations optionally specified by the time range.",
+        "operationId": "Recommendations_GetRecommendationHistoryForSite",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "siteName",
+            "in": "path",
+            "description": "Site name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "startTime",
+            "in": "query",
+            "description": "The start time of a time range to query, e.g. $filter=startTime eq '2015-01-01T00:00:00Z' and endTime eq '2015-01-02T00:00:00Z'",
+            "type": "string"
+          },
+          {
+            "name": "endTime",
+            "in": "query",
+            "description": "The end time of a time range to query, e.g. $filter=startTime eq '2015-01-01T00:00:00Z' and endTime eq '2015-01-02T00:00:00Z'",
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/Recommendation"
+              }
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms": {
+      "get": {
+        "tags": [
+          "ServerFarms"
+        ],
+        "summary": "Gets collection of App Service Plans in a resource group for a given subscription.",
+        "operationId": "ServerFarms_GetServerFarms",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/ServerFarmCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}": {
+      "get": {
+        "tags": [
+          "ServerFarms"
+        ],
+        "summary": "Gets specified App Service Plan in a resource group",
+        "operationId": "ServerFarms_GetServerFarm",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of App Service Plan",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/ServerFarmWithRichSku"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "put": {
+        "tags": [
+          "ServerFarms"
+        ],
+        "summary": "Creates or updates an App Service Plan",
+        "operationId": "ServerFarms_CreateOrUpdateServerFarm",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of App Service Plan",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "serverFarmEnvelope",
+            "in": "body",
+            "description": "Details of App Service Plan",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/ServerFarmWithRichSku"
+            }
+          },
+          {
+            "name": "allowPendingState",
+            "in": "query",
+            "description": "OBSOLETE: If true, allow pending state for App Service Plan",
+            "type": "boolean"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/ServerFarmWithRichSku"
+            }
+          },
+          "202": {
+            "description": "Operation is in progress",
+            "schema": {
+              "$ref": "#/definitions/ServerFarmWithRichSku"
+            }
+          }
+        },
+        "deprecated": false,
+        "x-ms-long-running-operation": true
+      },
+      "delete": {
+        "tags": [
+          "ServerFarms"
+        ],
+        "summary": "Deletes a App Service Plan",
+        "operationId": "ServerFarms_DeleteServerFarm",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of App Service Plan",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/metrics": {
+      "get": {
+        "tags": [
+          "ServerFarms"
+        ],
+        "summary": "Queries for App Serice Plan metrics",
+        "operationId": "ServerFarms_GetServerFarmMetrics",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of App Service Plan",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "details",
+            "in": "query",
+            "description": "If true, metrics are broken down per App Service Plan instance",
+            "type": "boolean"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "description": "Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.",
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/ResourceMetricCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/metricdefinitions": {
+      "get": {
+        "tags": [
+          "ServerFarms"
+        ],
+        "summary": "List of metrics that can be queried for an App Service Plan",
+        "operationId": "ServerFarms_GetServerFarmMetricDefintions",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of App Service Plan",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/MetricDefinitionCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/virtualNetworkConnections": {
+      "get": {
+        "tags": [
+          "ServerFarms"
+        ],
+        "summary": "Gets list of vnets associated with App Service Plan",
+        "operationId": "ServerFarms_GetVnetsForServerFarm",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of App Service Plan",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/VnetInfo"
+              }
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/virtualNetworkConnections/{vnetName}": {
+      "get": {
+        "tags": [
+          "ServerFarms"
+        ],
+        "summary": "Gets a vnet associated with an App Service Plan",
+        "operationId": "ServerFarms_GetVnetFromServerFarm",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of App Service Plan",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "vnetName",
+            "in": "path",
+            "description": "Name of virtual network",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/VnetInfo"
+            }
+          },
+          "404": {
+            "description": "Virtual network could not be found"
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/virtualNetworkConnections/{vnetName}/routes": {
+      "get": {
+        "tags": [
+          "ServerFarms"
+        ],
+        "summary": "Gets a list of all routes associated with a vnet, in an app service plan",
+        "operationId": "ServerFarms_GetRoutesForVnet",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of App Service Plan",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "vnetName",
+            "in": "path",
+            "description": "Name of virtual network",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/VnetRoute"
+              }
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/virtualNetworkConnections/{vnetName}/routes/{routeName}": {
+      "get": {
+        "tags": [
+          "ServerFarms"
+        ],
+        "summary": "Gets a specific route associated with a vnet, in an app service plan",
+        "operationId": "ServerFarms_GetRouteForVnet",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of App Service Plan",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "vnetName",
+            "in": "path",
+            "description": "Name of virtual network",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "routeName",
+            "in": "path",
+            "description": "Name of the virtual network route",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/VnetRoute"
+              }
+            }
+          },
+          "404": {
+            "description": "Specified route does not exist"
+          }
+        },
+        "deprecated": false
+      },
+      "put": {
+        "tags": [
+          "ServerFarms"
+        ],
+        "summary": "Creates a new route or updates an existing route for a vnet in an app service plan.",
+        "operationId": "ServerFarms_CreateOrUpdateVnetRoute",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of App Service Plan",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "vnetName",
+            "in": "path",
+            "description": "Name of virtual network",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "routeName",
+            "in": "path",
+            "description": "Name of the virtual network route",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "route",
+            "in": "body",
+            "description": "The route object",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/VnetRoute"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/VnetRoute"
+            }
+          },
+          "400": {
+            "description": "Invalid request. Ensure that required parameters are given, and that addresses and address spaces are valid"
+          },
+          "404": {
+            "description": "Route not found. This will only occur when using the PATCH verb."
+          }
+        },
+        "deprecated": false
+      },
+      "delete": {
+        "tags": [
+          "ServerFarms"
+        ],
+        "summary": "Deletes an existing route for a vnet in an app service plan.",
+        "operationId": "ServerFarms_DeleteVnetRoute",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of App Service Plan",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "vnetName",
+            "in": "path",
+            "description": "Name of virtual network",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "routeName",
+            "in": "path",
+            "description": "Name of the virtual network route",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          },
+          "404": {
+            "description": "Specified route does not exist."
+          }
+        },
+        "deprecated": false
+      },
+      "patch": {
+        "tags": [
+          "ServerFarms"
+        ],
+        "summary": "Creates a new route or updates an existing route for a vnet in an app service plan.",
+        "operationId": "ServerFarms_UpdateVnetRoute",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of App Service Plan",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "vnetName",
+            "in": "path",
+            "description": "Name of virtual network",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "routeName",
+            "in": "path",
+            "description": "Name of the virtual network route",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "route",
+            "in": "body",
+            "description": "The route object",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/VnetRoute"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/VnetRoute"
+            }
+          },
+          "400": {
+            "description": "Invalid request. Ensure that required parameters are given, and that addresses and address spaces are valid"
+          },
+          "404": {
+            "description": "Route not found. This will only occur when using the PATCH verb."
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/virtualNetworkConnections/{vnetName}/gateways/{gatewayName}": {
+      "get": {
+        "tags": [
+          "ServerFarms"
+        ],
+        "summary": "Gets the vnet gateway.",
+        "operationId": "ServerFarms_GetServerFarmVnetGateway",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of the App Service Plan",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "vnetName",
+            "in": "path",
+            "description": "Name of the virtual network",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "gatewayName",
+            "in": "path",
+            "description": "Name of the gateway. Only the 'primary' gateway is supported.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/VnetGateway"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "put": {
+        "tags": [
+          "ServerFarms"
+        ],
+        "summary": "Updates the vnet gateway",
+        "operationId": "ServerFarms_UpdateServerFarmVnetGateway",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "The resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "The name of the App Service Plan",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "vnetName",
+            "in": "path",
+            "description": "The name of the virtual network",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "gatewayName",
+            "in": "path",
+            "description": "The name of the gateway. Only 'primary' is supported.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "connectionEnvelope",
+            "in": "body",
+            "description": "The gateway entity.",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/VnetGateway"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/VnetGateway"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/sites": {
+      "get": {
+        "tags": [
+          "ServerFarms"
+        ],
+        "summary": "Gets list of Apps associated with an App Service Plan",
+        "operationId": "ServerFarms_GetServerFarmSites",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of App Service Plan",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "$skipToken",
+            "in": "query",
+            "description": "Skip to of web apps in a list. If specified, the resulting list will contain web apps starting from (including) the skipToken. Else, the resulting list contains web apps from the start of the list",
+            "type": "string"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "description": "Supported filter: $filter=state eq running. Returns only web apps that are currently running",
+            "type": "string"
+          },
+          {
+            "name": "$top",
+            "in": "query",
+            "description": "List page size. If specified, results are paged.",
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SiteCollection"
+            }
+          }
+        },
+        "deprecated": false,
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/workers/{workerName}/reboot": {
+      "post": {
+        "tags": [
+          "ServerFarms"
+        ],
+        "summary": "Submit a reboot request for a worker machine in the specified server farm",
+        "operationId": "ServerFarms_RebootWorkerForServerFarm",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of server farm",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "workerName",
+            "in": "path",
+            "description": "Name of worker machine, typically starts with RD",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/restartSites": {
+      "post": {
+        "tags": [
+          "ServerFarms"
+        ],
+        "summary": "Restarts web apps in a specified App Service Plan",
+        "operationId": "ServerFarms_RestartSitesForServerFarm",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of App Service Plan",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "softRestart",
+            "in": "query",
+            "description": "Soft restart applies the configuration settings and restarts the apps if necessary. Hard restart always restarts and reprovisions the apps",
+            "type": "boolean"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/operationresults/{operationId}": {
+      "get": {
+        "tags": [
+          "ServerFarms"
+        ],
+        "summary": "Gets a server farm operation",
+        "operationId": "ServerFarms_GetServerFarmOperation",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of server farm",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "operationId",
+            "in": "path",
+            "description": "Id of Server farm operation\"&gt;",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/ServerFarmWithRichSku"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/virtualNetworkConnections/{vnetName}": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Retrieves a specific Virtual Network Connection associated with this web app.",
+        "operationId": "Sites_GetSiteVNETConnectionSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "The resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "The name of the web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "vnetName",
+            "in": "path",
+            "description": "The name of the Virtual Network",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "The name of the slot for this web app.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/VnetInfo"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "put": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Adds a Virtual Network Connection or updates it's properties.",
+        "operationId": "Sites_CreateOrUpdateSiteVNETConnectionSlot",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "The resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "The name of the web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "vnetName",
+            "in": "path",
+            "description": "The name of the Virtual Network",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "connectionEnvelope",
+            "in": "body",
+            "description": "The properties of this Virtual Network Connection",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/VnetInfo"
+            }
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "The name of the slot for this web app.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/VnetInfo"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "delete": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Removes the specified Virtual Network Connection association from this web app.",
+        "operationId": "Sites_DeleteSiteVNETConnectionSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "The resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "The name of the web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "vnetName",
+            "in": "path",
+            "description": "The name of the Virtual Network",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "The name of the slot for this web app.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "patch": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Adds a Virtual Network Connection or updates it's properties.",
+        "operationId": "Sites_UpdateSiteVNETConnectionSlot",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "The resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "The name of the web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "vnetName",
+            "in": "path",
+            "description": "The name of the Virtual Network",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "connectionEnvelope",
+            "in": "body",
+            "description": "The properties of this Virtual Network Connection",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/VnetInfo"
+            }
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "The name of the slot for this web app.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/VnetInfo"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/virtualNetworkConnections/{vnetName}": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Retrieves a specific Virtual Network Connection associated with this web app.",
+        "operationId": "Sites_GetSiteVNETConnection",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "The resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "The name of the web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "vnetName",
+            "in": "path",
+            "description": "The name of the Virtual Network",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/VnetInfo"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "put": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Adds a Virtual Network Connection or updates it's properties.",
+        "operationId": "Sites_CreateOrUpdateSiteVNETConnection",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "The resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "The name of the web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "vnetName",
+            "in": "path",
+            "description": "The name of the Virtual Network",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "connectionEnvelope",
+            "in": "body",
+            "description": "The properties of this Virtual Network Connection",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/VnetInfo"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/VnetInfo"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "delete": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Removes the specified Virtual Network Connection association from this web app.",
+        "operationId": "Sites_DeleteSiteVNETConnection",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "The resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "The name of the web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "vnetName",
+            "in": "path",
+            "description": "The name of the Virtual Network",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "patch": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Adds a Virtual Network Connection or updates it's properties.",
+        "operationId": "Sites_UpdateSiteVNETConnection",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "The resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "The name of the web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "vnetName",
+            "in": "path",
+            "description": "The name of the Virtual Network",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "connectionEnvelope",
+            "in": "body",
+            "description": "The properties of this Virtual Network Connection",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/VnetInfo"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/VnetInfo"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/networkFeatures/{view}": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Retrieves a view of all network features in use on this web app.",
+        "operationId": "Sites_GetSiteNetworkFeaturesSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "The resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "The name of the web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "view",
+            "in": "path",
+            "description": "The type of view. This can either be \"summary\" or \"detailed\".",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "The name of the slot for this web app.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/NetworkFeatures"
+            }
+          },
+          "404": {
+            "description": "The requested view does not exist."
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/networkFeatures/{view}": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Retrieves a view of all network features in use on this web app.",
+        "operationId": "Sites_GetSiteNetworkFeatures",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "The resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "The name of the web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "view",
+            "in": "path",
+            "description": "The type of view. This can either be \"summary\" or \"detailed\".",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/NetworkFeatures"
+            }
+          },
+          "404": {
+            "description": "The requested view does not exist."
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/operationresults/{operationId}": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Gets the operation for a web app",
+        "operationId": "Sites_GetSiteOperationSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "operationId",
+            "in": "path",
+            "description": "Id of an operation",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/operationresults/{operationId}": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Gets the operation for a web app",
+        "operationId": "Sites_GetSiteOperation",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "operationId",
+            "in": "path",
+            "description": "Id of an operation",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slotsswap": {
+      "post": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Swaps web app slots",
+        "operationId": "Sites_SwapSlotWithProduction",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slotSwapEntity",
+            "in": "body",
+            "description": "Request body that contains the target slot name",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/CsmSlotEntity"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          },
+          "202": {
+            "description": "Operation is in progress",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false,
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/slotsswap": {
+      "post": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Swaps web app slots",
+        "operationId": "Sites_SwapSlotsSlot",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slotSwapEntity",
+            "in": "body",
+            "description": "Request body that contains the target slot name",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/CsmSlotEntity"
+            }
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of source slot for the swap",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          },
+          "202": {
+            "description": "Operation is in progress",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false,
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slotsdiffs": {
+      "post": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Get the difference in configuration settings between two web app slots",
+        "operationId": "Sites_GetSlotsDifferencesFromProduction",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slotSwapEntity",
+            "in": "body",
+            "description": "Request body that contains the target slot name",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/CsmSlotEntity"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SlotDifferenceCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/slotsdiffs": {
+      "post": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Get the difference in configuration settings between two web app slots",
+        "operationId": "Sites_GetSlotsDifferencesSlot",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slotSwapEntity",
+            "in": "body",
+            "description": "Request body that contains the target slot name",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/CsmSlotEntity"
+            }
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of the source slot",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SlotDifferenceCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/applySlotConfig": {
+      "post": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Applies the configuration settings from the target slot onto the current slot",
+        "operationId": "Sites_ApplySlotConfigToProduction",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slotSwapEntity",
+            "in": "body",
+            "description": "Request body that contains the target slot name. Settings from that slot will be applied on the source slot",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/CsmSlotEntity"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/applySlotConfig": {
+      "post": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Applies the configuration settings from the target slot onto the current slot",
+        "operationId": "Sites_ApplySlotConfigSlot",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slotSwapEntity",
+            "in": "body",
+            "description": "Request body that contains the target slot name. Settings from that slot will be applied on the source slot",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/CsmSlotEntity"
+            }
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of the source slot. Settings from the target slot will be applied onto this slot",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/resetSlotConfig": {
+      "post": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Resets the configuration settings of the current slot if they were previously modified by calling ApplySlotConfig API",
+        "operationId": "Sites_ResetProductionSlotConfig",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/resetSlotConfig": {
+      "post": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Resets the configuration settings of the current slot if they were previously modified by calling ApplySlotConfig API",
+        "operationId": "Sites_ResetSlotConfigSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/slotConfigNames": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Gets the names of application settings and connection string that remain with the slot during swap operation",
+        "operationId": "Sites_GetSlotConfigNames",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SlotConfigNamesResource"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "put": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Updates the names of application settings and connection string that remain with the slot during swap operation",
+        "operationId": "Sites_UpdateSlotConfigNames",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slotConfigNames",
+            "in": "body",
+            "description": "Request body containing the names of application settings and connection strings",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/SlotConfigNamesResource"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SlotConfigNamesResource"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Gets all the slots for a web apps",
+        "operationId": "Sites_GetSiteSlots",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "propertiesToInclude",
+            "in": "query",
+            "description": "List of app properties to include in the response",
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SiteCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Gets the web apps for a subscription in the specified resource group",
+        "operationId": "Sites_GetSites",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "propertiesToInclude",
+            "in": "query",
+            "description": "Additional web app properties included in the response",
+            "type": "string"
+          },
+          {
+            "name": "includeSiteTypes",
+            "in": "query",
+            "description": "Types of apps included in the response",
+            "type": "string"
+          },
+          {
+            "name": "includeSlots",
+            "in": "query",
+            "description": "Whether or not to include deployments slots in results",
+            "type": "boolean"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SiteCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Get details of a web app",
+        "operationId": "Sites_GetSite",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "propertiesToInclude",
+            "in": "query",
+            "description": "Additional web app properties included in the response",
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Site"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "put": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Creates a new web app or modifies an existing web app.",
+        "operationId": "Sites_CreateOrUpdateSite",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of the web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "siteEnvelope",
+            "in": "body",
+            "description": "Details of web app if it exists already",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/Site"
+            }
+          },
+          {
+            "name": "skipDnsRegistration",
+            "in": "query",
+            "description": "If true web app hostname is not registered with DNS on creation. This parameter is\r\n            only used for app creation",
+            "type": "string"
+          },
+          {
+            "name": "skipCustomDomainVerification",
+            "in": "query",
+            "description": "If true, custom (non *.azurewebsites.net) domains associated with web app are not verified.",
+            "type": "string"
+          },
+          {
+            "name": "forceDnsRegistration",
+            "in": "query",
+            "description": "If true, web app hostname is force registered with DNS",
+            "type": "string"
+          },
+          {
+            "name": "ttlInSeconds",
+            "in": "query",
+            "description": "Time to live in seconds for web app's default domain name",
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Site"
+            }
+          },
+          "202": {
+            "description": "Asynchronous operation in progress",
+            "schema": {
+              "$ref": "#/definitions/Site"
+            }
+          }
+        },
+        "deprecated": false,
+        "x-ms-long-running-operation": true
+      },
+      "delete": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Deletes a web app",
+        "operationId": "Sites_DeleteSite",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "deleteMetrics",
+            "in": "query",
+            "description": "If true, web app metrics are also deleted",
+            "type": "string"
+          },
+          {
+            "name": "deleteEmptyServerFarm",
+            "in": "query",
+            "description": "If true and App Service Plan is empty after web app deletion, App Service Plan is also deleted",
+            "type": "string"
+          },
+          {
+            "name": "skipDnsRegistration",
+            "in": "query",
+            "description": "If true, DNS registration is skipped",
+            "type": "string"
+          },
+          {
+            "name": "deleteAllSlots",
+            "in": "query",
+            "description": "If true, all slots associated with web app are also deleted",
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Get details of a web app",
+        "operationId": "Sites_GetSiteSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "propertiesToInclude",
+            "in": "query",
+            "description": "Additional web app properties included in the response",
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Site"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "put": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Creates a new web app or modifies an existing web app.",
+        "operationId": "Sites_CreateOrUpdateSiteSlot",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of the web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "siteEnvelope",
+            "in": "body",
+            "description": "Details of web app if it exists already",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/Site"
+            }
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "skipDnsRegistration",
+            "in": "query",
+            "description": "If true web app hostname is not registered with DNS on creation. This parameter is\r\n            only used for app creation",
+            "type": "string"
+          },
+          {
+            "name": "skipCustomDomainVerification",
+            "in": "query",
+            "description": "If true, custom (non *.azurewebsites.net) domains associated with web app are not verified.",
+            "type": "string"
+          },
+          {
+            "name": "forceDnsRegistration",
+            "in": "query",
+            "description": "If true, web app hostname is force registered with DNS",
+            "type": "string"
+          },
+          {
+            "name": "ttlInSeconds",
+            "in": "query",
+            "description": "Time to live in seconds for web app's default domain name",
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Site"
+            }
+          },
+          "202": {
+            "description": "Asynchronous operation in progress",
+            "schema": {
+              "$ref": "#/definitions/Site"
+            }
+          }
+        },
+        "deprecated": false,
+        "x-ms-long-running-operation": true
+      },
+      "delete": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Deletes a web app",
+        "operationId": "Sites_DeleteSiteSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "deleteMetrics",
+            "in": "query",
+            "description": "If true, web app metrics are also deleted",
+            "type": "string"
+          },
+          {
+            "name": "deleteEmptyServerFarm",
+            "in": "query",
+            "description": "If true and App Service Plan is empty after web app deletion, App Service Plan is also deleted",
+            "type": "string"
+          },
+          {
+            "name": "skipDnsRegistration",
+            "in": "query",
+            "description": "If true, DNS registration is skipped",
+            "type": "string"
+          },
+          {
+            "name": "deleteAllSlots",
+            "in": "query",
+            "description": "If true, all slots associated with web app are also deleted",
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/iscloneable": {
+      "post": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Creates a new web app or modifies an existing web app.",
+        "operationId": "Sites_IsSiteCloneable",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of the web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SiteCloneability"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/iscloneable": {
+      "post": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Creates a new web app or modifies an existing web app.",
+        "operationId": "Sites_IsSiteCloneableSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of the resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of the web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SiteCloneability"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/recover": {
+      "post": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Recovers a deleted web app",
+        "operationId": "Sites_RecoverSite",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "recoveryEntity",
+            "in": "body",
+            "description": "Snapshot data used for web app recovery. Snapshot information can be obtained by calling GetDeletedSites or GetSiteSnapshots API.",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/CsmSiteRecoveryEntity"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": "Asynchronous operation in progress",
+            "schema": {
+              "$ref": "#/definitions/Site"
+            }
+          },
+          "404": {
+            "description": "Web app not found"
+          }
+        },
+        "deprecated": false,
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/recover": {
+      "post": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Recovers a deleted web app",
+        "operationId": "Sites_RecoverSiteSlot",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "recoveryEntity",
+            "in": "body",
+            "description": "Snapshot data used for web app recovery. Snapshot information can be obtained by calling GetDeletedSites or GetSiteSnapshots API.",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/CsmSiteRecoveryEntity"
+            }
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": "Asynchronous operation in progress",
+            "schema": {
+              "$ref": "#/definitions/Site"
+            }
+          },
+          "404": {
+            "description": "Web app not found"
+          }
+        },
+        "deprecated": false,
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/snapshots": {
+      "put": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Returns all Snapshots to the user.",
+        "operationId": "Sites_GetSiteSnapshots",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Webspace",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Website Name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/snapshots": {
+      "put": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Returns all Snapshots to the user.",
+        "operationId": "Sites_GetSiteSnapshotsSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Webspace",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Website Name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Website Slot",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/deletedSites": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Gets deleted web apps in subscription",
+        "operationId": "Sites_GetDeletedSites",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "propertiesToInclude",
+            "in": "query",
+            "description": "Additional web app properties included in the response",
+            "type": "string"
+          },
+          {
+            "name": "includeSiteTypes",
+            "in": "query",
+            "description": "Types of apps included in the response",
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/DeletedSiteCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/deployments": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "List deployments",
+        "operationId": "Sites_GetDeployments",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/DeploymentCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/deployments": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "List deployments",
+        "operationId": "Sites_GetDeploymentsSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/DeploymentCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/instances/{instanceId}/deployments": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "List deployments",
+        "operationId": "Sites_GetInstanceDeployments",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "instanceId",
+            "in": "path",
+            "description": "Id of web app instance",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/DeploymentCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/instances/{instanceId}/deployments": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "List deployments",
+        "operationId": "Sites_GetInstanceDeploymentsSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "instanceId",
+            "in": "path",
+            "description": "Id of web app instance",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/DeploymentCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/instances/{instanceId}/deployments/{id}": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Get the deployment",
+        "operationId": "Sites_GetInstanceDeployment",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "id",
+            "in": "path",
+            "description": "Id of the deployment",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "instanceId",
+            "in": "path",
+            "description": "Id of web app instance",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Deployment"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "put": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Create a deployment",
+        "operationId": "Sites_CreateInstanceDeployment",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "id",
+            "in": "path",
+            "description": "Id of the deployment",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "instanceId",
+            "in": "path",
+            "description": "Id of web app instance",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "deployment",
+            "in": "body",
+            "description": "Details of deployment",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/Deployment"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Deployment"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "delete": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Delete the deployment",
+        "operationId": "Sites_DeleteInstanceDeployment",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "id",
+            "in": "path",
+            "description": "Id of the deployment",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "instanceId",
+            "in": "path",
+            "description": "Id of web app instance",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/deployments/{id}": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Get the deployment",
+        "operationId": "Sites_GetDeployment",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "id",
+            "in": "path",
+            "description": "Id of the deployment",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Deployment"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "put": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Create a deployment",
+        "operationId": "Sites_CreateDeployment",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "id",
+            "in": "path",
+            "description": "Id of the deployment",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "deployment",
+            "in": "body",
+            "description": "Details of deployment",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/Deployment"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Deployment"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "delete": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Delete the deployment",
+        "operationId": "Sites_DeleteDeployment",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "id",
+            "in": "path",
+            "description": "Id of the deployment",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/deployments/{id}": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Get the deployment",
+        "operationId": "Sites_GetDeploymentSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "id",
+            "in": "path",
+            "description": "Id of the deployment",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Deployment"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "put": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Create a deployment",
+        "operationId": "Sites_CreateDeploymentSlot",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "id",
+            "in": "path",
+            "description": "Id of the deployment",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "deployment",
+            "in": "body",
+            "description": "Details of deployment",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/Deployment"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Deployment"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "delete": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Delete the deployment",
+        "operationId": "Sites_DeleteDeploymentSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "id",
+            "in": "path",
+            "description": "Id of the deployment",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/instances/{instanceId}/deployments/{id}": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Get the deployment",
+        "operationId": "Sites_GetInstanceDeploymentSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "id",
+            "in": "path",
+            "description": "Id of the deployment",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "instanceId",
+            "in": "path",
+            "description": "Id of web app instance",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Deployment"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "put": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Create a deployment",
+        "operationId": "Sites_CreateInstanceDeploymentSlot",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "id",
+            "in": "path",
+            "description": "Id of the deployment",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "instanceId",
+            "in": "path",
+            "description": "Id of web app instance",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "deployment",
+            "in": "body",
+            "description": "Details of deployment",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/Deployment"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Deployment"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "delete": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Delete the deployment",
+        "operationId": "Sites_DeleteInstanceDeploymentSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "id",
+            "in": "path",
+            "description": "Id of the deployment",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "instanceId",
+            "in": "path",
+            "description": "Id of web app instance",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/instances": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Gets all instance of a web app",
+        "operationId": "Sites_GetSiteInstanceIdentifiers",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SiteInstanceCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/instances": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Gets all instance of a web app",
+        "operationId": "Sites_GetSiteInstanceIdentifiersSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SiteInstanceCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/hostNameBindings": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Get web app hostname bindings",
+        "operationId": "Sites_GetSiteHostNameBindings",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/HostNameBindingCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/hostNameBindings": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Get web app hostname bindings",
+        "operationId": "Sites_GetSiteHostNameBindingsSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/HostNameBindingCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/hostNameBindings/{hostName}": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Get web app binding for a hostname",
+        "operationId": "Sites_GetSiteHostNameBinding",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "hostName",
+            "in": "path",
+            "description": "Name of host",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/HostNameBinding"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "put": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Creates a web app hostname binding",
+        "operationId": "Sites_CreateOrUpdateSiteHostNameBinding",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "hostName",
+            "in": "path",
+            "description": "Name of host",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "hostNameBinding",
+            "in": "body",
+            "description": "Host name binding information",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/HostNameBinding"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/HostNameBinding"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "delete": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Deletes a host name binding",
+        "operationId": "Sites_DeleteSiteHostNameBinding",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "hostName",
+            "in": "path",
+            "description": "Name of host",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/hostNameBindings/{hostName}": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Get web app binding for a hostname",
+        "operationId": "Sites_GetSiteHostNameBindingSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "hostName",
+            "in": "path",
+            "description": "Name of host",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/HostNameBinding"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "put": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Creates a web app hostname binding",
+        "operationId": "Sites_CreateOrUpdateSiteHostNameBindingSlot",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "hostName",
+            "in": "path",
+            "description": "Name of host",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "hostNameBinding",
+            "in": "body",
+            "description": "Host name binding information",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/HostNameBinding"
+            }
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/HostNameBinding"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "delete": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Deletes a host name binding",
+        "operationId": "Sites_DeleteSiteHostNameBindingSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "hostName",
+            "in": "path",
+            "description": "Name of host",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/web": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Gets the configuration of the web app",
+        "operationId": "Sites_GetSiteConfig",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SiteConfig"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "put": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Update the configuration of web app",
+        "operationId": "Sites_CreateOrUpdateSiteConfig",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "siteConfig",
+            "in": "body",
+            "description": "Request body that contains the configuraiton setting for the web app",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/SiteConfig"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SiteConfig"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "patch": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Update the configuration of web app",
+        "operationId": "Sites_UpdateSiteConfig",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "siteConfig",
+            "in": "body",
+            "description": "Request body that contains the configuraiton setting for the web app",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/SiteConfig"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SiteConfig"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/web": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Gets the configuration of the web app",
+        "operationId": "Sites_GetSiteConfigSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SiteConfig"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "put": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Update the configuration of web app",
+        "operationId": "Sites_CreateOrUpdateSiteConfigSlot",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "siteConfig",
+            "in": "body",
+            "description": "Request body that contains the configuraiton setting for the web app",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/SiteConfig"
+            }
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SiteConfig"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "patch": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Update the configuration of web app",
+        "operationId": "Sites_UpdateSiteConfigSlot",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "siteConfig",
+            "in": "body",
+            "description": "Request body that contains the configuraiton setting for the web app",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/SiteConfig"
+            }
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SiteConfig"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/sourcecontrols/web": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Get the source control configuration of web app",
+        "operationId": "Sites_GetSiteSourceControl",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SiteSourceControl"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "put": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Update the source control configuration of web app",
+        "operationId": "Sites_CreateOrUpdateSiteSourceControl",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "siteSourceControl",
+            "in": "body",
+            "description": "Request body that contains the source control parameters",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/SiteSourceControl"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SiteSourceControl"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "delete": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Delete source control configuration of web app",
+        "operationId": "Sites_DeleteSiteSourceControl",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "patch": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Update the source control configuration of web app",
+        "operationId": "Sites_UpdateSiteSourceControl",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "siteSourceControl",
+            "in": "body",
+            "description": "Request body that contains the source control parameters",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/SiteSourceControl"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SiteSourceControl"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/sourcecontrols/web": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Get the source control configuration of web app",
+        "operationId": "Sites_GetSiteSourceControlSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SiteSourceControl"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "put": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Update the source control configuration of web app",
+        "operationId": "Sites_CreateOrUpdateSiteSourceControlSlot",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "siteSourceControl",
+            "in": "body",
+            "description": "Request body that contains the source control parameters",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/SiteSourceControl"
+            }
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SiteSourceControl"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "delete": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Delete source control configuration of web app",
+        "operationId": "Sites_DeleteSiteSourceControlSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "patch": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Update the source control configuration of web app",
+        "operationId": "Sites_UpdateSiteSourceControlSlot",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "siteSourceControl",
+            "in": "body",
+            "description": "Request body that contains the source control parameters",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/SiteSourceControl"
+            }
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SiteSourceControl"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/appsettings/list": {
+      "post": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Gets the application settings of web app",
+        "operationId": "Sites_ListSiteAppSettingsSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/StringDictionary"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/appsettings/list": {
+      "post": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Gets the application settings of web app",
+        "operationId": "Sites_ListSiteAppSettings",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/StringDictionary"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/appsettings": {
+      "put": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Updates the application settings of web app",
+        "operationId": "Sites_UpdateSiteAppSettings",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "appSettings",
+            "in": "body",
+            "description": "Application settings of web app",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/StringDictionary"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/StringDictionary"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/appsettings": {
+      "put": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Updates the application settings of web app",
+        "operationId": "Sites_UpdateSiteAppSettingsSlot",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "appSettings",
+            "in": "body",
+            "description": "Application settings of web app",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/StringDictionary"
+            }
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/StringDictionary"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/connectionstrings/list": {
+      "post": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Gets the connection strings associated with web app",
+        "operationId": "Sites_ListSiteConnectionStrings",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/ConnectionStringDictionary"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/connectionstrings/list": {
+      "post": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Gets the connection strings associated with web app",
+        "operationId": "Sites_ListSiteConnectionStringsSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/ConnectionStringDictionary"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/connectionstrings": {
+      "put": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Updates the connection strings associated with web app",
+        "operationId": "Sites_UpdateSiteConnectionStrings",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "connectionStrings",
+            "in": "body",
+            "description": "Connection strings associated with web app",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/ConnectionStringDictionary"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/ConnectionStringDictionary"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/connectionstrings": {
+      "put": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Updates the connection strings associated with web app",
+        "operationId": "Sites_UpdateSiteConnectionStringsSlot",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "connectionStrings",
+            "in": "body",
+            "description": "Connection strings associated with web app",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/ConnectionStringDictionary"
+            }
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/ConnectionStringDictionary"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/authsettings/list": {
+      "post": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Gets the Authentication / Authorization settings associated with web app",
+        "operationId": "Sites_ListSiteAuthSettings",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SiteAuthSettings"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/authsettings/list": {
+      "post": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Gets the Authentication / Authorization settings associated with web app",
+        "operationId": "Sites_ListSiteAuthSettingsSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SiteAuthSettings"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/authsettings": {
+      "put": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Updates the Authentication / Authorization settings associated with web app",
+        "operationId": "Sites_UpdateSiteAuthSettings",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "siteAuthSettings",
+            "in": "body",
+            "description": "Auth settings associated with web app",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/SiteAuthSettings"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SiteAuthSettings"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/authsettings": {
+      "put": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Updates the Authentication / Authorization settings associated with web app",
+        "operationId": "Sites_UpdateSiteAuthSettingsSlot",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "siteAuthSettings",
+            "in": "body",
+            "description": "Auth settings associated with web app",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/SiteAuthSettings"
+            }
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SiteAuthSettings"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/publishingcredentials/list": {
+      "post": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Gets the web app publishing credentials",
+        "operationId": "Sites_ListSitePublishingCredentials",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/User"
+            }
+          }
+        },
+        "deprecated": false,
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/publishingcredentials/list": {
+      "post": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Gets the web app publishing credentials",
+        "operationId": "Sites_ListSitePublishingCredentialsSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/User"
+            }
+          }
+        },
+        "deprecated": false,
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/metadata/list": {
+      "post": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Gets the web app meta data.",
+        "operationId": "Sites_ListSiteMetadata",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/StringDictionary"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/metadata/list": {
+      "post": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Gets the web app meta data.",
+        "operationId": "Sites_ListSiteMetadataSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/StringDictionary"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/metadata": {
+      "put": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Updates the meta data for web app",
+        "operationId": "Sites_UpdateSiteMetadata",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "metadata",
+            "in": "body",
+            "description": "Meta data of web app",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/StringDictionary"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/StringDictionary"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/metadata": {
+      "put": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Updates the meta data for web app",
+        "operationId": "Sites_UpdateSiteMetadataSlot",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "metadata",
+            "in": "body",
+            "description": "Meta data of web app",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/StringDictionary"
+            }
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/StringDictionary"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/logs": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Gets the web app logs configuration",
+        "operationId": "Sites_GetSiteLogsConfig",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SiteLogsConfig"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "put": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Updates the meta data for web app",
+        "operationId": "Sites_UpdateSiteLogsConfig",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "siteLogsConfig",
+            "in": "body",
+            "description": "Site logs configuration",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/SiteLogsConfig"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SiteLogsConfig"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/logs": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Gets the web app logs configuration",
+        "operationId": "Sites_GetSiteLogsConfigSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SiteLogsConfig"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "put": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Updates the meta data for web app",
+        "operationId": "Sites_UpdateSiteLogsConfigSlot",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "siteLogsConfig",
+            "in": "body",
+            "description": "Site logs configuration",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/SiteLogsConfig"
+            }
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/SiteLogsConfig"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/premieraddons": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "operationId": "Sites_ListSitePremierAddOns",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/premieraddons": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "operationId": "Sites_ListSitePremierAddOnsSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/premieraddons/{premierAddOnName}": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "operationId": "Sites_GetSitePremierAddOn",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "premierAddOnName",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "put": {
+        "tags": [
+          "Sites"
+        ],
+        "operationId": "Sites_AddSitePremierAddOn",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "premierAddOnName",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "premierAddOn",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/PremierAddOnRequest"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "delete": {
+        "tags": [
+          "Sites"
+        ],
+        "operationId": "Sites_DeleteSitePremierAddOn",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "premierAddOnName",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/premieraddons/{premierAddOnName}": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "operationId": "Sites_GetSitePremierAddOnSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "premierAddOnName",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "put": {
+        "tags": [
+          "Sites"
+        ],
+        "operationId": "Sites_AddSitePremierAddOnSlot",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "premierAddOnName",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "premierAddOn",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/PremierAddOnRequest"
+            }
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "delete": {
+        "tags": [
+          "Sites"
+        ],
+        "operationId": "Sites_DeleteSitePremierAddOnSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "premierAddOnName",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/backup/list": {
+      "post": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Gets the backup configuration for a web app",
+        "operationId": "Sites_GetSiteBackupConfiguration",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/BackupRequest"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/backup/list": {
+      "post": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Gets the backup configuration for a web app",
+        "operationId": "Sites_GetSiteBackupConfigurationSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/BackupRequest"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/backup": {
+      "put": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Updates backup configuration of web app",
+        "operationId": "Sites_UpdateSiteBackupConfiguration",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "request",
+            "in": "body",
+            "description": "Information on backup request",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/BackupRequest"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/BackupRequest"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/config/backup": {
+      "put": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Updates backup configuration of web app",
+        "operationId": "Sites_UpdateSiteBackupConfigurationSlot",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "request",
+            "in": "body",
+            "description": "Information on backup request",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/BackupRequest"
+            }
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/BackupRequest"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/backup": {
+      "post": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Creates web app backup",
+        "operationId": "Sites_BackupSite",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "request",
+            "in": "body",
+            "description": "Information on backup request",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/BackupRequest"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/BackupItem"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/backup": {
+      "post": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Creates web app backup",
+        "operationId": "Sites_BackupSiteSlot",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "request",
+            "in": "body",
+            "description": "Information on backup request",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/BackupRequest"
+            }
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/BackupItem"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/backups/discover": {
+      "put": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Discovers existing web app backups that can be restored",
+        "operationId": "Sites_DiscoverSiteRestore",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "request",
+            "in": "body",
+            "description": "Information on restore request",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/RestoreRequest"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/RestoreRequest"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/backups/discover": {
+      "put": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Discovers existing web app backups that can be restored",
+        "operationId": "Sites_DiscoverSiteRestoreSlot",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "request",
+            "in": "body",
+            "description": "Information on restore request",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/RestoreRequest"
+            }
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/RestoreRequest"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/backups": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Lists all available backups for web app",
+        "operationId": "Sites_ListSiteBackups",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/BackupItemCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/backups": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Lists all available backups for web app",
+        "operationId": "Sites_ListSiteBackupsSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/BackupItemCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/backups/{backupId}": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Gets status of a web app backup that may be in progress.",
+        "operationId": "Sites_GetSiteBackupStatus",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "backupId",
+            "in": "path",
+            "description": "Id of backup",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/BackupItem"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "delete": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Deletes a backup from Azure Storage",
+        "operationId": "Sites_DeleteBackup",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "backupId",
+            "in": "path",
+            "description": "Id of backup",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/BackupItem"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/backups/{backupId}": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Gets status of a web app backup that may be in progress.",
+        "operationId": "Sites_GetSiteBackupStatusSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "backupId",
+            "in": "path",
+            "description": "Id of backup",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/BackupItem"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "delete": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Deletes a backup from Azure Storage",
+        "operationId": "Sites_DeleteBackupSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "backupId",
+            "in": "path",
+            "description": "Id of backup",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/BackupItem"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/backups/{backupId}/list": {
+      "post": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Gets status of a web app backup that may be in progress, including secrets associated with the backup, such as the Azure Storage SAS URL. Also can be used to update the SAS URL for the backup if a new URL is passed in the request body.",
+        "operationId": "Sites_GetSiteBackupStatusSecretsSlot",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "backupId",
+            "in": "path",
+            "description": "Id of backup",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "request",
+            "in": "body",
+            "description": "Information on backup request",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/BackupRequest"
+            }
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/BackupItem"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/backups/{backupId}/list": {
+      "post": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Gets status of a web app backup that may be in progress, including secrets associated with the backup, such as the Azure Storage SAS URL. Also can be used to update the SAS URL for the backup if a new URL is passed in the request body.",
+        "operationId": "Sites_GetSiteBackupStatusSecrets",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "backupId",
+            "in": "path",
+            "description": "Id of backup",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "request",
+            "in": "body",
+            "description": "Information on backup request",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/BackupRequest"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/BackupItem"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/backups/{backupId}/restore": {
+      "post": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Restores a web app",
+        "operationId": "Sites_RestoreSite",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "backupId",
+            "in": "path",
+            "description": "Id of backup to restore",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "request",
+            "in": "body",
+            "description": "Information on restore request",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/RestoreRequest"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/RestoreResponse"
+            }
+          }
+        },
+        "deprecated": false,
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/backups/{backupId}/restore": {
+      "post": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Restores a web app",
+        "operationId": "Sites_RestoreSiteSlot",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "backupId",
+            "in": "path",
+            "description": "Id of backup to restore",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "request",
+            "in": "body",
+            "description": "Information on restore request",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/RestoreRequest"
+            }
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/RestoreResponse"
+            }
+          }
+        },
+        "deprecated": false,
+        "x-ms-long-running-operation": true
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/usages": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Gets the quota usage numbers for web app",
+        "operationId": "Sites_GetSiteUsages",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "description": "Return only usages specified in the filter. Filter is specified by using OData syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.",
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/CsmUsageQuotaCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/usages": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Gets the quota usage numbers for web app",
+        "operationId": "Sites_GetSiteUsagesSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "description": "Return only usages specified in the filter. Filter is specified by using OData syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.",
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/CsmUsageQuotaCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/metrics": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Gets metrics for web app",
+        "operationId": "Sites_GetSiteMetrics",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "details",
+            "in": "query",
+            "description": "If true, metric details are included in response",
+            "type": "boolean"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "description": "Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.",
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/ResourceMetricCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/metrics": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Gets metrics for web app",
+        "operationId": "Sites_GetSiteMetricsSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "details",
+            "in": "query",
+            "description": "If true, metric details are included in response",
+            "type": "boolean"
+          },
+          {
+            "name": "$filter",
+            "in": "query",
+            "description": "Return only usages/metrics specified in the filter. Filter conforms to odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and startTime eq '2014-01-01T00:00:00Z' and endTime eq '2014-12-31T23:59:59Z' and timeGrain eq duration'[Hour|Minute|Day]'.",
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/ResourceMetricCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/metricdefinitions": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Gets metric definitions for web app",
+        "operationId": "Sites_GetSiteMetricDefinitionsSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/MetricDefinitionCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/metricdefinitions": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Gets metric definitions for web app",
+        "operationId": "Sites_GetSiteMetricDefinitions",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/MetricDefinitionCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/publishxml": {
+      "post": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Gets the publishing profile for web app",
+        "operationId": "Sites_ListSitePublishingProfileXml",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "options",
+            "in": "body",
+            "description": "Specifies options for publishing profile. Pass CsmPublishingProfileOptions.Format=FileZilla3 for FileZilla FTP format.",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/CsmPublishingProfileOptions"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "type": "file"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/publishxml": {
+      "post": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Gets the publishing profile for web app",
+        "operationId": "Sites_ListSitePublishingProfileXmlSlot",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "options",
+            "in": "body",
+            "description": "Specifies options for publishing profile. Pass CsmPublishingProfileOptions.Format=FileZilla3 for FileZilla FTP format.",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/CsmPublishingProfileOptions"
+            }
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "type": "file"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/restart": {
+      "post": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Restarts web app",
+        "operationId": "Sites_RestartSiteSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "softRestart",
+            "in": "query",
+            "description": "Soft restart applies the configuration settings and restarts the app if necessary. Hard restart always restarts and reprovisions the app",
+            "type": "boolean"
+          },
+          {
+            "name": "synchronous",
+            "in": "query",
+            "description": "If true then the API will block until the app has been restarted",
+            "type": "boolean"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/restart": {
+      "post": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Restarts web app",
+        "operationId": "Sites_RestartSite",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "softRestart",
+            "in": "query",
+            "description": "Soft restart applies the configuration settings and restarts the app if necessary. Hard restart always restarts and reprovisions the app",
+            "type": "boolean"
+          },
+          {
+            "name": "synchronous",
+            "in": "query",
+            "description": "If true then the API will block until the app has been restarted",
+            "type": "boolean"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/start": {
+      "post": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Starts web app",
+        "operationId": "Sites_StartSite",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/start": {
+      "post": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Starts web app",
+        "operationId": "Sites_StartSiteSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/stop": {
+      "post": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Stops web app",
+        "operationId": "Sites_StopSite",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/stop": {
+      "post": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Stops web app",
+        "operationId": "Sites_StopSiteSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/sync": {
+      "post": {
+        "tags": [
+          "Sites"
+        ],
+        "operationId": "Sites_SyncSiteRepository",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/sync": {
+      "post": {
+        "tags": [
+          "Sites"
+        ],
+        "operationId": "Sites_SyncSiteRepositorySlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/newpassword": {
+      "post": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Generates new random app publishing password",
+        "operationId": "Sites_GenerateNewSitePublishingPasswordSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "Name of web app slot. If not specified then will default to production slot.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/newpassword": {
+      "post": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Generates new random app publishing password",
+        "operationId": "Sites_GenerateNewSitePublishingPassword",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/hybridconnection/{entityName}": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Retrieves a Biztalk Hybrid Connection identified by its entity name.",
+        "operationId": "Sites_GetSiteRelayServiceConnection",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "The resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "The name of the web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "entityName",
+            "in": "path",
+            "description": "The name by which the Hybrid Connection is identified",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/RelayServiceConnectionEntity"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "put": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Creates a new association to a Biztalk Hybrid Connection, or updates an existing one.",
+        "operationId": "Sites_CreateOrUpdateSiteRelayServiceConnection",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "The resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "The name of the web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "entityName",
+            "in": "path",
+            "description": "The name by which the Hybrid Connection is identified",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "connectionEnvelope",
+            "in": "body",
+            "description": "The details of the Hybrid Connection",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/RelayServiceConnectionEntity"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/RelayServiceConnectionEntity"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "delete": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Removes the association to a Biztalk Hybrid Connection, identified by its entity name.",
+        "operationId": "Sites_DeleteSiteRelayServiceConnection",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "The resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "The name of the web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "entityName",
+            "in": "path",
+            "description": "The name by which the Hybrid Connection is identified",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "patch": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Creates a new association to a Biztalk Hybrid Connection, or updates an existing one.",
+        "operationId": "Sites_UpdateSiteRelayServiceConnection",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "The resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "The name of the web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "entityName",
+            "in": "path",
+            "description": "The name by which the Hybrid Connection is identified",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "connectionEnvelope",
+            "in": "body",
+            "description": "The details of the Hybrid Connection",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/RelayServiceConnectionEntity"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/RelayServiceConnectionEntity"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/hybridconnection/{entityName}": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Retrieves a Biztalk Hybrid Connection identified by its entity name.",
+        "operationId": "Sites_GetSiteRelayServiceConnectionSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "The resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "The name of the web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "entityName",
+            "in": "path",
+            "description": "The name by which the Hybrid Connection is identified",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "The name of the slot for the web app.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/RelayServiceConnectionEntity"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "put": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Creates a new association to a Biztalk Hybrid Connection, or updates an existing one.",
+        "operationId": "Sites_CreateOrUpdateSiteRelayServiceConnectionSlot",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "The resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "The name of the web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "entityName",
+            "in": "path",
+            "description": "The name by which the Hybrid Connection is identified",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "connectionEnvelope",
+            "in": "body",
+            "description": "The details of the Hybrid Connection",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/RelayServiceConnectionEntity"
+            }
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "The name of the slot for the web app.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/RelayServiceConnectionEntity"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "delete": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Removes the association to a Biztalk Hybrid Connection, identified by its entity name.",
+        "operationId": "Sites_DeleteSiteRelayServiceConnectionSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "The resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "The name of the web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "entityName",
+            "in": "path",
+            "description": "The name by which the Hybrid Connection is identified",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "The name of the slot for the web app.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "patch": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Creates a new association to a Biztalk Hybrid Connection, or updates an existing one.",
+        "operationId": "Sites_UpdateSiteRelayServiceConnectionSlot",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "The resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "The name of the web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "entityName",
+            "in": "path",
+            "description": "The name by which the Hybrid Connection is identified",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "connectionEnvelope",
+            "in": "body",
+            "description": "The details of the Hybrid Connection",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/RelayServiceConnectionEntity"
+            }
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "The name of the slot for the web app.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/RelayServiceConnectionEntity"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/hybridconnection": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Retrieves all Biztalk Hybrid Connections associated with this web app.",
+        "operationId": "Sites_ListSiteRelayServiceConnectionsSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "The resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "The name of the web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "The name of the slot for the web app.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/RelayServiceConnectionEntity"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/hybridconnection": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Retrieves all Biztalk Hybrid Connections associated with this web app.",
+        "operationId": "Sites_ListSiteRelayServiceConnections",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "The resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "The name of the web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/RelayServiceConnectionEntity"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/virtualNetworkConnections/{vnetName}/gateways/{gatewayName}": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Retrieves a Virtual Network connection gateway associated with this web app and virtual network.",
+        "operationId": "Sites_GetSiteVnetGatewaySlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "The resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "The name of the web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "vnetName",
+            "in": "path",
+            "description": "The name of the Virtual Network",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "gatewayName",
+            "in": "path",
+            "description": "The name of the gateway. The only gateway that exists presently is \"primary\"",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "The name of the slot for this web app.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          },
+          "404": {
+            "description": "Gateway does not exist. Only the \"primary\" gateway exists presently."
+          }
+        },
+        "deprecated": false
+      },
+      "put": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Updates the Virtual Network Gateway.",
+        "operationId": "Sites_CreateOrUpdateSiteVNETConnectionGatewaySlot",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "The resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "The name of the web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "vnetName",
+            "in": "path",
+            "description": "The name of the Virtual Network",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "gatewayName",
+            "in": "path",
+            "description": "The name of the gateway. The only gateway that exists presently is \"primary\"",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "connectionEnvelope",
+            "in": "body",
+            "description": "The properties to update this gateway with.",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/VnetGateway"
+            }
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "The name of the slot for this web app.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/VnetGateway"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "patch": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Updates the Virtual Network Gateway.",
+        "operationId": "Sites_UpdateSiteVNETConnectionGatewaySlot",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "The resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "The name of the web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "vnetName",
+            "in": "path",
+            "description": "The name of the Virtual Network",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "gatewayName",
+            "in": "path",
+            "description": "The name of the gateway. The only gateway that exists presently is \"primary\"",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "connectionEnvelope",
+            "in": "body",
+            "description": "The properties to update this gateway with.",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/VnetGateway"
+            }
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "The name of the slot for this web app.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/VnetGateway"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/virtualNetworkConnections/{vnetName}/gateways/{gatewayName}": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Retrieves a Virtual Network connection gateway associated with this web app and virtual network.",
+        "operationId": "Sites_GetSiteVnetGateway",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "The resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "The name of the web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "vnetName",
+            "in": "path",
+            "description": "The name of the Virtual Network",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "gatewayName",
+            "in": "path",
+            "description": "The name of the gateway. The only gateway that exists presently is \"primary\"",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          },
+          "404": {
+            "description": "Gateway does not exist. Only the \"primary\" gateway exists presently."
+          }
+        },
+        "deprecated": false
+      },
+      "put": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Updates the Virtual Network Gateway.",
+        "operationId": "Sites_CreateOrUpdateSiteVNETConnectionGateway",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "The resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "The name of the web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "vnetName",
+            "in": "path",
+            "description": "The name of the Virtual Network",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "gatewayName",
+            "in": "path",
+            "description": "The name of the gateway. The only gateway that exists presently is \"primary\"",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "connectionEnvelope",
+            "in": "body",
+            "description": "The properties to update this gateway with.",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/VnetGateway"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/VnetGateway"
+            }
+          }
+        },
+        "deprecated": false
+      },
+      "patch": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Updates the Virtual Network Gateway.",
+        "operationId": "Sites_UpdateSiteVNETConnectionGateway",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "The resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "The name of the web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "vnetName",
+            "in": "path",
+            "description": "The name of the Virtual Network",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "gatewayName",
+            "in": "path",
+            "description": "The name of the gateway. The only gateway that exists presently is \"primary\"",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "connectionEnvelope",
+            "in": "body",
+            "description": "The properties to update this gateway with.",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/VnetGateway"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/VnetGateway"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/virtualNetworkConnections": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Retrieves a list of all Virtual Network Connections associated with this web app.",
+        "operationId": "Sites_GetSiteVNETConnections",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "The resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "The name of the web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/VnetInfo"
+              }
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/virtualNetworkConnections": {
+      "get": {
+        "tags": [
+          "Sites"
+        ],
+        "summary": "Retrieves a list of all Virtual Network Connections associated with this web app.",
+        "operationId": "Sites_GetSiteVNETConnectionsSlot",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "The resource group name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "path",
+            "description": "The name of the web app",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "slot",
+            "in": "path",
+            "description": "The name of the slot for this web app.",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/VnetInfo"
+              }
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.DomainRegistration/topLevelDomains": {
+      "get": {
+        "tags": [
+          "TopLevelDomains"
+        ],
+        "summary": "Lists all top level domains supported for registration",
+        "operationId": "TopLevelDomains_GetGetTopLevelDomains",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/TopLevelDomainCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.DomainRegistration/topLevelDomains/{name}": {
+      "get": {
+        "tags": [
+          "TopLevelDomains"
+        ],
+        "summary": "Gets details of a top level domain",
+        "operationId": "TopLevelDomains_GetTopLevelDomain",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of the top level domain",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/TopLevelDomain"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/providers/Microsoft.DomainRegistration/topLevelDomains/{name}/listAgreements": {
+      "post": {
+        "tags": [
+          "TopLevelDomains"
+        ],
+        "summary": "Lists legal agreements that user needs to accept before purchasing domain",
+        "operationId": "TopLevelDomains_ListTopLevelDomainAgreements",
+        "consumes": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml",
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "text/json"
+        ],
+        "parameters": [
+          {
+            "name": "name",
+            "in": "path",
+            "description": "Name of the top level domain",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "agreementOption",
+            "in": "body",
+            "description": "Domain agreement options",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/TopLevelDomainAgreementOption"
+            }
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/TldLegalAgreementCollection"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web.Admin/environments/{environmentName}/usage": {
+      "get": {
+        "tags": [
+          "Usage"
+        ],
+        "summary": "Returns usage records for specified subscription and resource groups",
+        "operationId": "Usage_GetUsage",
+        "consumes": [],
+        "produces": [
+          "application/json",
+          "text/json",
+          "application/xml",
+          "text/xml"
+        ],
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "description": "Name of resource group",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "environmentName",
+            "in": "path",
+            "description": "Environment name",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "lastId",
+            "in": "query",
+            "description": "Last marker that was returned from the batch",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "batchSize",
+            "in": "query",
+            "description": "size of the batch to be returned.",
+            "required": true,
+            "type": "integer",
+            "format": "int32"
+          },
+          {
+            "$ref": "#/parameters/subscriptionIdParameter"
+          },
+          {
+            "$ref": "#/parameters/apiVersionParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/Object"
+            }
+          }
+        },
+        "deprecated": false
+      }
+    }
+  },
+  "definitions": {
+    "ArmPlan": {
+      "description": "The plan object in an ARM, represents a marketplace plan",
+      "type": "object",
+      "properties": {
+        "name": {
+          "description": "The name",
+          "type": "string"
+        },
+        "publisher": {
+          "description": "The publisher",
+          "type": "string"
+        },
+        "product": {
+          "description": "The product",
+          "type": "string"
+        },
+        "promotionCode": {
+          "description": "The promotion code",
+          "type": "string"
+        },
+        "version": {
+          "description": "Version of product",
+          "type": "string"
+        }
+      }
+    },
+    "CertificateOrderCertificate": {
+      "description": "Class representing the Key Vault container for certificate purchased through Azure",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "properties": {
+            "keyVaultId": {
+              "description": "Key Vault Csm resource Id",
+              "type": "string"
+            },
+            "keyVaultSecretName": {
+              "description": "Key Vault secret name",
+              "type": "string"
+            },
+            "provisioningState": {
+              "description": "Status of the Key Vault secret",
+              "enum": [
+                "Initialized",
+                "WaitingOnCertificateOrder",
+                "Succeeded",
+                "CertificateOrderFailed",
+                "OperationNotPermittedOnKeyVault",
+                "AzureServiceUnauthorizedToAccessKeyVault",
+                "KeyVaultDoesNotExist",
+                "KeyVaultSecretDoesNotExist",
+                "UnknownError",
+                "Unknown"
+              ],
+              "type": "string",
+              "x-ms-enum": {
+                "name": "KeyVaultSecretStatus",
+                "modelAsString": false
+              }
+            }
+          },
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "SkuDescription": {
+      "description": "Describes a sku for a scalable resource",
+      "type": "object",
+      "properties": {
+        "name": {
+          "description": "Name of the resource sku",
+          "type": "string"
+        },
+        "tier": {
+          "description": "Service Tier of the resource sku",
+          "type": "string"
+        },
+        "size": {
+          "description": "Size specifier of the resource sku",
+          "type": "string"
+        },
+        "family": {
+          "description": "Family code of the resource sku",
+          "type": "string"
+        },
+        "capacity": {
+          "format": "int32",
+          "description": "Current number of instances assigned to the resource",
+          "type": "integer"
+        }
+      }
+    },
+    "Object": {
+      "type": "object",
+      "properties": {}
+    },
+    "CertificateOrder": {
+      "description": "Certificate purchase order",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "properties": {
+            "certificates": {
+              "description": "State of the Key Vault secret",
+              "type": "object",
+              "additionalProperties": {
+                "$ref": "#/definitions/CertificateOrderCertificate"
+              }
+            },
+            "distinguishedName": {
+              "description": "Certificate distinguished name",
+              "type": "string"
+            },
+            "domainVerificationToken": {
+              "description": "Domain Verification Token",
+              "type": "string"
+            },
+            "validityInYears": {
+              "format": "int32",
+              "description": "Duration in years (must be between 1 and 3)",
+              "type": "integer"
+            },
+            "keySize": {
+              "format": "int32",
+              "description": "Certificate Key Size",
+              "type": "integer"
+            },
+            "productType": {
+              "description": "Certificate product type",
+              "enum": [
+                "StandardDomainValidatedSsl",
+                "StandardDomainValidatedWildCardSsl"
+              ],
+              "type": "string",
+              "x-ms-enum": {
+                "name": "CertificateProductType",
+                "modelAsString": false
+              }
+            },
+            "autoRenew": {
+              "description": "Auto renew",
+              "type": "boolean"
+            },
+            "provisioningState": {
+              "description": "Status of certificate order",
+              "enum": [
+                "Succeeded",
+                "Failed",
+                "Canceled",
+                "InProgress",
+                "Deleting"
+              ],
+              "type": "string",
+              "x-ms-enum": {
+                "name": "ProvisioningState",
+                "modelAsString": false
+              }
+            },
+            "status": {
+              "description": "Current order status",
+              "enum": [
+                "Pendingissuance",
+                "Issued",
+                "Revoked",
+                "Canceled",
+                "Denied",
+                "Pendingrevocation",
+                "PendingRekey",
+                "Unused",
+                "Expired",
+                "NotSubmitted"
+              ],
+              "type": "string",
+              "x-ms-enum": {
+                "name": "CertificateOrderStatus",
+                "modelAsString": false
+              }
+            },
+            "signedCertificate": {
+              "$ref": "#/definitions/CertificateDetails",
+              "description": "Signed certificate"
+            },
+            "csr": {
+              "description": "Last CSR that was created for this order",
+              "type": "string"
+            },
+            "intermediate": {
+              "$ref": "#/definitions/CertificateDetails",
+              "description": "Intermediate certificate"
+            },
+            "root": {
+              "$ref": "#/definitions/CertificateDetails",
+              "description": "Root certificate"
+            },
+            "serialNumber": {
+              "description": "Current serial number of the certificate",
+              "type": "string"
+            },
+            "lastCertificateIssuanceTime": {
+              "format": "date-time",
+              "description": "Certificate last issuance time",
+              "type": "string"
+            },
+            "expirationTime": {
+              "format": "date-time",
+              "description": "Certificate expiration time",
+              "type": "string"
+            }
+          },
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "CertificateDetails": {
+      "description": "Certificate Details",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "properties": {
+            "version": {
+              "format": "int32",
+              "description": "Version",
+              "type": "integer"
+            },
+            "serialNumber": {
+              "description": "Serial Number",
+              "type": "string"
+            },
+            "thumbprint": {
+              "description": "Thumbprint",
+              "type": "string"
+            },
+            "subject": {
+              "description": "Subject",
+              "type": "string"
+            },
+            "notBefore": {
+              "format": "date-time",
+              "description": "Valid from",
+              "type": "string"
+            },
+            "notAfter": {
+              "format": "date-time",
+              "description": "Valid to",
+              "type": "string"
+            },
+            "signatureAlgorithm": {
+              "description": "Signature Algorithm",
+              "type": "string"
+            },
+            "issuer": {
+              "description": "Issuer",
+              "type": "string"
+            },
+            "rawData": {
+              "description": "Raw certificate data",
+              "type": "string"
+            }
+          },
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "CertificateOrderCollection": {
+      "description": "Collection of ceritificate orders",
+      "type": "object",
+      "properties": {
+        "value": {
+          "description": "Collection of resources",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/CertificateOrder"
+          }
+        },
+        "nextLink": {
+          "description": "Link to next page of resources",
+          "type": "string"
+        }
+      }
+    },
+    "CertificateOrderCertificateCollection": {
+      "description": "Collection of ceritificateorder certificates",
+      "type": "object",
+      "properties": {
+        "value": {
+          "description": "Collection of resources",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/CertificateOrderCertificate"
+          }
+        },
+        "nextLink": {
+          "description": "Link to next page of resources",
+          "type": "string"
+        }
+      }
+    },
+    "ReissueCertificateOrderRequest": {
+      "description": "Class representing certificate reissue request",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "properties": {
+            "keySize": {
+              "format": "int32",
+              "description": "Certificate Key Size",
+              "type": "integer"
+            },
+            "delayExistingRevokeInHours": {
+              "format": "int32",
+              "description": "Delay in hours to revoke existing certificate after the new certificate is issued",
+              "type": "integer"
+            }
+          },
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "RenewCertificateOrderRequest": {
+      "description": "Class representing certificate renew request",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "properties": {
+            "keySize": {
+              "format": "int32",
+              "description": "Certificate Key Size",
+              "type": "integer"
+            }
+          },
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "CertificateOrderAction": {
+      "description": "Represents a certificate action",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "required": [
+            "type"
+          ],
+          "properties": {
+            "type": {
+              "description": "Type",
+              "enum": [
+                "CertificateIssued",
+                "CertificateOrderCanceled",
+                "CertificateOrderCreated",
+                "CertificateRevoked",
+                "DomainValidationComplete",
+                "FraudDetected",
+                "OrgNameChange",
+                "OrgValidationComplete",
+                "SanDrop"
+              ],
+              "type": "string",
+              "x-ms-enum": {
+                "name": "CertificateOrderActionType",
+                "modelAsString": false
+              }
+            },
+            "createdAt": {
+              "format": "date-time",
+              "description": "Time at which the certificate action was performed",
+              "type": "string"
+            }
+          },
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "CertificateEmail": {
+      "description": "Certificate Email",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "properties": {
+            "emailId": {
+              "description": "Email id",
+              "type": "string"
+            },
+            "timeStamp": {
+              "format": "date-time",
+              "description": "Time stamp",
+              "type": "string"
+            }
+          },
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "CertificateCollection": {
+      "description": "Collection of certificates",
+      "type": "object",
+      "properties": {
+        "value": {
+          "description": "Collection of resources",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Certificate"
+          }
+        },
+        "nextLink": {
+          "description": "Link to next page of resources",
+          "type": "string"
+        }
+      }
+    },
+    "Certificate": {
+      "description": "App certificate",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "properties": {
+            "friendlyName": {
+              "description": "Friendly name of the certificate",
+              "type": "string"
+            },
+            "subjectName": {
+              "description": "Subject name of the certificate",
+              "type": "string"
+            },
+            "hostNames": {
+              "description": "Host names the certificate applies to",
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            "pfxBlob": {
+              "description": "Pfx blob",
+              "type": "string"
+            },
+            "siteName": {
+              "description": "App name",
+              "type": "string"
+            },
+            "selfLink": {
+              "description": "Self link",
+              "type": "string"
+            },
+            "issuer": {
+              "description": "Certificate issuer",
+              "type": "string"
+            },
+            "issueDate": {
+              "format": "date-time",
+              "description": "Certificate issue Date",
+              "type": "string"
+            },
+            "expirationDate": {
+              "format": "date-time",
+              "description": "Certificate expriration date",
+              "type": "string"
+            },
+            "password": {
+              "description": "Certificate password",
+              "type": "string"
+            },
+            "thumbprint": {
+              "description": "Certificate thumbprint",
+              "type": "string"
+            },
+            "valid": {
+              "description": "Is the certificate valid?",
+              "type": "boolean"
+            },
+            "cerBlob": {
+              "description": "Raw bytes of .cer file",
+              "type": "string"
+            },
+            "publicKeyHash": {
+              "description": "Public key hash",
+              "type": "string"
+            },
+            "hostingEnvironmentProfile": {
+              "$ref": "#/definitions/HostingEnvironmentProfile",
+              "description": "Specification for the hosting environment (App Service Environment) to use for the certificate"
+            }
+          },
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "HostingEnvironmentProfile": {
+      "description": "Specification for a hostingEnvironment (App Service Environment) to use for this resource",
+      "type": "object",
+      "properties": {
+        "id": {
+          "description": "Resource id of the hostingEnvironment (App Service Environment)",
+          "type": "string"
+        },
+        "name": {
+          "description": "Name of the hostingEnvironment (App Service Environment) (read only)",
+          "type": "string"
+        },
+        "type": {
+          "description": "Resource type of the hostingEnvironment (App Service Environment) (read only)",
+          "type": "string"
+        }
+      }
+    },
+    "Csr": {
+      "description": "Certificate signing request object",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "properties": {
+            "name": {
+              "description": "Name used to locate CSR object",
+              "type": "string"
+            },
+            "distinguishedName": {
+              "description": "Distinguished name of certificate to be created",
+              "type": "string"
+            },
+            "csrString": {
+              "description": "Actual CSR string created",
+              "type": "string"
+            },
+            "pfxBlob": {
+              "description": "PFX certifcate of created certificate",
+              "type": "string"
+            },
+            "password": {
+              "description": "PFX password",
+              "type": "string"
+            },
+            "publicKeyHash": {
+              "description": "Hash of the certificates public key",
+              "type": "string"
+            },
+            "hostingEnvironment": {
+              "description": "Hosting environment",
+              "type": "string"
+            }
+          },
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "ClassicMobileServiceCollection": {
+      "description": "Collection of Classic Mobile Services",
+      "type": "object",
+      "properties": {
+        "value": {
+          "description": "Collection of resources",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ClassicMobileService"
+          }
+        },
+        "nextLink": {
+          "description": "Link to next page of resources",
+          "type": "string"
+        }
+      }
+    },
+    "ClassicMobileService": {
+      "description": "A mobile service",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "properties": {
+            "name": {
+              "description": "Name of the mobile service",
+              "type": "string"
+            }
+          },
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "DomainCollection": {
+      "description": "Collection of domains",
+      "type": "object",
+      "properties": {
+        "value": {
+          "description": "Collection of resources",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Domain"
+          }
+        },
+        "nextLink": {
+          "description": "Link to next page of resources",
+          "type": "string"
+        }
+      }
+    },
+    "Domain": {
+      "description": "Represents a domain",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "properties": {
+            "contactAdmin": {
+              "$ref": "#/definitions/Contact",
+              "description": "Admin contact information"
+            },
+            "contactBilling": {
+              "$ref": "#/definitions/Contact",
+              "description": "Billing contact information"
+            },
+            "contactRegistrant": {
+              "$ref": "#/definitions/Contact",
+              "description": "Registrant contact information"
+            },
+            "contactTech": {
+              "$ref": "#/definitions/Contact",
+              "description": "Technical contact information"
+            },
+            "registrationStatus": {
+              "description": "Domain registration status",
+              "enum": [
+                "Active",
+                "Awaiting",
+                "Cancelled",
+                "Confiscated",
+                "Disabled",
+                "Excluded",
+                "Expired",
+                "Failed",
+                "Held",
+                "Locked",
+                "Parked",
+                "Pending",
+                "Reserved",
+                "Reverted",
+                "Suspended",
+                "Transferred",
+                "Unknown",
+                "Unlocked",
+                "Unparked",
+                "Updated",
+                "JsonConverterFailed"
+              ],
+              "type": "string",
+              "x-ms-enum": {
+                "name": "DomainStatus",
+                "modelAsString": false
+              }
+            },
+            "provisioningState": {
+              "description": "Domain provisioning state",
+              "enum": [
+                "Succeeded",
+                "Failed",
+                "Canceled",
+                "InProgress",
+                "Deleting"
+              ],
+              "type": "string",
+              "x-ms-enum": {
+                "name": "ProvisioningState",
+                "modelAsString": false
+              }
+            },
+            "nameServers": {
+              "description": "Name servers",
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            "privacy": {
+              "description": "If true then domain privacy is enabled for this domain",
+              "type": "boolean"
+            },
+            "createdTime": {
+              "format": "date-time",
+              "description": "Domain creation timestamp",
+              "type": "string"
+            },
+            "expirationTime": {
+              "format": "date-time",
+              "description": "Domain expiration timestamp",
+              "type": "string"
+            },
+            "lastRenewedTime": {
+              "format": "date-time",
+              "description": "Timestamp when the domain was renewed last time",
+              "type": "string"
+            },
+            "autoRenew": {
+              "description": "If true then domain will renewed automatically",
+              "type": "boolean"
+            },
+            "readyForDnsRecordManagement": {
+              "description": "If true then Azure can assign this domain to Web Apps. This value will be true if domain registration status is active and it is hosted on name servers Azure has programmatic access to",
+              "type": "boolean"
+            },
+            "managedHostNames": {
+              "description": "All hostnames derived from the domain and assigned to Azure resources",
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/HostName"
+              }
+            },
+            "consent": {
+              "$ref": "#/definitions/DomainPurchaseConsent",
+              "description": "Legal agreement consent"
+            },
+            "domainNotRenewableReasons": {
+              "description": "Reasons why domain is not renewable",
+              "type": "array",
+              "items": {
+                "enum": [
+                  "RegistrationStatusNotSupportedForRenewal",
+                  "ExpirationNotInRenewalTimeRange",
+                  "SubscriptionNotActive"
+                ],
+                "type": "string"
+              }
+            }
+          },
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "Contact": {
+      "description": "Contact information for domain registration. If 'Domain Privacy' option is not selected then the contact information will be  be made publicly available through the Whois directories as per ICANN requirements.",
+      "type": "object",
+      "properties": {
+        "addressMailing": {
+          "$ref": "#/definitions/Address",
+          "description": "Mailing address"
+        },
+        "email": {
+          "description": "Email address",
+          "type": "string"
+        },
+        "fax": {
+          "description": "Fax number",
+          "type": "string"
+        },
+        "jobTitle": {
+          "description": "Job title",
+          "type": "string"
+        },
+        "nameFirst": {
+          "description": "First name",
+          "type": "string"
+        },
+        "nameLast": {
+          "description": "Last name",
+          "type": "string"
+        },
+        "nameMiddle": {
+          "description": "Middle name",
+          "type": "string"
+        },
+        "organization": {
+          "description": "Organization",
+          "type": "string"
+        },
+        "phone": {
+          "description": "Phone number",
+          "type": "string"
+        }
+      }
+    },
+    "HostName": {
+      "description": "Details of a hostname derived from a domain",
+      "type": "object",
+      "properties": {
+        "name": {
+          "description": "Name of the hostname",
+          "type": "string"
+        },
+        "siteNames": {
+          "description": "List of sites the hostname is assigned to. This list will have more than one site only if the hostname is pointing to a Traffic Manager",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "azureResourceName": {
+          "description": "Name of the Azure resource the hostname is assigned to. If it is assigned to a traffic manager then it will be the traffic manager name otherwise it will be the website name",
+          "type": "string"
+        },
+        "azureResourceType": {
+          "description": "Type of the Azure resource the hostname is assigned to",
+          "enum": [
+            "Website",
+            "TrafficManager"
+          ],
+          "type": "string",
+          "x-ms-enum": {
+            "name": "AzureResourceType",
+            "modelAsString": false
+          }
+        },
+        "customHostNameDnsRecordType": {
+          "description": "Type of the Dns record",
+          "enum": [
+            "CName",
+            "A"
+          ],
+          "type": "string",
+          "x-ms-enum": {
+            "name": "CustomHostNameDnsRecordType",
+            "modelAsString": false
+          }
+        },
+        "hostNameType": {
+          "description": "Type of the hostname",
+          "enum": [
+            "Verified",
+            "Managed"
+          ],
+          "type": "string",
+          "x-ms-enum": {
+            "name": "HostNameType",
+            "modelAsString": false
+          }
+        }
+      }
+    },
+    "DomainPurchaseConsent": {
+      "description": "Domain purchase consent object representing acceptance of applicable legal agreements",
+      "type": "object",
+      "properties": {
+        "agreementKeys": {
+          "description": "List of applicable legal agreement keys. This list can be retrieved using ListLegalAgreements Api under TopLevelDomain resource",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "agreedBy": {
+          "description": "Client IP address",
+          "type": "string"
+        },
+        "agreedAt": {
+          "format": "date-time",
+          "description": "Timestamp when the agreements were accepted",
+          "type": "string"
+        }
+      }
+    },
+    "Address": {
+      "description": "Address information for domain registration",
+      "type": "object",
+      "properties": {
+        "address1": {
+          "description": "Address 1",
+          "type": "string"
+        },
+        "address2": {
+          "description": "Address 2",
+          "type": "string"
+        },
+        "city": {
+          "description": "City",
+          "type": "string"
+        },
+        "country": {
+          "description": "Country",
+          "type": "string"
+        },
+        "postalCode": {
+          "description": "Postal code",
+          "type": "string"
+        },
+        "state": {
+          "description": "State",
+          "type": "string"
+        }
+      }
+    },
+    "User": {
+      "description": "Represents user crendentials used for publishing activity",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "properties": {
+            "name": {
+              "description": "Username (internal)",
+              "type": "string"
+            },
+            "publishingUserName": {
+              "description": "Username used for publishing",
+              "type": "string"
+            },
+            "publishingPassword": {
+              "description": "Password used for publishing",
+              "type": "string"
+            }
+          },
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "GeoRegionCollection": {
+      "description": "Collection of geo regions",
+      "type": "object",
+      "properties": {
+        "value": {
+          "description": "Collection of resources",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/GeoRegion"
+          }
+        },
+        "nextLink": {
+          "description": "Link to next page of resources",
+          "type": "string"
+        }
+      }
+    },
+    "GeoRegion": {
+      "description": "Geographical region",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "properties": {
+            "name": {
+              "description": "Region name",
+              "type": "string"
+            },
+            "description": {
+              "description": "Region description",
+              "type": "string"
+            },
+            "displayName": {
+              "description": "Display name for region",
+              "type": "string"
+            }
+          },
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "ServerFarmCollection": {
+      "description": "Collection of serverfarms",
+      "type": "object",
+      "properties": {
+        "value": {
+          "description": "Collection of resources",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ServerFarmWithRichSku"
+          }
+        },
+        "nextLink": {
+          "description": "Link to next page of resources",
+          "type": "string"
+        }
+      }
+    },
+    "ServerFarmWithRichSku": {
+      "description": "App Service Plan Model",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "required": [
+            "status"
+          ],
+          "properties": {
+            "name": {
+              "description": "Name for the App Service Plan",
+              "type": "string"
+            },
+            "workerTierName": {
+              "description": "Target worker tier assigned to the App Service Plan",
+              "type": "string"
+            },
+            "status": {
+              "description": "App Service Plan Status",
+              "enum": [
+                "Ready",
+                "Pending"
+              ],
+              "type": "string",
+              "readOnly": true,
+              "x-ms-enum": {
+                "name": "StatusOptions",
+                "modelAsString": false
+              }
+            },
+            "subscription": {
+              "description": "App Service Plan Subscription",
+              "type": "string",
+              "readOnly": true
+            },
+            "adminSiteName": {
+              "description": "App Service Plan administration site",
+              "type": "string"
+            },
+            "hostingEnvironmentProfile": {
+              "$ref": "#/definitions/HostingEnvironmentProfile",
+              "description": "Specification for the hosting environment (App Service Environment) to use for the App Service Plan"
+            },
+            "maximumNumberOfWorkers": {
+              "format": "int32",
+              "description": "Maximum number of instances that can be assigned to this App Service Plan",
+              "type": "integer"
+            },
+            "geoRegion": {
+              "description": "Geographical location for the App Service Plan",
+              "type": "string",
+              "readOnly": true
+            },
+            "perSiteScaling": {
+              "description": "If True apps assigned to this App Service Plan can be scaled independently\r\n            If False apps assigned to this App Service Plan will scale to all instances of the plan",
+              "type": "boolean"
+            },
+            "numberOfSites": {
+              "format": "int32",
+              "description": "Number of web apps assigned to this App Service Plan",
+              "type": "integer",
+              "readOnly": true
+            },
+            "resourceGroup": {
+              "description": "Resource group of the serverfarm",
+              "type": "string",
+              "readOnly": true
+            }
+          },
+          "x-ms-client-flatten": true
+        },
+        "sku": {
+          "$ref": "#/definitions/SkuDescription"
+        }
+      }
+    },
+    "SiteCollection": {
+      "description": "Collection of sites",
+      "type": "object",
+      "properties": {
+        "value": {
+          "description": "Collection of resources",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Site"
+          }
+        },
+        "nextLink": {
+          "description": "Link to next page of resources",
+          "type": "string"
+        }
+      }
+    },
+    "Site": {
+      "description": "Represents a web app",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "required": [
+            "usageState",
+            "availabilityState"
+          ],
+          "properties": {
+            "name": {
+              "description": "Name of web app",
+              "type": "string"
+            },
+            "state": {
+              "description": "State of the web app",
+              "type": "string",
+              "readOnly": true
+            },
+            "hostNames": {
+              "description": "Hostnames associated with web app",
+              "type": "array",
+              "items": {
+                "type": "string"
+              },
+              "readOnly": true
+            },
+            "repositorySiteName": {
+              "description": "Name of repository site",
+              "type": "string",
+              "readOnly": true
+            },
+            "usageState": {
+              "description": "State indicating whether web app has exceeded its quota usage",
+              "enum": [
+                "Normal",
+                "Exceeded"
+              ],
+              "type": "string",
+              "readOnly": true,
+              "x-ms-enum": {
+                "name": "UsageState",
+                "modelAsString": false
+              }
+            },
+            "enabled": {
+              "description": "True if the site is enabled; otherwise, false. Setting this  value to false disables the site (takes the site off line).",
+              "type": "boolean"
+            },
+            "enabledHostNames": {
+              "description": "Hostnames for the web app that are enabled. Hostnames need to be assigned and enabled. If some hostnames are assigned but not enabled\r\n            the app is not served on those hostnames",
+              "type": "array",
+              "items": {
+                "type": "string"
+              },
+              "readOnly": true
+            },
+            "availabilityState": {
+              "description": "Management information availability state for the web app. Possible values are Normal or Limited. \r\n            Normal means that the site is running correctly and that management information for the site is available. \r\n            Limited means that only partial management information for the site is available and that detailed site information is unavailable.",
+              "enum": [
+                "Normal",
+                "Limited",
+                "DisasterRecoveryMode"
+              ],
+              "type": "string",
+              "readOnly": true,
+              "x-ms-enum": {
+                "name": "SiteAvailabilityState",
+                "modelAsString": false
+              }
+            },
+            "hostNameSslStates": {
+              "description": "Hostname SSL states are  used to manage the SSL bindings for site's hostnames.",
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/HostNameSslState"
+              }
+            },
+            "serverFarmId": {
+              "type": "string"
+            },
+            "lastModifiedTimeUtc": {
+              "format": "date-time",
+              "description": "Last time web app was modified in UTC",
+              "type": "string",
+              "readOnly": true
+            },
+            "siteConfig": {
+              "$ref": "#/definitions/SiteConfig",
+              "description": "Configuration of web app"
+            },
+            "trafficManagerHostNames": {
+              "description": "Read-only list of Azure Traffic manager hostnames associated with web app",
+              "type": "array",
+              "items": {
+                "type": "string"
+              },
+              "readOnly": true
+            },
+            "premiumAppDeployed": {
+              "description": "If set indicates whether web app is deployed as a premium app",
+              "type": "boolean",
+              "readOnly": true
+            },
+            "scmSiteAlsoStopped": {
+              "description": "If set indicates whether to stop SCM (KUDU) site when the web app is stopped. Default is false.",
+              "type": "boolean"
+            },
+            "targetSwapSlot": {
+              "description": "Read-only property that specifies which slot this app will swap into",
+              "type": "string",
+              "readOnly": true
+            },
+            "hostingEnvironmentProfile": {
+              "$ref": "#/definitions/HostingEnvironmentProfile",
+              "description": "Specification for the hosting environment (App Service Environment) to use for the web app"
+            },
+            "microService": {
+              "description": "",
+              "type": "string"
+            },
+            "gatewaySiteName": {
+              "description": "Name of gateway app associated with web app",
+              "type": "string"
+            },
+            "clientAffinityEnabled": {
+              "description": "Specifies if the client affinity is enabled when load balancing http request for multiple instances of the web app",
+              "type": "boolean"
+            },
+            "clientCertEnabled": {
+              "description": "Specifies if the client certificate is enabled for the web app",
+              "type": "boolean"
+            },
+            "hostNamesDisabled": {
+              "description": "Specifies if the public hostnames are disabled the web app.\r\n            If set to true the app is only accessible via API Management process",
+              "type": "boolean"
+            },
+            "outboundIpAddresses": {
+              "description": "List of comma separated IP addresses that this web app uses for outbound connections. Those can be used when configuring firewall rules for databases accessed by this web app.",
+              "type": "string",
+              "readOnly": true
+            },
+            "containerSize": {
+              "format": "int32",
+              "description": "Size of a function container",
+              "type": "integer"
+            },
+            "maxNumberOfWorkers": {
+              "format": "int32",
+              "description": "Maximum number of workers\r\n            This only applies to function container",
+              "type": "integer"
+            },
+            "cloningInfo": {
+              "$ref": "#/definitions/CloningInfo",
+              "description": "This is only valid for web app creation. If specified, web app is cloned from \r\n            a source web app"
+            },
+            "resourceGroup": {
+              "description": "Resource group web app belongs to",
+              "type": "string",
+              "readOnly": true
+            },
+            "isDefaultContainer": {
+              "description": "Site is a default container",
+              "type": "boolean",
+              "readOnly": true
+            },
+            "defaultHostName": {
+              "description": "Default hostname of the web app",
+              "type": "string",
+              "readOnly": true
+            }
+          },
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "SiteProperties": {
+      "type": "object",
+      "properties": {
+        "metadata": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/NameValuePair"
+          }
+        },
+        "properties": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/NameValuePair"
+          }
+        },
+        "appSettings": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/NameValuePair"
+          }
+        }
+      }
+    },
+    "HostNameSslState": {
+      "description": "Object that represents a SSL-enabled host name.",
+      "required": [
+        "sslState"
+      ],
+      "type": "object",
+      "properties": {
+        "name": {
+          "description": "Host name",
+          "type": "string"
+        },
+        "sslState": {
+          "description": "SSL type",
+          "enum": [
+            "Disabled",
+            "SniEnabled",
+            "IpBasedEnabled"
+          ],
+          "type": "string",
+          "x-ms-enum": {
+            "name": "SslState",
+            "modelAsString": false
+          }
+        },
+        "virtualIP": {
+          "description": "Virtual IP address assigned to the host name if IP based SSL is enabled",
+          "type": "string"
+        },
+        "thumbprint": {
+          "description": "SSL cert thumbprint",
+          "type": "string"
+        },
+        "toUpdate": {
+          "description": "Set this flag to update existing host name",
+          "type": "boolean"
+        }
+      }
+    },
+    "SiteConfig": {
+      "description": "Configuration of Azure web site",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "properties": {
+            "numberOfWorkers": {
+              "format": "int32",
+              "description": "Number of workers",
+              "type": "integer"
+            },
+            "defaultDocuments": {
+              "description": "Default documents",
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            "netFrameworkVersion": {
+              "description": "Net Framework Version",
+              "type": "string"
+            },
+            "phpVersion": {
+              "description": "Version of PHP",
+              "type": "string"
+            },
+            "pythonVersion": {
+              "description": "Version of Python",
+              "type": "string"
+            },
+            "requestTracingEnabled": {
+              "description": "Enable request tracing",
+              "type": "boolean"
+            },
+            "requestTracingExpirationTime": {
+              "format": "date-time",
+              "description": "Request tracing expiration time",
+              "type": "string"
+            },
+            "remoteDebuggingEnabled": {
+              "description": "Remote Debugging Enabled",
+              "type": "boolean"
+            },
+            "remoteDebuggingVersion": {
+              "description": "Remote Debugging Version",
+              "type": "string"
+            },
+            "httpLoggingEnabled": {
+              "description": "HTTP logging Enabled",
+              "type": "boolean"
+            },
+            "logsDirectorySizeLimit": {
+              "format": "int32",
+              "description": "HTTP Logs Directory size limit",
+              "type": "integer"
+            },
+            "detailedErrorLoggingEnabled": {
+              "description": "Detailed error logging enabled",
+              "type": "boolean"
+            },
+            "publishingUsername": {
+              "description": "Publishing user name",
+              "type": "string"
+            },
+            "publishingPassword": {
+              "description": "Publishing password",
+              "type": "string"
+            },
+            "appSettings": {
+              "description": "Application Settings",
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/NameValuePair"
+              }
+            },
+            "metadata": {
+              "description": "Site Metadata",
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/NameValuePair"
+              }
+            },
+            "connectionStrings": {
+              "description": "Connection strings",
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/ConnStringInfo"
+              }
+            },
+            "handlerMappings": {
+              "description": "Handler mappings",
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/HandlerMapping"
+              }
+            },
+            "documentRoot": {
+              "description": "Document root",
+              "type": "string"
+            },
+            "scmType": {
+              "description": "SCM type",
+              "type": "string"
+            },
+            "use32BitWorkerProcess": {
+              "description": "Use 32 bit worker process",
+              "type": "boolean"
+            },
+            "webSocketsEnabled": {
+              "description": "Web socket enabled.",
+              "type": "boolean"
+            },
+            "alwaysOn": {
+              "description": "Always On",
+              "type": "boolean"
+            },
+            "javaVersion": {
+              "description": "Java version",
+              "type": "string"
+            },
+            "javaContainer": {
+              "description": "Java container",
+              "type": "string"
+            },
+            "javaContainerVersion": {
+              "description": "Java container version",
+              "type": "string"
+            },
+            "managedPipelineMode": {
+              "description": "Managed pipeline mode",
+              "enum": [
+                "Integrated",
+                "Classic"
+              ],
+              "type": "string",
+              "x-ms-enum": {
+                "name": "ManagedPipelineMode",
+                "modelAsString": false
+              }
+            },
+            "virtualApplications": {
+              "description": "Virtual applications",
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/VirtualApplication"
+              }
+            },
+            "loadBalancing": {
+              "description": "Site load balancing",
+              "enum": [
+                "WeightedRoundRobin",
+                "LeastRequests",
+                "LeastResponseTime",
+                "WeightedTotalTraffic",
+                "RequestHash"
+              ],
+              "type": "string",
+              "x-ms-enum": {
+                "name": "SiteLoadBalancing",
+                "modelAsString": false
+              }
+            },
+            "experiments": {
+              "$ref": "#/definitions/Experiments",
+              "description": "This is work around for polymophic types"
+            },
+            "limits": {
+              "$ref": "#/definitions/SiteLimits",
+              "description": "Site limits"
+            },
+            "autoHealEnabled": {
+              "description": "Auto heal enabled",
+              "type": "boolean"
+            },
+            "autoHealRules": {
+              "$ref": "#/definitions/AutoHealRules",
+              "description": "Auto heal rules"
+            },
+            "tracingOptions": {
+              "description": "Tracing options",
+              "type": "string"
+            },
+            "vnetName": {
+              "description": "Vnet name",
+              "type": "string"
+            },
+            "cors": {
+              "$ref": "#/definitions/CorsSettings",
+              "description": "Cross-Origin Resource Sharing (CORS) settings."
+            },
+            "apiDefinition": {
+              "$ref": "#/definitions/ApiDefinitionInfo",
+              "description": "Information about the formal API definition for the web app."
+            },
+            "autoSwapSlotName": {
+              "description": "Auto swap slot name",
+              "type": "string"
+            },
+            "localMySqlEnabled": {
+              "description": "Local mysql enabled",
+              "type": "boolean"
+            },
+            "ipSecurityRestrictions": {
+              "description": "Ip Security restrictions",
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/IpSecurityRestriction"
+              }
+            }
+          },
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "CloningInfo": {
+      "description": "Represents information needed for cloning operation",
+      "type": "object",
+      "properties": {
+        "correlationId": {
+          "description": "Correlation Id of cloning operation. This id ties multiple cloning operations\r\n            together to use the same snapshot",
+          "type": "string"
+        },
+        "overwrite": {
+          "description": "Overwrite destination web app",
+          "type": "boolean"
+        },
+        "cloneCustomHostNames": {
+          "description": "If true, clone custom hostnames from source web app",
+          "type": "boolean"
+        },
+        "cloneSourceControl": {
+          "description": "Clone source control from source web app",
+          "type": "boolean"
+        },
+        "sourceWebAppId": {
+          "description": "ARM resource id of the source web app. Web app resource id is of the form \r\n            /subscriptions/{subId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{siteName} for production slots and \r\n            /subscriptions/{subId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{siteName}/slots/{slotName} for other slots",
+          "type": "string"
+        },
+        "hostingEnvironment": {
+          "description": "Hosting environment",
+          "type": "string"
+        },
+        "appSettingsOverrides": {
+          "description": "Application settings overrides for cloned web app. If specified these settings will override the settings cloned \r\n            from source web app. If not specified, application settings from source web app are retained.",
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          }
+        },
+        "configureLoadBalancing": {
+          "description": "If specified configure load balancing for source and clone site",
+          "type": "boolean"
+        },
+        "trafficManagerProfileId": {
+          "description": "ARM resource id of the traffic manager profile to use if it exists. Traffic manager resource id is of the form \r\n            /subscriptions/{subId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/trafficManagerProfiles/{profileName}",
+          "type": "string"
+        },
+        "trafficManagerProfileName": {
+          "description": "Name of traffic manager profile to create. This is only needed if traffic manager profile does not already exist",
+          "type": "string"
+        }
+      }
+    },
+    "NameValuePair": {
+      "description": "Name value pair",
+      "type": "object",
+      "properties": {
+        "name": {
+          "description": "Pair name",
+          "type": "string"
+        },
+        "value": {
+          "description": "Pair value",
+          "type": "string"
+        }
+      }
+    },
+    "ConnStringInfo": {
+      "description": "Represents database connection string information",
+      "required": [
+        "type"
+      ],
+      "type": "object",
+      "properties": {
+        "name": {
+          "description": "Name of connection string",
+          "type": "string"
+        },
+        "connectionString": {
+          "description": "Connection string value",
+          "type": "string"
+        },
+        "type": {
+          "description": "Type of database",
+          "enum": [
+            "MySql",
+            "SQLServer",
+            "SQLAzure",
+            "Custom"
+          ],
+          "type": "string",
+          "x-ms-enum": {
+            "name": "DatabaseServerType",
+            "modelAsString": false
+          }
+        }
+      }
+    },
+    "HandlerMapping": {
+      "description": "The IIS handler mappings used to define which handler processes HTTP requests with certain extension. \r\n            For example it is used to configure php-cgi.exe process to handle all HTTP requests with *.php extension.",
+      "type": "object",
+      "properties": {
+        "extension": {
+          "description": "Requests with this extension will be handled using the specified FastCGI application.",
+          "type": "string"
+        },
+        "scriptProcessor": {
+          "description": "The absolute path to the FastCGI application.",
+          "type": "string"
+        },
+        "arguments": {
+          "description": "Command-line arguments to be passed to the script processor.",
+          "type": "string"
+        }
+      }
+    },
+    "VirtualApplication": {
+      "type": "object",
+      "properties": {
+        "virtualPath": {
+          "type": "string"
+        },
+        "physicalPath": {
+          "type": "string"
+        },
+        "preloadEnabled": {
+          "type": "boolean"
+        },
+        "virtualDirectories": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/VirtualDirectory"
+          }
+        }
+      }
+    },
+    "RoutingRule": {
+      "description": "Routing rules for TiP",
+      "type": "object",
+      "properties": {
+        "name": {
+          "description": "Name of the routing rule. The recommended name would be to point to the slot which will receive the traffic in the experiment.",
+          "type": "string"
+        }
+      }
+    },
+    "Experiments": {
+      "description": "Class containing Routing in production experiments",
+      "type": "object",
+      "properties": {
+        "rampUpRules": {
+          "description": "List of {Microsoft.Web.Hosting.Administration.RampUpRule} objects.",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/RampUpRule"
+          }
+        }
+      }
+    },
+    "SiteLimits": {
+      "description": "Represents metric limits set on a web app.",
+      "type": "object",
+      "properties": {
+        "maxPercentageCpu": {
+          "format": "double",
+          "description": "Maximum allowed CPU usage percentage",
+          "type": "number"
+        },
+        "maxMemoryInMb": {
+          "format": "int64",
+          "description": "Maximum allowed memory usage in MB",
+          "type": "integer"
+        },
+        "maxDiskSizeInMb": {
+          "format": "int64",
+          "description": "Maximum allowed disk size usage in MB",
+          "type": "integer"
+        }
+      }
+    },
+    "AutoHealRules": {
+      "description": "AutoHealRules - describes the rules which can be defined for auto-heal",
+      "type": "object",
+      "properties": {
+        "triggers": {
+          "$ref": "#/definitions/AutoHealTriggers",
+          "description": "Triggers - Conditions that describe when to execute the auto-heal actions"
+        },
+        "actions": {
+          "$ref": "#/definitions/AutoHealActions",
+          "description": "Actions - Actions to be executed when a rule is triggered"
+        }
+      }
+    },
+    "SiteAuthSettings": {
+      "description": "Configuration settings for the Azure App Service Authentication / Authorization feature.",
+      "type": "object",
+      "properties": {
+        "enabled": {
+          "description": "Gets or sets a value indicating whether the Authentication / Authorization feature is enabled for the current app.",
+          "type": "boolean"
+        },
+        "httpApiPrefixPath": {
+          "description": "Gets or sets the relative path prefix used by platform HTTP APIs.\r\n            Changing this value is not recommended except for compatibility reasons.",
+          "type": "string"
+        },
+        "unauthenticatedClientAction": {
+          "description": "Gets or sets the action to take when an unauthenticated client attempts to access the app.",
+          "enum": [
+            "RedirectToLoginPage",
+            "AllowAnonymous"
+          ],
+          "type": "string",
+          "x-ms-enum": {
+            "name": "UnauthenticatedClientAction",
+            "modelAsString": false
+          }
+        },
+        "tokenStoreEnabled": {
+          "description": "Gets or sets a value indicating whether to durably store platform-specific security tokens\r\n            obtained during login flows. This capability is disabled by default.",
+          "type": "boolean"
+        },
+        "allowedExternalRedirectUrls": {
+          "description": "Gets or sets a collection of external URLs that can be redirected to as part of logging in\r\n            or logging out of the web app. Note that the query string part of the URL is ignored.\r\n            This is an advanced setting typically only needed by Windows Store application backends.\r\n            Note that URLs within the current domain are always implicitly allowed.",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "defaultProvider": {
+          "description": "Gets or sets the default authentication provider to use when multiple providers are configured.\r\n            This setting is only needed if multiple providers are configured and the unauthenticated client\r\n            action is set to \"RedirectToLoginPage\".",
+          "enum": [
+            "AzureActiveDirectory",
+            "Facebook",
+            "Google",
+            "MicrosoftAccount",
+            "Twitter"
+          ],
+          "type": "string",
+          "x-ms-enum": {
+            "name": "BuiltInAuthenticationProvider",
+            "modelAsString": false
+          }
+        },
+        "tokenRefreshExtensionHours": {
+          "format": "double",
+          "description": "Gets or sets the number of hours after session token expiration that a session token can be used to\r\n            call the token refresh API. The default is 72 hours.",
+          "type": "number"
+        },
+        "clientId": {
+          "description": "Gets or sets the Client ID of this relying party application, known as the client_id.\r\n            This setting is required for enabling OpenID Connection authentication with Azure Active Directory or \r\n            other 3rd party OpenID Connect providers.\r\n            More information on OpenID Connect: http://openid.net/specs/openid-connect-core-1_0.html",
+          "type": "string"
+        },
+        "clientSecret": {
+          "description": "Gets or sets the Client Secret of this relying party application (in Azure Active Directory, this is also referred to as the Key).\r\n            This setting is optional. If no client secret is configured, the OpenID Connect implicit auth flow is used to authenticate end users.\r\n            Otherwise, the OpenID Connect Authorization Code Flow is used to authenticate end users.\r\n            More information on OpenID Connect: http://openid.net/specs/openid-connect-core-1_0.html",
+          "type": "string"
+        },
+        "issuer": {
+          "description": "Gets or sets the OpenID Connect Issuer URI that represents the entity which issues access tokens for this application.\r\n            When using Azure Active Directory, this value is the URI of the directory tenant, e.g. https://sts.windows.net/{tenant-guid}/.\r\n            This URI is a case-sensitive identifier for the token issuer.\r\n            More information on OpenID Connect Discovery: http://openid.net/specs/openid-connect-discovery-1_0.html",
+          "type": "string"
+        },
+        "allowedAudiences": {
+          "description": "Gets or sets a list of allowed audience values to consider when validating JWTs issued by \r\n            Azure Active Directory. Note that the {Microsoft.Web.Hosting.Administration.SiteAuthSettings.ClientId} value is always considered an\r\n            allowed audience, regardless of this setting.",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "additionalLoginParams": {
+          "description": "Gets or sets a list of login parameters to send to the OpenID Connect authorization endpoint when\r\n            a user logs in. Each parameter must be in the form \"key=value\".",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "aadClientId": {
+          "type": "string"
+        },
+        "openIdIssuer": {
+          "type": "string"
+        },
+        "googleClientId": {
+          "description": "Gets or sets the OpenID Connect Client ID for the Google web application.\r\n            This setting is required for enabling Google Sign-In.\r\n            Google Sign-In documentation: https://developers.google.com/identity/sign-in/web/",
+          "type": "string"
+        },
+        "googleClientSecret": {
+          "description": "Gets or sets the client secret associated with the Google web application.\r\n            This setting is required for enabling Google Sign-In.\r\n            Google Sign-In documentation: https://developers.google.com/identity/sign-in/web/",
+          "type": "string"
+        },
+        "googleOAuthScopes": {
+          "description": "Gets or sets the OAuth 2.0 scopes that will be requested as part of Google Sign-In authentication.\r\n            This setting is optional. If not specified, \"openid\", \"profile\", and \"email\" are used as default scopes.\r\n            Google Sign-In documentation: https://developers.google.com/identity/sign-in/web/",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "facebookAppId": {
+          "description": "Gets or sets the App ID of the Facebook app used for login.\r\n            This setting is required for enabling Facebook Login.\r\n            Facebook Login documentation: https://developers.facebook.com/docs/facebook-login",
+          "type": "string"
+        },
+        "facebookAppSecret": {
+          "description": "Gets or sets the App Secret of the Facebook app used for Facebook Login.\r\n            This setting is required for enabling Facebook Login.\r\n            Facebook Login documentation: https://developers.facebook.com/docs/facebook-login",
+          "type": "string"
+        },
+        "facebookOAuthScopes": {
+          "description": "Gets or sets the OAuth 2.0 scopes that will be requested as part of Facebook Login authentication.\r\n            This setting is optional.\r\n            Facebook Login documentation: https://developers.facebook.com/docs/facebook-login",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "twitterConsumerKey": {
+          "description": "Gets or sets the OAuth 1.0a consumer key of the Twitter application used for sign-in.\r\n            This setting is required for enabling Twitter Sign-In.\r\n            Twitter Sign-In documentation: https://dev.twitter.com/web/sign-in",
+          "type": "string"
+        },
+        "twitterConsumerSecret": {
+          "description": "Gets or sets the OAuth 1.0a consumer secret of the Twitter application used for sign-in.\r\n            This setting is required for enabling Twitter Sign-In.\r\n            Twitter Sign-In documentation: https://dev.twitter.com/web/sign-in",
+          "type": "string"
+        },
+        "microsoftAccountClientId": {
+          "description": "Gets or sets the OAuth 2.0 client ID that was created for the app used for authentication.\r\n            This setting is required for enabling Microsoft Account authentication.\r\n            Microsoft Account OAuth documentation: https://dev.onedrive.com/auth/msa_oauth.htm",
+          "type": "string"
+        },
+        "microsoftAccountClientSecret": {
+          "description": "Gets or sets the OAuth 2.0 client secret that was created for the app used for authentication.\r\n            This setting is required for enabling Microsoft Account authentication.\r\n            Microsoft Account OAuth documentation: https://dev.onedrive.com/auth/msa_oauth.htm",
+          "type": "string"
+        },
+        "microsoftAccountOAuthScopes": {
+          "description": "Gets or sets the OAuth 2.0 scopes that will be requested as part of Microsoft Account authentication.\r\n            This setting is optional. If not specified, \"wl.basic\" is used as the default scope.\r\n            Microsoft Account Scopes and permissions documentation: https://msdn.microsoft.com/en-us/library/dn631845.aspx",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "CorsSettings": {
+      "description": "Cross-Origin Resource Sharing (CORS) settings for the web app.",
+      "type": "object",
+      "properties": {
+        "allowedOrigins": {
+          "description": "Gets or sets the list of origins that should be allowed to make cross-origin\r\n            calls (for example: http://example.com:12345). Use \"*\" to allow all.",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "ApiDefinitionInfo": {
+      "description": "Information about the formal API definition for the web app.",
+      "type": "object",
+      "properties": {
+        "url": {
+          "description": "The URL of the API definition.",
+          "type": "string"
+        }
+      }
+    },
+    "IpSecurityRestriction": {
+      "description": "Represents an ip security restriction on a web app.",
+      "type": "object",
+      "properties": {
+        "ipAddress": {
+          "description": "IP address the security restriction is valid for",
+          "type": "string"
+        },
+        "subnetMask": {
+          "description": "Subnet mask for the range of IP addresses the restriction is valid for",
+          "type": "string"
+        }
+      }
+    },
+    "VirtualDirectory": {
+      "type": "object",
+      "properties": {
+        "virtualPath": {
+          "type": "string"
+        },
+        "physicalPath": {
+          "type": "string"
+        }
+      }
+    },
+    "RampUpRule": {
+      "description": "Routing rules for ramp up testing. This rule allows to redirect static traffic % to a slot or to gradually change routing % based on performance",
+      "type": "object",
+      "properties": {
+        "actionHostName": {
+          "description": "Hostname of a slot to which the traffic will be redirected if decided to. E.g. mysite-stage.azurewebsites.net",
+          "type": "string"
+        },
+        "reroutePercentage": {
+          "format": "double",
+          "description": "Percentage of the traffic which will be redirected to {Microsoft.Web.Hosting.Administration.RampUpRule.ActionHostName}",
+          "type": "number"
+        },
+        "changeStep": {
+          "format": "double",
+          "description": "[Optional] In auto ramp up scenario this is the step to to add/remove from {Microsoft.Web.Hosting.Administration.RampUpRule.ReroutePercentage} until it reaches \r\n            {Microsoft.Web.Hosting.Administration.RampUpRule.MinReroutePercentage} or {Microsoft.Web.Hosting.Administration.RampUpRule.MaxReroutePercentage}. Site metrics are checked every N minutes specificed in {Microsoft.Web.Hosting.Administration.RampUpRule.ChangeIntervalInMinutes}.\r\n            Custom decision algorithm can be provided in TiPCallback site extension which Url can be specified in {Microsoft.Web.Hosting.Administration.RampUpRule.ChangeDecisionCallbackUrl}",
+          "type": "number"
+        },
+        "changeIntervalInMinutes": {
+          "format": "int32",
+          "description": "[Optional] Specifies interval in mimuntes to reevaluate ReroutePercentage",
+          "type": "integer"
+        },
+        "minReroutePercentage": {
+          "format": "double",
+          "description": "[Optional] Specifies lower boundary above which ReroutePercentage will stay.",
+          "type": "number"
+        },
+        "maxReroutePercentage": {
+          "format": "double",
+          "description": "[Optional] Specifies upper boundary below which ReroutePercentage will stay.",
+          "type": "number"
+        },
+        "changeDecisionCallbackUrl": {
+          "description": "Custom decision algorithm can be provided in TiPCallback site extension which Url can be specified. See TiPCallback site extension for the scaffold and contracts.\r\n            https://www.siteextensions.net/packages/TiPCallback/",
+          "type": "string"
+        },
+        "name": {
+          "description": "Name of the routing rule. The recommended name would be to point to the slot which will receive the traffic in the experiment.",
+          "type": "string"
+        }
+      }
+    },
+    "AutoHealTriggers": {
+      "description": "AutoHealTriggers - describes the triggers for auto-heal.",
+      "type": "object",
+      "properties": {
+        "requests": {
+          "$ref": "#/definitions/RequestsBasedTrigger",
+          "description": "Requests - Defines a rule based on total requests"
+        },
+        "privateBytesInKB": {
+          "format": "int32",
+          "description": "PrivateBytesInKB - Defines a rule based on private bytes",
+          "type": "integer"
+        },
+        "statusCodes": {
+          "description": "StatusCodes - Defines a rule based on status codes",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/StatusCodesBasedTrigger"
+          }
+        },
+        "slowRequests": {
+          "$ref": "#/definitions/SlowRequestsBasedTrigger",
+          "description": "SlowRequests - Defines a rule based on request execution time"
+        }
+      }
+    },
+    "AutoHealActions": {
+      "description": "AutoHealActions - Describes the actions which can be\r\n            taken by the auto-heal module when a rule is triggered.",
+      "required": [
+        "actionType"
+      ],
+      "type": "object",
+      "properties": {
+        "actionType": {
+          "description": "ActionType - predefined action to be taken",
+          "enum": [
+            "Recycle",
+            "LogEvent",
+            "CustomAction"
+          ],
+          "type": "string",
+          "x-ms-enum": {
+            "name": "AutoHealActionType",
+            "modelAsString": false
+          }
+        },
+        "customAction": {
+          "$ref": "#/definitions/AutoHealCustomAction",
+          "description": "CustomAction - custom action to be taken"
+        },
+        "minProcessExecutionTime": {
+          "description": "MinProcessExecutionTime - minimum time the process must execute\r\n            before taking the action",
+          "type": "string"
+        }
+      }
+    },
+    "RequestsBasedTrigger": {
+      "description": "RequestsBasedTrigger",
+      "type": "object",
+      "properties": {
+        "count": {
+          "format": "int32",
+          "description": "Count",
+          "type": "integer"
+        },
+        "timeInterval": {
+          "description": "TimeInterval",
+          "type": "string"
+        }
+      }
+    },
+    "StatusCodesBasedTrigger": {
+      "description": "StatusCodeBasedTrigger",
+      "type": "object",
+      "properties": {
+        "status": {
+          "format": "int32",
+          "description": "HTTP status code",
+          "type": "integer"
+        },
+        "subStatus": {
+          "format": "int32",
+          "description": "SubStatus",
+          "type": "integer"
+        },
+        "win32Status": {
+          "format": "int32",
+          "description": "Win32 error code",
+          "type": "integer"
+        },
+        "count": {
+          "format": "int32",
+          "description": "Count",
+          "type": "integer"
+        },
+        "timeInterval": {
+          "description": "TimeInterval",
+          "type": "string"
+        }
+      }
+    },
+    "SlowRequestsBasedTrigger": {
+      "description": "SlowRequestsBasedTrigger",
+      "type": "object",
+      "properties": {
+        "timeTaken": {
+          "description": "TimeTaken",
+          "type": "string"
+        },
+        "count": {
+          "format": "int32",
+          "description": "Count",
+          "type": "integer"
+        },
+        "timeInterval": {
+          "description": "TimeInterval",
+          "type": "string"
+        }
+      }
+    },
+    "AutoHealCustomAction": {
+      "description": "AutoHealCustomAction - Describes the custom action to be executed\r\n            when an auto heal rule is triggered.",
+      "type": "object",
+      "properties": {
+        "exe": {
+          "description": "Executable to be run",
+          "type": "string"
+        },
+        "parameters": {
+          "description": "Parameters for the executable",
+          "type": "string"
+        }
+      }
+    },
+    "HostingEnvironmentCollection": {
+      "description": "Collection of hosting environments (App Service Environments)",
+      "type": "object",
+      "properties": {
+        "value": {
+          "description": "Collection of resources",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/HostingEnvironment"
+          }
+        },
+        "nextLink": {
+          "description": "Link to next page of resources",
+          "type": "string"
+        }
+      }
+    },
+    "HostingEnvironment": {
+      "description": "Description of an hostingEnvironment (App Service Environment)",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "required": [
+            "status"
+          ],
+          "properties": {
+            "name": {
+              "description": "Name of the hostingEnvironment (App Service Environment)",
+              "type": "string"
+            },
+            "location": {
+              "description": "Location of the hostingEnvironment (App Service Environment), e.g. \"West US\"",
+              "type": "string"
+            },
+            "provisioningState": {
+              "description": "Provisioning state of the hostingEnvironment (App Service Environment)",
+              "enum": [
+                "Succeeded",
+                "Failed",
+                "Canceled",
+                "InProgress",
+                "Deleting"
+              ],
+              "type": "string",
+              "x-ms-enum": {
+                "name": "ProvisioningState",
+                "modelAsString": false
+              }
+            },
+            "status": {
+              "description": "Current status of the hostingEnvironment (App Service Environment)",
+              "enum": [
+                "Preparing",
+                "Ready",
+                "Scaling",
+                "Deleting"
+              ],
+              "type": "string",
+              "x-ms-enum": {
+                "name": "HostingEnvironmentStatus",
+                "modelAsString": false
+              }
+            },
+            "vnetName": {
+              "description": "Name of the hostingEnvironment's (App Service Environment) virtual network",
+              "type": "string"
+            },
+            "vnetResourceGroupName": {
+              "description": "Resource group of the hostingEnvironment's (App Service Environment) virtual network",
+              "type": "string"
+            },
+            "vnetSubnetName": {
+              "description": "Subnet of the hostingEnvironment's (App Service Environment) virtual network",
+              "type": "string"
+            },
+            "virtualNetwork": {
+              "$ref": "#/definitions/VirtualNetworkProfile",
+              "description": "Description of the hostingEnvironment's (App Service Environment) virtual network"
+            },
+            "internalLoadBalancingMode": {
+              "description": "Specifies which endpoints to serve internally in the hostingEnvironment's (App Service Environment) VNET",
+              "enum": [
+                "None",
+                "Web",
+                "Publishing"
+              ],
+              "type": "string",
+              "x-ms-enum": {
+                "name": "InternalLoadBalancingMode",
+                "modelAsString": false
+              }
+            },
+            "multiSize": {
+              "description": "Front-end VM size, e.g. \"Medium\", \"Large\"",
+              "type": "string"
+            },
+            "multiRoleCount": {
+              "format": "int32",
+              "description": "Number of front-end instances",
+              "type": "integer"
+            },
+            "workerPools": {
+              "description": "Description of worker pools with worker size ids, VM sizes, and number of workers in each pool",
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/WorkerPool"
+              }
+            },
+            "ipsslAddressCount": {
+              "format": "int32",
+              "description": "Number of IP SSL addresses reserved for this hostingEnvironment (App Service Environment)",
+              "type": "integer"
+            },
+            "databaseEdition": {
+              "description": "Edition of the metadata database for the hostingEnvironment (App Service Environment) e.g. \"Standard\"",
+              "type": "string"
+            },
+            "databaseServiceObjective": {
+              "description": "Service objective of the metadata database for the hostingEnvironment (App Service Environment) e.g. \"S0\"",
+              "type": "string"
+            },
+            "upgradeDomains": {
+              "format": "int32",
+              "description": "Number of upgrade domains of this hostingEnvironment (App Service Environment)",
+              "type": "integer"
+            },
+            "subscriptionId": {
+              "description": "Subscription of the hostingEnvironment (App Service Environment)",
+              "type": "string"
+            },
+            "dnsSuffix": {
+              "description": "DNS suffix of the hostingEnvironment (App Service Environment)",
+              "type": "string"
+            },
+            "lastAction": {
+              "description": "Last deployment action on this hostingEnvironment (App Service Environment)",
+              "type": "string"
+            },
+            "lastActionResult": {
+              "description": "Result of the last deployment action on this hostingEnvironment (App Service Environment)",
+              "type": "string"
+            },
+            "allowedMultiSizes": {
+              "description": "List of comma separated strings describing which VM sizes are allowed for front-ends",
+              "type": "string"
+            },
+            "allowedWorkerSizes": {
+              "description": "List of comma separated strings describing which VM sizes are allowed for workers",
+              "type": "string"
+            },
+            "maximumNumberOfMachines": {
+              "format": "int32",
+              "description": "Maximum number of VMs in this hostingEnvironment (App Service Environment)",
+              "type": "integer"
+            },
+            "vipMappings": {
+              "description": "Description of IP SSL mapping for this hostingEnvironment (App Service Environment)",
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/VirtualIPMapping"
+              }
+            },
+            "environmentCapacities": {
+              "description": "Current total, used, and available worker capacities",
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/StampCapacity"
+              }
+            },
+            "networkAccessControlList": {
+              "description": "Access control list for controlling traffic to the hostingEnvironment (App Service Environment)",
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/NetworkAccessControlEntry"
+              }
+            },
+            "environmentIsHealthy": {
+              "description": "True/false indicating whether the hostingEnvironment (App Service Environment) is healthy",
+              "type": "boolean"
+            },
+            "environmentStatus": {
+              "description": "Detailed message about with results of the last check of the hostingEnvironment (App Service Environment)",
+              "type": "string"
+            },
+            "resourceGroup": {
+              "description": "Resource group of the hostingEnvironment (App Service Environment)",
+              "type": "string"
+            },
+            "apiManagementAccountId": {
+              "description": "Api Management Account associated with this Hosting Environment",
+              "type": "string"
+            },
+            "suspended": {
+              "description": "True/false indicating whether the hostingEnvironment is suspended. The environment can be suspended e.g. when the management endpoint is no longer available\r\n            (most likely because NSG blocked the incoming traffic)",
+              "type": "boolean"
+            },
+            "clusterSettings": {
+              "description": "Custom settings for changing the behavior of the hosting environment",
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/NameValuePair"
+              }
+            }
+          },
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "VirtualNetworkProfile": {
+      "description": "Specification for using a virtual network",
+      "type": "object",
+      "properties": {
+        "id": {
+          "description": "Resource id of the virtual network",
+          "type": "string"
+        },
+        "name": {
+          "description": "Name of the virtual network (read-only)",
+          "type": "string"
+        },
+        "type": {
+          "description": "Resource type of the virtual network (read-only)",
+          "type": "string"
+        },
+        "subnet": {
+          "description": "Subnet within the virtual network",
+          "type": "string"
+        }
+      }
+    },
+    "WorkerPool": {
+      "description": "Worker pool of a hostingEnvironment (App Service Environment)",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "properties": {
+            "workerSizeId": {
+              "format": "int32",
+              "description": "Worker size id for referencing this worker pool",
+              "type": "integer"
+            },
+            "computeMode": {
+              "description": "Shared or dedicated web app hosting",
+              "enum": [
+                "Shared",
+                "Dedicated",
+                "Dynamic"
+              ],
+              "type": "string",
+              "x-ms-enum": {
+                "name": "ComputeModeOptions",
+                "modelAsString": false
+              }
+            },
+            "workerSize": {
+              "description": "VM size of the worker pool instances",
+              "type": "string"
+            },
+            "workerCount": {
+              "format": "int32",
+              "description": "Number of instances in the worker pool",
+              "type": "integer"
+            },
+            "instanceNames": {
+              "description": "Names of all instances in the worker pool (read only)",
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          "x-ms-client-flatten": true
+        },
+        "sku": {
+          "$ref": "#/definitions/SkuDescription"
+        }
+      }
+    },
+    "VirtualIPMapping": {
+      "description": "Class that represents a VIP mapping",
+      "type": "object",
+      "properties": {
+        "virtualIP": {
+          "description": "Virtual IP address",
+          "type": "string"
+        },
+        "internalHttpPort": {
+          "format": "int32",
+          "description": "Internal HTTP port",
+          "type": "integer"
+        },
+        "internalHttpsPort": {
+          "format": "int32",
+          "description": "Internal HTTPS port",
+          "type": "integer"
+        },
+        "inUse": {
+          "description": "Is VIP mapping in use",
+          "type": "boolean"
+        }
+      }
+    },
+    "StampCapacity": {
+      "description": "Class containing stamp capacity information",
+      "type": "object",
+      "properties": {
+        "name": {
+          "description": "Name of the stamp",
+          "type": "string"
+        },
+        "availableCapacity": {
+          "format": "int64",
+          "description": "Available capacity (# of machines, bytes of storage etc...)",
+          "type": "integer"
+        },
+        "totalCapacity": {
+          "format": "int64",
+          "description": "Total capacity (# of machines, bytes of storage etc...)",
+          "type": "integer"
+        },
+        "unit": {
+          "description": "Name of the unit",
+          "type": "string"
+        },
+        "computeMode": {
+          "description": "Shared/Dedicated workers",
+          "enum": [
+            "Shared",
+            "Dedicated",
+            "Dynamic"
+          ],
+          "type": "string",
+          "x-ms-enum": {
+            "name": "ComputeModeOptions",
+            "modelAsString": false
+          }
+        },
+        "workerSize": {
+          "description": "Size of the machines",
+          "enum": [
+            "Default",
+            "Small",
+            "Medium",
+            "Large"
+          ],
+          "type": "string",
+          "x-ms-enum": {
+            "name": "WorkerSizeOptions",
+            "modelAsString": false
+          }
+        },
+        "workerSizeId": {
+          "format": "int32",
+          "description": "Size Id of machines: \r\n            0 - Small\r\n            1 - Medium\r\n            2 - Large",
+          "type": "integer"
+        },
+        "excludeFromCapacityAllocation": {
+          "description": "If true it includes basic sites\r\n            Basic sites are not used for capacity allocation.",
+          "type": "boolean"
+        },
+        "isApplicableForAllComputeModes": {
+          "description": "Is capacity applicable for all sites?",
+          "type": "boolean"
+        },
+        "siteMode": {
+          "description": "Shared or Dedicated",
+          "type": "string"
+        }
+      }
+    },
+    "NetworkAccessControlEntry": {
+      "type": "object",
+      "properties": {
+        "action": {
+          "enum": [
+            "Permit",
+            "Deny"
+          ],
+          "type": "string",
+          "x-ms-enum": {
+            "name": "AccessControlEntryAction",
+            "modelAsString": false
+          }
+        },
+        "description": {
+          "type": "string"
+        },
+        "order": {
+          "format": "int32",
+          "type": "integer"
+        },
+        "remoteSubnet": {
+          "type": "string"
+        }
+      }
+    },
+    "ManagedHostingEnvironmentCollection": {
+      "description": "Collection of managed hosting environments",
+      "type": "object",
+      "properties": {
+        "value": {
+          "description": "Collection of resources",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ManagedHostingEnvironment"
+          }
+        },
+        "nextLink": {
+          "description": "Link to next page of resources",
+          "type": "string"
+        }
+      }
+    },
+    "ManagedHostingEnvironment": {
+      "description": "Description of a managed hosting environment",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "required": [
+            "status"
+          ],
+          "properties": {
+            "name": {
+              "description": "Name of the managed hosting environment",
+              "type": "string"
+            },
+            "location": {
+              "description": "Location of the managed hosting environment e.g. \"West US\"",
+              "type": "string"
+            },
+            "status": {
+              "description": "Current status of the managed hosting environment",
+              "enum": [
+                "Preparing",
+                "Ready",
+                "Deleting"
+              ],
+              "type": "string",
+              "x-ms-enum": {
+                "name": "ManagedHostingEnvironmentStatus",
+                "modelAsString": false
+              }
+            },
+            "virtualNetwork": {
+              "$ref": "#/definitions/VirtualNetworkProfile",
+              "description": "Description of the managed hosting environment's virtual network"
+            },
+            "ipsslAddressCount": {
+              "format": "int32",
+              "description": "Number of ip ssl addresses reserved for the managed hosting environment",
+              "type": "integer"
+            },
+            "dnsSuffix": {
+              "description": "DNS suffix of the managed hosting environment",
+              "type": "string"
+            },
+            "subscriptionId": {
+              "description": "Subscription of the managed hosting environment (read only)",
+              "type": "string"
+            },
+            "resourceGroup": {
+              "description": "Resource group of the managed hosting environment (read only)",
+              "type": "string"
+            },
+            "environmentIsHealthy": {
+              "description": "True/false indicating whether the managed hosting environment is healthy",
+              "type": "boolean"
+            },
+            "environmentStatus": {
+              "description": "Detailed message about with results of the last check of the managed hosting environment",
+              "type": "string"
+            },
+            "suspended": {
+              "description": "True/false indicating whether the managed hosting environment is suspended. The environment can be suspended e.g. when the management endpoint is no longer available\r\n            (most likely because NSG blocked the incoming traffic)",
+              "type": "boolean"
+            },
+            "apiManagementAccount": {
+              "description": "Resource id of the api management account associated with this managed hosting environment (read only)",
+              "type": "string"
+            }
+          },
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "ResourceNameAvailabilityRequest": {
+      "description": "Resource name availability request content",
+      "type": "object",
+      "properties": {
+        "name": {
+          "description": "Resource name to verify",
+          "type": "string"
+        },
+        "type": {
+          "description": "Resource type used for verification",
+          "type": "string"
+        },
+        "isFqdn": {
+          "description": "Is fully qualified domain name",
+          "type": "boolean"
+        }
+      }
+    },
+    "ResourceNameAvailability": {
+      "description": "Describes if a resource name is available",
+      "type": "object",
+      "properties": {
+        "nameAvailable": {
+          "description": "True indicates name is valid and available.  False indicates the name is invalid, unavailable, or both.",
+          "type": "boolean"
+        },
+        "reason": {
+          "description": "Required if nameAvailable is false. 'Invalid' indicates the name provided does not match Azure WebApp service’s naming requirements. 'AlreadyExists' indicates that the name is already in use and is therefore unavailable.",
+          "type": "string"
+        },
+        "message": {
+          "type": "string"
+        }
+      }
+    },
+    "DomainControlCenterSsoRequest": {
+      "description": "Single sign on request information for domain management",
+      "type": "object",
+      "properties": {
+        "url": {
+          "description": "Url where the single sign on request is to be made",
+          "type": "string"
+        },
+        "postParameterKey": {
+          "description": "Post parameter key",
+          "type": "string"
+        },
+        "postParameterValue": {
+          "description": "Post parameter value. Client should use 'application/x-www-form-urlencoded' encoding for this value.",
+          "type": "string"
+        }
+      }
+    },
+    "DomainRegistrationInput": {
+      "description": "Domain registration input for validation Api",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "properties": {
+            "name": {
+              "description": "Name of the domain",
+              "type": "string"
+            },
+            "contactAdmin": {
+              "$ref": "#/definitions/Contact",
+              "description": "Admin contact information"
+            },
+            "contactBilling": {
+              "$ref": "#/definitions/Contact",
+              "description": "Billing contact information"
+            },
+            "contactRegistrant": {
+              "$ref": "#/definitions/Contact",
+              "description": "Registrant contact information"
+            },
+            "contactTech": {
+              "$ref": "#/definitions/Contact",
+              "description": "Technical contact information"
+            },
+            "registrationStatus": {
+              "description": "Domain registration status",
+              "enum": [
+                "Active",
+                "Awaiting",
+                "Cancelled",
+                "Confiscated",
+                "Disabled",
+                "Excluded",
+                "Expired",
+                "Failed",
+                "Held",
+                "Locked",
+                "Parked",
+                "Pending",
+                "Reserved",
+                "Reverted",
+                "Suspended",
+                "Transferred",
+                "Unknown",
+                "Unlocked",
+                "Unparked",
+                "Updated",
+                "JsonConverterFailed"
+              ],
+              "type": "string",
+              "x-ms-enum": {
+                "name": "DomainStatus",
+                "modelAsString": false
+              }
+            },
+            "provisioningState": {
+              "description": "Domain provisioning state",
+              "enum": [
+                "Succeeded",
+                "Failed",
+                "Canceled",
+                "InProgress",
+                "Deleting"
+              ],
+              "type": "string",
+              "x-ms-enum": {
+                "name": "ProvisioningState",
+                "modelAsString": false
+              }
+            },
+            "nameServers": {
+              "description": "Name servers",
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            "privacy": {
+              "description": "If true then domain privacy is enabled for this domain",
+              "type": "boolean"
+            },
+            "createdTime": {
+              "format": "date-time",
+              "description": "Domain creation timestamp",
+              "type": "string"
+            },
+            "expirationTime": {
+              "format": "date-time",
+              "description": "Domain expiration timestamp",
+              "type": "string"
+            },
+            "lastRenewedTime": {
+              "format": "date-time",
+              "description": "Timestamp when the domain was renewed last time",
+              "type": "string"
+            },
+            "autoRenew": {
+              "description": "If true then domain will renewed automatically",
+              "type": "boolean"
+            },
+            "readyForDnsRecordManagement": {
+              "description": "If true then Azure can assign this domain to Web Apps. This value will be true if domain registration status is active and it is hosted on name servers Azure has programmatic access to",
+              "type": "boolean"
+            },
+            "managedHostNames": {
+              "description": "All hostnames derived from the domain and assigned to Azure resources",
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/HostName"
+              }
+            },
+            "consent": {
+              "$ref": "#/definitions/DomainPurchaseConsent",
+              "description": "Legal agreement consent"
+            },
+            "domainNotRenewableReasons": {
+              "description": "Reasons why domain is not renewable",
+              "type": "array",
+              "items": {
+                "enum": [
+                  "RegistrationStatusNotSupportedForRenewal",
+                  "ExpirationNotInRenewalTimeRange",
+                  "SubscriptionNotActive"
+                ],
+                "type": "string"
+              }
+            }
+          },
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "NameIdentifier": {
+      "description": "Identifies an object",
+      "type": "object",
+      "properties": {
+        "name": {
+          "description": "Name of the object",
+          "type": "string"
+        }
+      }
+    },
+    "DomainAvailablilityCheckResult": {
+      "description": "Domain availablility check result",
+      "type": "object",
+      "properties": {
+        "name": {
+          "description": "Name of the domain",
+          "type": "string"
+        },
+        "available": {
+          "description": "If true then domain can be purchased using CreateDomain Api",
+          "type": "boolean"
+        },
+        "domainType": {
+          "description": "Domain type",
+          "enum": [
+            "Regular",
+            "SoftDeleted"
+          ],
+          "type": "string",
+          "x-ms-enum": {
+            "name": "DomainType",
+            "modelAsString": false
+          }
+        }
+      }
+    },
+    "DomainRecommendationSearchParameters": {
+      "description": "Domain recommendation search parameters",
+      "type": "object",
+      "properties": {
+        "keywords": {
+          "description": "Keywords to be used for generating domain recommendations",
+          "type": "string"
+        },
+        "maxDomainRecommendations": {
+          "format": "int32",
+          "description": "Maximum number of recommendations",
+          "type": "integer"
+        }
+      }
+    },
+    "NameIdentifierCollection": {
+      "description": "Collection of domain name identifiers",
+      "type": "object",
+      "properties": {
+        "value": {
+          "description": "Collection of resources",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/NameIdentifier"
+          }
+        },
+        "nextLink": {
+          "description": "Link to next page of resources",
+          "type": "string"
+        }
+      }
+    },
+    "CsmMoveResourceEnvelope": {
+      "description": "Class containing a list of the resources that need to be moved and the resource group they should be moved to",
+      "type": "object",
+      "properties": {
+        "targetResourceGroup": {
+          "type": "string"
+        },
+        "resources": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "HostingEnvironmentDiagnostics": {
+      "description": "Diagnostics for a hosting environment (App Service Environment)",
+      "type": "object",
+      "properties": {
+        "name": {
+          "description": "Name/identifier of the diagnostics",
+          "type": "string"
+        },
+        "diagnosicsOutput": {
+          "description": "Diagnostics output",
+          "type": "string"
+        }
+      }
+    },
+    "StampCapacityCollection": {
+      "description": "Collection of stamp capacities",
+      "type": "object",
+      "properties": {
+        "value": {
+          "description": "Collection of resources",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/StampCapacity"
+          }
+        },
+        "nextLink": {
+          "description": "Link to next page of resources",
+          "type": "string"
+        }
+      }
+    },
+    "AddressResponse": {
+      "description": "Describes main public ip address and any extra vips",
+      "type": "object",
+      "properties": {
+        "serviceIpAddress": {
+          "description": "Main public vip",
+          "type": "string"
+        },
+        "internalIpAddress": {
+          "description": "VNET internal ip address of the hostingEnvironment (App Service Environment) if it is in internal load-balancing mode",
+          "type": "string"
+        },
+        "outboundIpAddresses": {
+          "description": "IP addresses appearing on outbound connections",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "vipMappings": {
+          "description": "Additional vips",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/VirtualIPMapping"
+          }
+        }
+      }
+    },
+    "ResourceMetricCollection": {
+      "description": "Collection of metric responses",
+      "type": "object",
+      "properties": {
+        "value": {
+          "description": "Collection of resources",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ResourceMetric"
+          }
+        },
+        "nextLink": {
+          "description": "Link to next page of resources",
+          "type": "string"
+        }
+      }
+    },
+    "ResourceMetric": {
+      "description": "Object representing a metric for any resource",
+      "type": "object",
+      "properties": {
+        "name": {
+          "$ref": "#/definitions/ResourceMetricName",
+          "description": "Name of metric"
+        },
+        "unit": {
+          "description": "Metric unit",
+          "type": "string"
+        },
+        "timeGrain": {
+          "description": "Metric granularity. E.g PT1H, PT5M, P1D",
+          "type": "string"
+        },
+        "startTime": {
+          "format": "date-time",
+          "description": "Metric start time",
+          "type": "string"
+        },
+        "endTime": {
+          "format": "date-time",
+          "description": "Metric end time",
+          "type": "string"
+        },
+        "resourceId": {
+          "description": "Metric resource Id",
+          "type": "string"
+        },
+        "metricValues": {
+          "description": "Metric values",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ResourceMetricValue"
+          }
+        },
+        "properties": {
+          "description": "Properties",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/KeyValuePair[String,String]"
+          }
+        }
+      }
+    },
+    "ResourceMetricName": {
+      "description": "Name of a metric for any resource",
+      "type": "object",
+      "properties": {
+        "value": {
+          "description": "metric name value",
+          "type": "string"
+        },
+        "localizedValue": {
+          "description": "Localized metric name value",
+          "type": "string"
+        }
+      }
+    },
+    "ResourceMetricValue": {
+      "description": "Value of resource metric",
+      "type": "object",
+      "properties": {
+        "timeStamp": {
+          "description": "Value timestamp",
+          "type": "string"
+        },
+        "average": {
+          "format": "float",
+          "description": "Value average",
+          "type": "number"
+        },
+        "minimum": {
+          "format": "float",
+          "description": "Value minimum",
+          "type": "number"
+        },
+        "maximum": {
+          "format": "float",
+          "description": "Value maximum",
+          "type": "number"
+        },
+        "total": {
+          "format": "float",
+          "description": "Value total",
+          "type": "number"
+        },
+        "count": {
+          "format": "float",
+          "description": "Value count",
+          "type": "number"
+        }
+      }
+    },
+    "KeyValuePair[String,String]": {
+      "type": "object",
+      "properties": {
+        "key": {
+          "type": "string",
+          "readOnly": true
+        },
+        "value": {
+          "type": "string",
+          "readOnly": true
+        }
+      }
+    },
+    "MetricDefinition": {
+      "description": "Class repesenting metadata for the metrics",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "properties": {
+            "name": {
+              "description": "Name of the metric",
+              "type": "string"
+            },
+            "unit": {
+              "description": "Unit of the metric",
+              "type": "string"
+            },
+            "primaryAggregationType": {
+              "description": "Primary aggregation type",
+              "type": "string"
+            },
+            "metricAvailabilities": {
+              "description": "List of time grains supported for the metric together with retention period",
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/MetricAvailabilily"
+              }
+            },
+            "displayName": {
+              "description": "Friendly name shown in the UI",
+              "type": "string"
+            }
+          },
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "MetricAvailabilily": {
+      "description": "Class repesenting metrics availability and retention",
+      "type": "object",
+      "properties": {
+        "timeGrain": {
+          "description": "Time grain",
+          "type": "string"
+        },
+        "retention": {
+          "description": "Retention period for the current {Microsoft.Web.Hosting.Administration.MetricAvailabilily.TimeGrain}",
+          "type": "string"
+        }
+      }
+    },
+    "CsmUsageQuotaCollection": {
+      "description": "Collection of csm usage quotas",
+      "type": "object",
+      "properties": {
+        "value": {
+          "description": "Collection of resources",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/CsmUsageQuota"
+          }
+        },
+        "nextLink": {
+          "description": "Link to next page of resources",
+          "type": "string"
+        }
+      }
+    },
+    "CsmUsageQuota": {
+      "description": "Usage of the quota resource",
+      "type": "object",
+      "properties": {
+        "unit": {
+          "description": "Units of measurement for the quota resourse",
+          "type": "string"
+        },
+        "nextResetTime": {
+          "format": "date-time",
+          "description": "Next reset time for the resource counter",
+          "type": "string"
+        },
+        "currentValue": {
+          "format": "int64",
+          "description": "The current value of the resource counter",
+          "type": "integer"
+        },
+        "limit": {
+          "format": "int64",
+          "description": "The resource limit",
+          "type": "integer"
+        },
+        "name": {
+          "$ref": "#/definitions/LocalizableString",
+          "description": "Quota name"
+        }
+      }
+    },
+    "LocalizableString": {
+      "description": "LocalizableString object containing the name and a localized value.",
+      "type": "object",
+      "properties": {
+        "value": {
+          "description": "Non localized name",
+          "type": "string"
+        },
+        "localizedValue": {
+          "description": "Localized name",
+          "type": "string"
+        }
+      }
+    },
+    "MetricDefinitionCollection": {
+      "description": "Collection of metric defintions",
+      "type": "object",
+      "properties": {
+        "value": {
+          "description": "Collection of resources",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/MetricDefinition"
+          }
+        },
+        "nextLink": {
+          "description": "Link to next page of resources",
+          "type": "string"
+        }
+      }
+    },
+    "UsageCollection": {
+      "description": "Collection of usages",
+      "type": "object",
+      "properties": {
+        "value": {
+          "description": "Collection of resources",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Usage"
+          }
+        },
+        "nextLink": {
+          "description": "Link to next page of resources",
+          "type": "string"
+        }
+      }
+    },
+    "Usage": {
+      "description": "Class that represents usage of the quota resource.",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "properties": {
+            "displayName": {
+              "description": "Friendly name shown in the UI",
+              "type": "string"
+            },
+            "name": {
+              "description": "Name of the quota",
+              "type": "string"
+            },
+            "resourceName": {
+              "description": "Name of the quota resource",
+              "type": "string"
+            },
+            "unit": {
+              "description": "Units of measurement for the quota resource",
+              "type": "string"
+            },
+            "currentValue": {
+              "format": "int64",
+              "description": "The current value of the resource counter",
+              "type": "integer"
+            },
+            "limit": {
+              "format": "int64",
+              "description": "The resource limit",
+              "type": "integer"
+            },
+            "nextResetTime": {
+              "format": "date-time",
+              "description": "Next reset time for the resource counter",
+              "type": "string"
+            },
+            "computeMode": {
+              "description": "ComputeMode used for this usage",
+              "enum": [
+                "Shared",
+                "Dedicated",
+                "Dynamic"
+              ],
+              "type": "string",
+              "x-ms-enum": {
+                "name": "ComputeModeOptions",
+                "modelAsString": false
+              }
+            },
+            "siteMode": {
+              "description": "SiteMode used for this usage",
+              "type": "string"
+            }
+          },
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "WorkerPoolCollection": {
+      "description": "Collection of worker pools",
+      "type": "object",
+      "properties": {
+        "value": {
+          "description": "Collection of resources",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/WorkerPool"
+          }
+        },
+        "nextLink": {
+          "description": "Link to next page of resources",
+          "type": "string"
+        }
+      }
+    },
+    "SkuInfoCollection": {
+      "description": "Collection of SkuInfos",
+      "type": "object",
+      "properties": {
+        "value": {
+          "description": "Collection of resources",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/SkuInfo"
+          }
+        },
+        "nextLink": {
+          "description": "Link to next page of resources",
+          "type": "string"
+        }
+      }
+    },
+    "SkuInfo": {
+      "description": "Sku discovery information",
+      "type": "object",
+      "properties": {
+        "resourceType": {
+          "description": "Resource type that this sku applies to",
+          "type": "string"
+        },
+        "sku": {
+          "$ref": "#/definitions/SkuDescription",
+          "description": "Name and tier of the sku"
+        },
+        "capacity": {
+          "$ref": "#/definitions/SkuCapacity",
+          "description": "Min, max, and default scale values of the sku"
+        }
+      }
+    },
+    "SkuCapacity": {
+      "description": "Description of the App Service Plan scale options",
+      "type": "object",
+      "properties": {
+        "minimum": {
+          "format": "int32",
+          "description": "Minimum number of Workers for this App Service Plan SKU",
+          "type": "integer"
+        },
+        "maximum": {
+          "format": "int32",
+          "description": "Maximum number of Workers for this App Service Plan SKU",
+          "type": "integer"
+        },
+        "default": {
+          "format": "int32",
+          "description": "Default number of Workers for this App Service Plan SKU",
+          "type": "integer"
+        },
+        "scaleType": {
+          "description": "Available scale configurations for an App Service Plan",
+          "type": "string"
+        }
+      }
+    },
+    "SourceControlCollection": {
+      "description": "Collection of soure controls",
+      "type": "object",
+      "properties": {
+        "value": {
+          "description": "Collection of resources",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/SourceControl"
+          }
+        },
+        "nextLink": {
+          "description": "Link to next page of resources",
+          "type": "string"
+        }
+      }
+    },
+    "SourceControl": {
+      "description": "Describes the Source Control OAuth Token",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "properties": {
+            "name": {
+              "description": "Name or Source Control Type",
+              "type": "string"
+            },
+            "token": {
+              "description": "OAuth Access Token",
+              "type": "string"
+            },
+            "tokenSecret": {
+              "description": "OAuth Access Token Secret",
+              "type": "string"
+            },
+            "refreshToken": {
+              "description": "OAuth Refresh Token",
+              "type": "string"
+            },
+            "expirationTime": {
+              "format": "date-time",
+              "description": "OAuth Token Expiration",
+              "type": "string"
+            }
+          },
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "Recommendation": {
+      "description": "Represents a recommendation result generated by the recommendation engine",
+      "required": [
+        "level",
+        "channels"
+      ],
+      "type": "object",
+      "properties": {
+        "creationTime": {
+          "format": "date-time",
+          "description": "Timestamp when this instance was created.",
+          "type": "string"
+        },
+        "recommendationId": {
+          "description": "A GUID value that each recommendation object is associated with.",
+          "type": "string"
+        },
+        "resourceId": {
+          "description": "Full ARM resource ID string that this recommendation object is associated with.",
+          "type": "string"
+        },
+        "resourceScope": {
+          "description": "Name of a resource type this recommendation applies, e.g. Subscription, ServerFarm, Site.",
+          "type": "string"
+        },
+        "ruleName": {
+          "description": "Unique name of the rule",
+          "type": "string"
+        },
+        "displayName": {
+          "description": "UI friendly name of the rule (may not be unique)",
+          "type": "string"
+        },
+        "message": {
+          "description": "Localized text of recommendation, good for UI.",
+          "type": "string"
+        },
+        "level": {
+          "description": "Level indicating how critical this recommendation can impact.",
+          "enum": [
+            "Critical",
+            "Warning",
+            "Information",
+            "NonUrgentSuggestion"
+          ],
+          "type": "string",
+          "x-ms-enum": {
+            "name": "NotificationLevel",
+            "modelAsString": false
+          }
+        },
+        "channels": {
+          "description": "List of channels that this recommendation can apply.",
+          "enum": [
+            "Notification",
+            "Api",
+            "Email",
+            "All"
+          ],
+          "type": "string",
+          "x-ms-enum": {
+            "name": "Channels",
+            "modelAsString": false
+          }
+        },
+        "tags": {
+          "description": "The list of category tags that this recommendation belongs to.",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "actionName": {
+          "description": "Name of action recommended by this object.",
+          "type": "string"
+        },
+        "enabled": {
+          "format": "int32",
+          "description": "On/off flag indicating the rule is currently enabled or disabled.",
+          "type": "integer"
+        },
+        "startTime": {
+          "format": "date-time",
+          "description": "The beginning time of a range that the recommendation refers to.",
+          "type": "string"
+        },
+        "endTime": {
+          "format": "date-time",
+          "description": "The end time of a range that the recommendation refers to.",
+          "type": "string"
+        },
+        "nextNotificationTime": {
+          "format": "date-time",
+          "description": "When to notify this recommendation next. Null means that this will never be notified anymore.",
+          "type": "string"
+        },
+        "notificationExpirationTime": {
+          "format": "date-time",
+          "description": "Date and time when this notification expires.",
+          "type": "string"
+        },
+        "notifiedTime": {
+          "format": "date-time",
+          "description": "Last timestamp this instance was actually notified. Null means that this recommendation hasn't been notified yet.",
+          "type": "string"
+        },
+        "score": {
+          "format": "double",
+          "description": "A metric value measured by the rule.",
+          "type": "number"
+        }
+      }
+    },
+    "RecommendationRule": {
+      "description": "Represents a recommendation rule that the recommendation engine can perform",
+      "required": [
+        "level",
+        "channels"
+      ],
+      "type": "object",
+      "properties": {
+        "name": {
+          "description": "Unique name of the rule",
+          "type": "string"
+        },
+        "displayName": {
+          "description": "UI friendly name of the rule",
+          "type": "string"
+        },
+        "message": {
+          "description": "Localized name of the rule (Good for UI)",
+          "type": "string"
+        },
+        "recommendationId": {
+          "description": "Recommendation ID of an associated recommendation object tied to the rule, if exists.\r\n            If such an object doesn't exist, it is set to null.",
+          "type": "string"
+        },
+        "description": {
+          "description": "Localized detailed description of the rule",
+          "type": "string"
+        },
+        "actionName": {
+          "description": "Name of action that is recommended by this rule in string",
+          "type": "string"
+        },
+        "enabled": {
+          "format": "int32",
+          "description": "On/off flag indicating the rule is currently enabled or disabled.",
+          "type": "integer"
+        },
+        "level": {
+          "description": "Level of impact indicating how critical this rule is.",
+          "enum": [
+            "Critical",
+            "Warning",
+            "Information",
+            "NonUrgentSuggestion"
+          ],
+          "type": "string",
+          "x-ms-enum": {
+            "name": "NotificationLevel",
+            "modelAsString": false
+          }
+        },
+        "channels": {
+          "description": "List of available channels that this rule applies.",
+          "enum": [
+            "Notification",
+            "Api",
+            "Email",
+            "All"
+          ],
+          "type": "string",
+          "x-ms-enum": {
+            "name": "Channels",
+            "modelAsString": false
+          }
+        },
+        "tags": {
+          "description": "An array of category tags that the rule contains.",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "VnetInfo": {
+      "description": "VNETInfo contract. This contract is public and is a stripped down version of VNETInfoInternal",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "properties": {
+            "vnetResourceId": {
+              "description": "The vnet resource id",
+              "type": "string"
+            },
+            "certThumbprint": {
+              "description": "The client certificate thumbprint",
+              "type": "string"
+            },
+            "certBlob": {
+              "description": "A certificate file (.cer) blob containing the public key of the private key used to authenticate a \r\n            Point-To-Site VPN connection.",
+              "type": "string"
+            },
+            "routes": {
+              "description": "The routes that this virtual network connection uses.",
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/VnetRoute"
+              }
+            },
+            "resyncRequired": {
+              "description": "Flag to determine if a resync is required",
+              "type": "boolean"
+            },
+            "dnsServers": {
+              "description": "Dns servers to be used by this VNET. This should be a comma-separated list of IP addresses.",
+              "type": "string"
+            }
+          },
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "VnetRoute": {
+      "description": "VnetRoute contract used to pass routing information for a vnet.",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "properties": {
+            "name": {
+              "description": "The name of this route. This is only returned by the server and does not need to be set by the client.",
+              "type": "string"
+            },
+            "startAddress": {
+              "description": "The starting address for this route. This may also include a CIDR notation, in which case the end address must not be specified.",
+              "type": "string"
+            },
+            "endAddress": {
+              "description": "The ending address for this route. If the start address is specified in CIDR notation, this must be omitted.",
+              "type": "string"
+            },
+            "routeType": {
+              "description": "The type of route this is:\r\n            DEFAULT - By default, every web app has routes to the local address ranges specified by RFC1918\r\n            INHERITED - Routes inherited from the real Virtual Network routes\r\n            STATIC - Static route set on the web app only\r\n            \r\n            These values will be used for syncing a Web App's routes with those from a Virtual Network. This operation will clear all DEFAULT and INHERITED routes and replace them\r\n            with new INHERITED routes.",
+              "type": "string"
+            }
+          },
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "VnetGateway": {
+      "description": "The VnetGateway contract. This is used to give the vnet gateway access to the VPN package.",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "properties": {
+            "vnetName": {
+              "description": "The VNET name.",
+              "type": "string"
+            },
+            "vpnPackageUri": {
+              "description": "The URI where the Vpn package can be downloaded",
+              "type": "string"
+            }
+          },
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "NetworkFeatures": {
+      "description": "This is an object used to store a full view of network features (presently VNET integration and Hybrid Connections)\r\n            for a web app.",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "properties": {
+            "virtualNetworkName": {
+              "description": "The Vnet Name",
+              "type": "string"
+            },
+            "virtualNetworkConnection": {
+              "$ref": "#/definitions/VnetInfo",
+              "description": "The Vnet Summary view"
+            },
+            "hybridConnections": {
+              "description": "The Hybrid Connections Summary view",
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/RelayServiceConnectionEntity"
+              }
+            }
+          },
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "RelayServiceConnectionEntity": {
+      "description": "Class that represents a Biztalk Hybrid Connection",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "properties": {
+            "entityName": {
+              "type": "string"
+            },
+            "entityConnectionString": {
+              "type": "string"
+            },
+            "resourceType": {
+              "type": "string"
+            },
+            "resourceConnectionString": {
+              "type": "string"
+            },
+            "hostname": {
+              "type": "string"
+            },
+            "port": {
+              "format": "int32",
+              "type": "integer"
+            },
+            "biztalkUri": {
+              "type": "string"
+            }
+          },
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "CsmSlotEntity": {
+      "description": "Class containing deployment slot parameters",
+      "type": "object",
+      "properties": {
+        "targetSlot": {
+          "description": "Set the destination deployment slot during swap operation",
+          "type": "string"
+        },
+        "preserveVnet": {
+          "description": "Get or set the flag indicating it should preserve VNet to the slot during swap",
+          "type": "boolean"
+        }
+      }
+    },
+    "SlotDifferenceCollection": {
+      "description": "Collection of Slot Differences",
+      "type": "object",
+      "properties": {
+        "value": {
+          "description": "Collection of resources",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/SlotDifference"
+          }
+        },
+        "nextLink": {
+          "description": "Link to next page of resources",
+          "type": "string"
+        }
+      }
+    },
+    "SlotDifference": {
+      "description": "An object describing the difference in setting values between two web app slots",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "properties": {
+            "type": {
+              "description": "Indicates the type of the difference: Information, Warning or Error.",
+              "type": "string"
+            },
+            "settingType": {
+              "description": "The type of the settings: General, AppSetting or ConnectionString",
+              "type": "string"
+            },
+            "diffRule": {
+              "description": "Rule that describes how to process the difference in settings during web app slot swap.",
+              "type": "string"
+            },
+            "settingName": {
+              "description": "Name of the setting",
+              "type": "string"
+            },
+            "valueInCurrentSlot": {
+              "description": "Value of the setting in the current web app slot",
+              "type": "string"
+            },
+            "valueInTargetSlot": {
+              "description": "Value of the setting in the target web app slot",
+              "type": "string"
+            },
+            "description": {
+              "description": "Description of the difference",
+              "type": "string"
+            }
+          },
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "SlotConfigNamesResource": {
+      "description": "Slot Config names azure resource",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "properties": {
+            "connectionStringNames": {
+              "description": "List of connection string names",
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            "appSettingNames": {
+              "description": "List of application settings names",
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "SlotConfigNames": {
+      "description": "Class containing names for connection strings and application settings to be marked as sticky to the slot \r\n            and not moved during swap operation\r\n            This is valid for all deployment slots under the site",
+      "type": "object",
+      "properties": {
+        "connectionStringNames": {
+          "description": "List of connection string names",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "appSettingNames": {
+          "description": "List of application settings names",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "SiteCloneability": {
+      "description": "Represents whether or not a web app is cloneable",
+      "required": [
+        "result"
+      ],
+      "type": "object",
+      "properties": {
+        "result": {
+          "description": "Name of web app",
+          "enum": [
+            "Cloneable",
+            "PartiallyCloneable",
+            "NotCloneable"
+          ],
+          "type": "string",
+          "x-ms-enum": {
+            "name": "CloneAbilityResult",
+            "modelAsString": false
+          }
+        },
+        "blockingFeatures": {
+          "description": "List of features enabled on web app that prevent cloning",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/SiteCloneabilityCriterion"
+          }
+        },
+        "unsupportedFeatures": {
+          "description": "List of features enabled on web app that are non-blocking but cannot be cloned. The web app can still be cloned\r\n            but the features in this list will not be set up on cloned web app.",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/SiteCloneabilityCriterion"
+          }
+        },
+        "blockingCharacteristics": {
+          "description": "List of blocking application characteristics",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/SiteCloneabilityCriterion"
+          }
+        }
+      }
+    },
+    "SiteCloneabilityCriterion": {
+      "description": "Represents a site cloneability criterion",
+      "type": "object",
+      "properties": {
+        "name": {
+          "description": "Name of criterion",
+          "type": "string"
+        },
+        "description": {
+          "description": "Description of criterion",
+          "type": "string"
+        }
+      }
+    },
+    "CsmSiteRecoveryEntity": {
+      "description": "Class containting details about site recovery operation.",
+      "type": "object",
+      "properties": {
+        "snapshotTime": {
+          "format": "date-time",
+          "description": "Point in time in which the site recover should be attempted.",
+          "type": "string"
+        },
+        "recoverConfig": {
+          "description": "If true, then the website's configuration will be reverted to its state at SnapshotTime",
+          "type": "boolean"
+        },
+        "siteName": {
+          "description": "[Optional] Destination web app name into which web app should be recovered. This is case when new web app should be created instead.",
+          "type": "string"
+        },
+        "slotName": {
+          "description": "[Optional] Destination web app slot name into which web app should be recovered",
+          "type": "string"
+        }
+      }
+    },
+    "DeletedSiteCollection": {
+      "description": "Collection of deleted sites",
+      "type": "object",
+      "properties": {
+        "value": {
+          "description": "Collection of resources",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/DeletedSite"
+          }
+        },
+        "nextLink": {
+          "description": "Link to next page of resources",
+          "type": "string"
+        }
+      }
+    },
+    "DeletedSite": {
+      "description": "Reports deleted site including the timestamp of operation",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "required": [
+            "usageState",
+            "availabilityState"
+          ],
+          "properties": {
+            "deletedTimestamp": {
+              "format": "date-time",
+              "description": "Time when the site was deleted",
+              "type": "string"
+            },
+            "name": {
+              "description": "Name of web app",
+              "type": "string"
+            },
+            "state": {
+              "description": "State of the web app",
+              "type": "string",
+              "readOnly": true
+            },
+            "hostNames": {
+              "description": "Hostnames associated with web app",
+              "type": "array",
+              "items": {
+                "type": "string"
+              },
+              "readOnly": true
+            },
+            "repositorySiteName": {
+              "description": "Name of repository site",
+              "type": "string",
+              "readOnly": true
+            },
+            "usageState": {
+              "description": "State indicating whether web app has exceeded its quota usage",
+              "enum": [
+                "Normal",
+                "Exceeded"
+              ],
+              "type": "string",
+              "readOnly": true,
+              "x-ms-enum": {
+                "name": "UsageState",
+                "modelAsString": false
+              }
+            },
+            "enabled": {
+              "description": "True if the site is enabled; otherwise, false. Setting this  value to false disables the site (takes the site off line).",
+              "type": "boolean"
+            },
+            "enabledHostNames": {
+              "description": "Hostnames for the web app that are enabled. Hostnames need to be assigned and enabled. If some hostnames are assigned but not enabled\r\n            the app is not served on those hostnames",
+              "type": "array",
+              "items": {
+                "type": "string"
+              },
+              "readOnly": true
+            },
+            "availabilityState": {
+              "description": "Management information availability state for the web app. Possible values are Normal or Limited. \r\n            Normal means that the site is running correctly and that management information for the site is available. \r\n            Limited means that only partial management information for the site is available and that detailed site information is unavailable.",
+              "enum": [
+                "Normal",
+                "Limited",
+                "DisasterRecoveryMode"
+              ],
+              "type": "string",
+              "readOnly": true,
+              "x-ms-enum": {
+                "name": "SiteAvailabilityState",
+                "modelAsString": false
+              }
+            },
+            "hostNameSslStates": {
+              "description": "Hostname SSL states are  used to manage the SSL bindings for site's hostnames.",
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/HostNameSslState"
+              }
+            },
+            "serverFarmId": {
+              "type": "string"
+            },
+            "lastModifiedTimeUtc": {
+              "format": "date-time",
+              "description": "Last time web app was modified in UTC",
+              "type": "string",
+              "readOnly": true
+            },
+            "siteConfig": {
+              "$ref": "#/definitions/SiteConfig",
+              "description": "Configuration of web app"
+            },
+            "trafficManagerHostNames": {
+              "description": "Read-only list of Azure Traffic manager hostnames associated with web app",
+              "type": "array",
+              "items": {
+                "type": "string"
+              },
+              "readOnly": true
+            },
+            "premiumAppDeployed": {
+              "description": "If set indicates whether web app is deployed as a premium app",
+              "type": "boolean",
+              "readOnly": true
+            },
+            "scmSiteAlsoStopped": {
+              "description": "If set indicates whether to stop SCM (KUDU) site when the web app is stopped. Default is false.",
+              "type": "boolean"
+            },
+            "targetSwapSlot": {
+              "description": "Read-only property that specifies which slot this app will swap into",
+              "type": "string",
+              "readOnly": true
+            },
+            "hostingEnvironmentProfile": {
+              "$ref": "#/definitions/HostingEnvironmentProfile",
+              "description": "Specification for the hosting environment (App Service Environment) to use for the web app"
+            },
+            "microService": {
+              "description": "",
+              "type": "string"
+            },
+            "gatewaySiteName": {
+              "description": "Name of gateway app associated with web app",
+              "type": "string"
+            },
+            "clientAffinityEnabled": {
+              "description": "Specifies if the client affinity is enabled when load balancing http request for multiple instances of the web app",
+              "type": "boolean"
+            },
+            "clientCertEnabled": {
+              "description": "Specifies if the client certificate is enabled for the web app",
+              "type": "boolean"
+            },
+            "hostNamesDisabled": {
+              "description": "Specifies if the public hostnames are disabled the web app.\r\n            If set to true the app is only accessible via API Management process",
+              "type": "boolean"
+            },
+            "outboundIpAddresses": {
+              "description": "List of comma separated IP addresses that this web app uses for outbound connections. Those can be used when configuring firewall rules for databases accessed by this web app.",
+              "type": "string",
+              "readOnly": true
+            },
+            "containerSize": {
+              "format": "int32",
+              "description": "Size of a function container",
+              "type": "integer"
+            },
+            "maxNumberOfWorkers": {
+              "format": "int32",
+              "description": "Maximum number of workers\r\n            This only applies to function container",
+              "type": "integer"
+            },
+            "cloningInfo": {
+              "$ref": "#/definitions/CloningInfo",
+              "description": "This is only valid for web app creation. If specified, web app is cloned from \r\n            a source web app"
+            },
+            "resourceGroup": {
+              "description": "Resource group web app belongs to",
+              "type": "string",
+              "readOnly": true
+            },
+            "isDefaultContainer": {
+              "description": "Site is a default container",
+              "type": "boolean",
+              "readOnly": true
+            },
+            "defaultHostName": {
+              "description": "Default hostname of the web app",
+              "type": "string",
+              "readOnly": true
+            }
+          },
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "DeploymentCollection": {
+      "description": "Collection of app deployments",
+      "type": "object",
+      "properties": {
+        "value": {
+          "description": "Collection of resources",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/Deployment"
+          }
+        },
+        "nextLink": {
+          "description": "Link to next page of resources",
+          "type": "string"
+        }
+      }
+    },
+    "Deployment": {
+      "description": "Represents user crendentials used for publishing activity",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "properties": {
+            "id": {
+              "description": "Id",
+              "type": "string"
+            },
+            "status": {
+              "format": "int32",
+              "description": "Status",
+              "type": "integer"
+            },
+            "message": {
+              "description": "Message",
+              "type": "string"
+            },
+            "author": {
+              "description": "Author",
+              "type": "string"
+            },
+            "deployer": {
+              "description": "Deployer",
+              "type": "string"
+            },
+            "author_email": {
+              "description": "AuthorEmail",
+              "type": "string"
+            },
+            "start_time": {
+              "format": "date-time",
+              "description": "StartTime",
+              "type": "string"
+            },
+            "end_time": {
+              "format": "date-time",
+              "description": "EndTime",
+              "type": "string"
+            },
+            "active": {
+              "description": "Active",
+              "type": "boolean"
+            },
+            "details": {
+              "description": "Detail",
+              "type": "string"
+            }
+          },
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "SiteInstanceCollection": {
+      "description": "Collection of site instances",
+      "type": "object",
+      "properties": {
+        "value": {
+          "description": "Collection of resources",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/SiteInstance"
+          }
+        },
+        "nextLink": {
+          "description": "Link to next page of resources",
+          "type": "string"
+        }
+      }
+    },
+    "SiteInstance": {
+      "description": "Instance of a web app",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "properties": {
+            "name": {
+              "description": "Name of instance",
+              "type": "string"
+            }
+          },
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "HostNameBindingCollection": {
+      "description": "Collection of host name bindings",
+      "type": "object",
+      "properties": {
+        "value": {
+          "description": "Collection of resources",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/HostNameBinding"
+          }
+        },
+        "nextLink": {
+          "description": "Link to next page of resources",
+          "type": "string"
+        }
+      }
+    },
+    "HostNameBinding": {
+      "description": "A host name binding object",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "properties": {
+            "name": {
+              "description": "Hostname",
+              "type": "string"
+            },
+            "siteName": {
+              "description": "Web app name",
+              "type": "string"
+            },
+            "domainId": {
+              "description": "Fully qualified ARM domain resource URI",
+              "type": "string"
+            },
+            "azureResourceName": {
+              "description": "Azure resource name",
+              "type": "string"
+            },
+            "azureResourceType": {
+              "description": "Azure resource type",
+              "enum": [
+                "Website",
+                "TrafficManager"
+              ],
+              "type": "string",
+              "x-ms-enum": {
+                "name": "AzureResourceType",
+                "modelAsString": false
+              }
+            },
+            "customHostNameDnsRecordType": {
+              "description": "Custom DNS record type",
+              "enum": [
+                "CName",
+                "A"
+              ],
+              "type": "string",
+              "x-ms-enum": {
+                "name": "CustomHostNameDnsRecordType",
+                "modelAsString": false
+              }
+            },
+            "hostNameType": {
+              "description": "Host name type",
+              "enum": [
+                "Verified",
+                "Managed"
+              ],
+              "type": "string",
+              "x-ms-enum": {
+                "name": "HostNameType",
+                "modelAsString": false
+              }
+            }
+          },
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "SiteSourceControl": {
+      "description": "Describes the source control configuration for web app",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "properties": {
+            "repoUrl": {
+              "description": "Repository or source control url",
+              "type": "string"
+            },
+            "branch": {
+              "description": "Name of branch to use for deployment",
+              "type": "string"
+            },
+            "isManualIntegration": {
+              "description": "Whether to manual or continuous integration",
+              "type": "boolean"
+            },
+            "deploymentRollbackEnabled": {
+              "description": "Whether to manual or continuous integration",
+              "type": "boolean"
+            },
+            "isMercurial": {
+              "description": "Mercurial or Git repository type",
+              "type": "boolean"
+            }
+          },
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "StringDictionary": {
+      "description": "String dictionary resource",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "description": "Settings",
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "ConnectionStringDictionary": {
+      "description": "String dictionary resource",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "description": "Connection strings",
+          "type": "object",
+          "additionalProperties": {
+            "$ref": "#/definitions/ConnStringValueTypePair"
+          },
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "ConnStringValueTypePair": {
+      "description": "Database connection string value to type pair",
+      "required": [
+        "type"
+      ],
+      "type": "object",
+      "properties": {
+        "value": {
+          "description": "Value of pair",
+          "type": "string"
+        },
+        "type": {
+          "description": "Type of database",
+          "enum": [
+            "MySql",
+            "SQLServer",
+            "SQLAzure",
+            "Custom"
+          ],
+          "type": "string",
+          "x-ms-enum": {
+            "name": "DatabaseServerType",
+            "modelAsString": false
+          }
+        }
+      }
+    },
+    "SiteLogsConfig": {
+      "description": "Configuration of Azure web site",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "properties": {
+            "applicationLogs": {
+              "$ref": "#/definitions/ApplicationLogsConfig",
+              "description": "Application logs configuration"
+            },
+            "httpLogs": {
+              "$ref": "#/definitions/HttpLogsConfig",
+              "description": "Http logs configuration"
+            },
+            "failedRequestsTracing": {
+              "$ref": "#/definitions/EnabledConfig",
+              "description": "Failed requests tracing configuration"
+            },
+            "detailedErrorMessages": {
+              "$ref": "#/definitions/EnabledConfig",
+              "description": "Detailed error messages configuration"
+            }
+          },
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "ApplicationLogsConfig": {
+      "description": "Application logs configuration",
+      "type": "object",
+      "properties": {
+        "fileSystem": {
+          "$ref": "#/definitions/FileSystemApplicationLogsConfig",
+          "description": "Application logs to file system configuration"
+        },
+        "azureTableStorage": {
+          "$ref": "#/definitions/AzureTableStorageApplicationLogsConfig",
+          "description": "Application logs to azure table storage configuration"
+        },
+        "azureBlobStorage": {
+          "$ref": "#/definitions/AzureBlobStorageApplicationLogsConfig",
+          "description": "Application logs to blob storage configuration"
+        }
+      }
+    },
+    "HttpLogsConfig": {
+      "description": "Http logs configuration",
+      "type": "object",
+      "properties": {
+        "fileSystem": {
+          "$ref": "#/definitions/FileSystemHttpLogsConfig",
+          "description": "Http logs to file system configuration"
+        },
+        "azureBlobStorage": {
+          "$ref": "#/definitions/AzureBlobStorageHttpLogsConfig",
+          "description": "Http logs to azure blob storage configuration"
+        }
+      }
+    },
+    "EnabledConfig": {
+      "description": "Enabled configuration",
+      "type": "object",
+      "properties": {
+        "enabled": {
+          "description": "Enabled",
+          "type": "boolean"
+        }
+      }
+    },
+    "FileSystemApplicationLogsConfig": {
+      "description": "Application logs to file system configuration",
+      "type": "object",
+      "properties": {
+        "level": {
+          "description": "Log level",
+          "enum": [
+            "Off",
+            "Verbose",
+            "Information",
+            "Warning",
+            "Error"
+          ],
+          "type": "string",
+          "x-ms-enum": {
+            "name": "LogLevel",
+            "modelAsString": false
+          }
+        }
+      }
+    },
+    "AzureTableStorageApplicationLogsConfig": {
+      "description": "Application logs to azure table storage configuration",
+      "type": "object",
+      "properties": {
+        "level": {
+          "description": "Log level",
+          "enum": [
+            "Off",
+            "Verbose",
+            "Information",
+            "Warning",
+            "Error"
+          ],
+          "type": "string",
+          "x-ms-enum": {
+            "name": "LogLevel",
+            "modelAsString": false
+          }
+        },
+        "sasUrl": {
+          "description": "SAS url to an azure table with add/query/delete permissions",
+          "type": "string"
+        }
+      }
+    },
+    "AzureBlobStorageApplicationLogsConfig": {
+      "description": "Application logs azure blob storage configuration",
+      "type": "object",
+      "properties": {
+        "level": {
+          "description": "Log level",
+          "enum": [
+            "Off",
+            "Verbose",
+            "Information",
+            "Warning",
+            "Error"
+          ],
+          "type": "string",
+          "x-ms-enum": {
+            "name": "LogLevel",
+            "modelAsString": false
+          }
+        },
+        "sasUrl": {
+          "description": "SAS url to a azure blob container with read/write/list/delete permissions",
+          "type": "string"
+        },
+        "retentionInDays": {
+          "format": "int32",
+          "description": "Retention in days.\r\n            Remove blobs older than X days.\r\n            0 or lower means no retention.",
+          "type": "integer"
+        }
+      }
+    },
+    "FileSystemHttpLogsConfig": {
+      "description": "Http logs to file system configuration",
+      "type": "object",
+      "properties": {
+        "retentionInMb": {
+          "format": "int32",
+          "description": "Maximum size in megabytes that http log files can use.\r\n            When reached old log files will be removed to make space for new ones.\r\n            Value can range between 25 and 100.",
+          "type": "integer"
+        },
+        "retentionInDays": {
+          "format": "int32",
+          "description": "Retention in days.\r\n            Remove files older than X days.\r\n            0 or lower means no retention.",
+          "type": "integer"
+        },
+        "enabled": {
+          "description": "Enabled",
+          "type": "boolean"
+        }
+      }
+    },
+    "AzureBlobStorageHttpLogsConfig": {
+      "description": "Http logs to azure blob storage configuration",
+      "type": "object",
+      "properties": {
+        "sasUrl": {
+          "description": "SAS url to a azure blob container with read/write/list/delete permissions",
+          "type": "string"
+        },
+        "retentionInDays": {
+          "format": "int32",
+          "description": "Retention in days.\r\n            Remove blobs older than X days.\r\n            0 or lower means no retention.",
+          "type": "integer"
+        },
+        "enabled": {
+          "description": "Enabled",
+          "type": "boolean"
+        }
+      }
+    },
+    "PremierAddOnRequest": {
+      "type": "object",
+      "properties": {
+        "location": {
+          "description": "Geo region resource belongs to e.g. SouthCentralUS, SouthEastAsia",
+          "type": "string"
+        },
+        "tags": {
+          "description": "Tags associated with resource",
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          }
+        },
+        "plan": {
+          "$ref": "#/definitions/ArmPlan",
+          "description": "Azure resource manager plan"
+        },
+        "properties": {
+          "$ref": "#/definitions/Object",
+          "description": "Resource specific properties"
+        },
+        "sku": {
+          "$ref": "#/definitions/SkuDescription",
+          "description": "Sku description of the resource"
+        }
+      }
+    },
+    "BackupRequest": {
+      "description": "Description of a backup which will be performed",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "required": [
+            "type"
+          ],
+          "properties": {
+            "name": {
+              "description": "Name of the backup",
+              "type": "string"
+            },
+            "enabled": {
+              "description": "True if the backup schedule is enabled (must be included in that case), false if the backup schedule should be disabled",
+              "type": "boolean"
+            },
+            "storageAccountUrl": {
+              "description": "SAS URL to the container",
+              "type": "string"
+            },
+            "backupSchedule": {
+              "$ref": "#/definitions/BackupSchedule",
+              "description": "Schedule for the backup if it is executed periodically"
+            },
+            "databases": {
+              "description": "Databases included in the backup",
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/DatabaseBackupSetting"
+              }
+            },
+            "type": {
+              "description": "Type of the backup",
+              "enum": [
+                "Default",
+                "Clone",
+                "Relocation"
+              ],
+              "type": "string",
+              "x-ms-enum": {
+                "name": "BackupRestoreOperationType",
+                "modelAsString": false
+              }
+            }
+          },
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "BackupSchedule": {
+      "description": "Description of a backup schedule. Describes how often should be the backup performed and what should be the retention policy.",
+      "required": [
+        "frequencyUnit"
+      ],
+      "type": "object",
+      "properties": {
+        "frequencyInterval": {
+          "format": "int32",
+          "description": "How often should be the backup executed (e.g. for weekly backup, this should be set to 7 and FrequencyUnit should be set to Day)",
+          "type": "integer"
+        },
+        "frequencyUnit": {
+          "description": "How often should be the backup executed (e.g. for weekly backup, this should be set to Day and FrequencyInterval should be set to 7)",
+          "enum": [
+            "Day",
+            "Hour"
+          ],
+          "type": "string",
+          "x-ms-enum": {
+            "name": "FrequencyUnit",
+            "modelAsString": false
+          }
+        },
+        "keepAtLeastOneBackup": {
+          "description": "True if the retention policy should always keep at least one backup in the storage account, regardless how old it is; false otherwise.",
+          "type": "boolean"
+        },
+        "retentionPeriodInDays": {
+          "format": "int32",
+          "description": "After how many days backups should be deleted",
+          "type": "integer"
+        },
+        "startTime": {
+          "format": "date-time",
+          "description": "When the schedule should start working",
+          "type": "string"
+        },
+        "lastExecutionTime": {
+          "format": "date-time",
+          "description": "The last time when this schedule was triggered",
+          "type": "string"
+        }
+      }
+    },
+    "DatabaseBackupSetting": {
+      "description": "Note: properties are serialized in JSON format and stored in DB. \r\n            if new properties are added they might not be in the previous data rows \r\n            so please handle nulls",
+      "type": "object",
+      "properties": {
+        "databaseType": {
+          "description": "SqlAzure / MySql",
+          "type": "string"
+        },
+        "name": {
+          "type": "string"
+        },
+        "connectionStringName": {
+          "description": "Contains a connection string name that is linked to the SiteConfig.ConnectionStrings.\r\n            This is used during restore with overwrite connection strings options.",
+          "type": "string"
+        },
+        "connectionString": {
+          "description": "Contains a connection string to a database which is being backed up/restored. If the restore should happen to a new database, the database name inside is the new one.",
+          "type": "string"
+        }
+      }
+    },
+    "BackupItem": {
+      "description": "Backup description",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "required": [
+            "status"
+          ],
+          "properties": {
+            "id": {
+              "format": "int32",
+              "description": "Id of the backup.",
+              "type": "integer"
+            },
+            "storageAccountUrl": {
+              "description": "SAS URL for the storage account container which contains this backup",
+              "type": "string"
+            },
+            "blobName": {
+              "description": "Name of the blob which contains data for this backup",
+              "type": "string"
+            },
+            "name": {
+              "description": "Name of this backup",
+              "type": "string"
+            },
+            "status": {
+              "description": "Backup status",
+              "enum": [
+                "InProgress",
+                "Failed",
+                "Succeeded",
+                "TimedOut",
+                "Created",
+                "Skipped",
+                "PartiallySucceeded",
+                "DeleteInProgress",
+                "DeleteFailed",
+                "Deleted"
+              ],
+              "type": "string",
+              "x-ms-enum": {
+                "name": "BackupItemStatus",
+                "modelAsString": false
+              }
+            },
+            "sizeInBytes": {
+              "format": "int64",
+              "description": "Size of the backup in bytes",
+              "type": "integer"
+            },
+            "created": {
+              "format": "date-time",
+              "description": "Timestamp of the backup creation",
+              "type": "string"
+            },
+            "log": {
+              "description": "Details regarding this backup. Might contain an error message.",
+              "type": "string"
+            },
+            "databases": {
+              "description": "List of databases included in the backup",
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/DatabaseBackupSetting"
+              }
+            },
+            "scheduled": {
+              "description": "True if this backup has been created due to a schedule being triggered.",
+              "type": "boolean"
+            },
+            "lastRestoreTimeStamp": {
+              "format": "date-time",
+              "description": "Timestamp of a last restore operation which used this backup.",
+              "type": "string"
+            },
+            "finishedTimeStamp": {
+              "format": "date-time",
+              "description": "Timestamp when this backup finished.",
+              "type": "string"
+            },
+            "correlationId": {
+              "description": "Unique correlation identifier. Please use this along with the timestamp while communicating with Azure support.",
+              "type": "string"
+            },
+            "websiteSizeInBytes": {
+              "format": "int64",
+              "description": "Size of the original web app which has been backed up",
+              "type": "integer"
+            }
+          },
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "RestoreRequest": {
+      "description": "Description of a restore request",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "required": [
+            "operationType"
+          ],
+          "properties": {
+            "storageAccountUrl": {
+              "description": "SAS URL to the container",
+              "type": "string"
+            },
+            "blobName": {
+              "description": "Name of a blob which contains the backup",
+              "type": "string"
+            },
+            "overwrite": {
+              "description": "True if the restore operation can overwrite target site. \"True\" needed if trying to restore over an existing site.",
+              "type": "boolean"
+            },
+            "siteName": {
+              "description": "Name of a site (Web App)",
+              "type": "string"
+            },
+            "databases": {
+              "description": "Collection of databses which should be restored. This list has to match the list of databases included in the backup.",
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/DatabaseBackupSetting"
+              }
+            },
+            "ignoreConflictingHostNames": {
+              "description": "Changes a logic when restoring a site with custom domains. If \"true\", custom domains are removed automatically. If \"false\", custom domains are added to \r\n            the site object when it is being restored, but that might fail due to conflicts during the operation.",
+              "type": "boolean"
+            },
+            "operationType": {
+              "description": "Operation type",
+              "enum": [
+                "Default",
+                "Clone",
+                "Relocation"
+              ],
+              "type": "string",
+              "x-ms-enum": {
+                "name": "BackupRestoreOperationType",
+                "modelAsString": false
+              }
+            },
+            "adjustConnectionStrings": {
+              "description": "Gets or sets a flag showing if SiteConfig.ConnectionStrings should be set in new site",
+              "type": "boolean"
+            },
+            "hostingEnvironment": {
+              "description": "App Service Environment name, if needed (only when restoring a site to an App Service Environment)",
+              "type": "string"
+            }
+          },
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "BackupItemCollection": {
+      "description": "Collection of Backup Items",
+      "type": "object",
+      "properties": {
+        "value": {
+          "description": "Collection of resources",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/BackupItem"
+          }
+        },
+        "nextLink": {
+          "description": "Link to next page of resources",
+          "type": "string"
+        }
+      }
+    },
+    "RestoreResponse": {
+      "description": "Response for a restore site request",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "properties": {
+            "operationId": {
+              "description": "When server starts the restore process, it will return an OperationId identifying that particular restore operation",
+              "type": "string"
+            }
+          },
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "CsmPublishingProfileOptions": {
+      "description": "Publishing options for requested profile",
+      "type": "object",
+      "properties": {
+        "format": {
+          "description": "Name of the format. Valid values are: \r\n            FileZilla3\r\n            WebDeploy -- default\r\n            Ftp",
+          "type": "string"
+        }
+      }
+    },
+    "TopLevelDomainCollection": {
+      "description": "Collection of Top Level Domains",
+      "type": "object",
+      "properties": {
+        "value": {
+          "description": "Collection of resources",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/TopLevelDomain"
+          }
+        },
+        "nextLink": {
+          "description": "Link to next page of resources",
+          "type": "string"
+        }
+      }
+    },
+    "TopLevelDomain": {
+      "description": "A top level domain object",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Resource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "properties": {
+            "name": {
+              "description": "Name of the top level domain",
+              "type": "string"
+            },
+            "privacy": {
+              "description": "If true then the top level domain supports domain privacy",
+              "type": "boolean"
+            }
+          },
+          "x-ms-client-flatten": true
+        }
+      }
+    },
+    "TopLevelDomainAgreementOption": {
+      "description": "Options for retrieving the list of top level domain legal agreements",
+      "type": "object",
+      "properties": {
+        "includePrivacy": {
+          "description": "If true then the list of agreements will inclue agreements for domain privacy as well.",
+          "type": "boolean"
+        }
+      }
+    },
+    "TldLegalAgreementCollection": {
+      "description": "Collection of Tld Legal Agreements",
+      "type": "object",
+      "properties": {
+        "value": {
+          "description": "Collection of resources",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/TldLegalAgreement"
+          }
+        },
+        "nextLink": {
+          "description": "Link to next page of resources",
+          "type": "string"
+        }
+      }
+    },
+    "TldLegalAgreement": {
+      "description": "Represents a legal agreement for top level domain",
+      "type": "object",
+      "properties": {
+        "agreementKey": {
+          "description": "Unique identifier for the agreement",
+          "type": "string"
+        },
+        "title": {
+          "description": "Agreement title",
+          "type": "string"
+        },
+        "content": {
+          "description": "Agreement details",
+          "type": "string"
+        },
+        "url": {
+          "description": "Url where a copy of the agreement details is hosted",
+          "type": "string"
+        }
+      }
+    },
+    "Resource": {
+      "required": [
+        "location"
+      ],
+      "properties": {
+        "id": {
+          "description": "Resource Id",
+          "type": "string"
+        },
+        "name": {
+          "description": "Resource Name",
+          "type": "string"
+        },
+        "kind": {
+          "description": "Kind of resource",
+          "type": "string"
+        },
+        "location": {
+          "description": "Resource Location",
+          "type": "string"
+        },
+        "type": {
+          "description": "Resource type",
+          "type": "string"
+        },
+        "tags": {
+          "description": "Resource tags",
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          }
+        }
+      },
+      "x-ms-azure-resource": true
+    }
+  },
+  "parameters": {
+    "subscriptionIdParameter": {
+      "name": "subscriptionId",
+      "in": "path",
+      "description": "Subscription Id",
+      "required": true,
+      "type": "string"
+    },
+    "apiVersionParameter": {
+      "name": "api-version",
+      "in": "query",
+      "description": "API Version",
+      "required": true,
+      "type": "string"
+    }
+  },
+  "securityDefinitions": {
+    "azure_auth": {
+      "type": "oauth2",
+      "description": "Azure Active Directory OAuth2 Flow",
+      "flow": "implicit",
+      "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
+      "scopes": {
+        "user_impersonation": "impersonate your user account"
+      }
+    }
+  },
+  "security": [
+    {
+      "azure_auth": [
+        "user_impersonation"
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/packages.config b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/packages.config
index 64fb5d7b3b792..a9c24d52f8b6c 100644
--- a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/packages.config
+++ b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/packages.config
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="xunit" version="2.1.0" targetFramework="net452" />
-  <package id="xunit.abstractions" version="2.0.0" targetFramework="net452" />
-  <package id="xunit.assert" version="2.1.0" targetFramework="net452" />
-  <package id="xunit.core" version="2.1.0" targetFramework="net452" />
-  <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net452" />
-  <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net452" />
-  <package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net452" />
+  <package id="xunit" version="2.1.0" targetFramework="net45" />
+  <package id="xunit.abstractions" version="2.0.0" targetFramework="net451" />
+  <package id="xunit.assert" version="2.1.0" targetFramework="net45" />
+  <package id="xunit.core" version="2.1.0" targetFramework="net45" />
+  <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
+  <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
+  <package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/AutoRest.Generator.AzureResourceSchema.csproj b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/AutoRest.Generator.AzureResourceSchema.csproj
index 9afbe46b7ef40..d1f8246a3974f 100644
--- a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/AutoRest.Generator.AzureResourceSchema.csproj
+++ b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/AutoRest.Generator.AzureResourceSchema.csproj
@@ -1,17 +1,62 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\..\</SolutionDir>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <LibraryFxTarget Condition="'$(LibraryFxTarget)' == ''">net45</LibraryFxTarget>
     <ProjectGuid>{654344A5-0556-49C7-BFB3-59676D7440D3}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Rest.Generator.AzureResourceSchema</RootNamespace>
     <AssemblyName>AutoRest.Generator.AzureResourceSchema</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <Configuration Condition=" '$(Configuration)' == '' ">Net45-Debug</Configuration>
   </PropertyGroup>
+  <Import Project="$(SolutionDir)\Tools\AutoRest.Settings.targets" />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Net45-Debug|AnyCPU' ">
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Net45-Debug</OutputPath>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="JsonSchema.cs" />
+    <Compile Include="ResourceSchema.cs" />
+    <Compile Include="ResourceSchemaParser.cs" />
+    <Compile Include="ResourceSchemaWriter.cs" />
+    <Compile Include="AzureResourceSchemaCodeGenerator.cs" />
+    <Compile Include="$(SolutionDir)\Tools\AssemblyVersionInfo.cs">
+      <Link>Properties\AssemblyVersionInfo.cs</Link>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\AutoRest.Core\AutoRest.Core.csproj">
+      <Project>{c876085f-9dc3-41f0-b7b4-17022cd84684}</Project>
+      <Name>AutoRest.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Extensions\Extensions\AutoRest.Generator.Extensions.csproj">
+      <Project>{7dd043eb-5e53-4180-b123-cc3cc5022e34}</Project>
+      <Name>AutoRest.Generator.Extensions</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <CodeAnalysisDictionary Include="$(SolutionDir)\Tools\CustomDictionary.xml">
+      <Link>CustomDictionary.xml</Link>
+    </CodeAnalysisDictionary>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
diff --git a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/AzureResourceSchemaCodeGenerator.cs b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/AzureResourceSchemaCodeGenerator.cs
new file mode 100644
index 0000000000000..4f20864fb837a
--- /dev/null
+++ b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/AzureResourceSchemaCodeGenerator.cs
@@ -0,0 +1,56 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using Microsoft.Rest.Generator.ClientModel;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+
+namespace Microsoft.Rest.Generator.AzureResourceSchema
+{
+    public class AzureResourceSchemaCodeGenerator : CodeGenerator
+    {
+        public AzureResourceSchemaCodeGenerator(Settings settings)
+            : base(settings)
+        {
+        }
+
+        public override string Description
+        {
+            get { return "Azure Resource Schema generator"; }
+        }
+
+        public override string ImplementationFileExtension
+        {
+            get { return ".json"; }
+        }
+
+        public override string Name
+        {
+            get { return "AzureResourceSchema"; }
+        }
+
+        public override string UsageInstructions
+        {
+            get { return "Your Azure Resource Schema(s) can be found in " + Settings.OutputDirectory; }
+        }
+
+        public override void NormalizeClientModel(ServiceClient serviceClient)
+        {
+        }
+
+        public override async Task Generate(ServiceClient serviceClient)
+        {
+            IDictionary<string, ResourceSchema> resourceSchemas = ResourceSchemaParser.Parse(serviceClient);
+
+            foreach (string resourceProvider in resourceSchemas.Keys)
+            {
+                StringWriter stringWriter = new StringWriter();
+                ResourceSchemaWriter.Write(stringWriter, resourceSchemas[resourceProvider]);
+
+                string schemaPath = Path.Combine(Settings.OutputDirectory, resourceProvider, ".json");
+                await Write(stringWriter.ToString(), schemaPath);
+            }
+        }
+    }
+}
diff --git a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/JsonSchema.cs b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/JsonSchema.cs
new file mode 100644
index 0000000000000..26beb8c8606a7
--- /dev/null
+++ b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/JsonSchema.cs
@@ -0,0 +1,439 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.Rest.Generator.AzureResourceSchema
+{
+    /// <summary>
+    /// An object representing a JSON schema. Each property of a JSON schema ($schema, title, and
+    /// description are metadata, not properties) is also a JSON schema, so the class is recursive.
+    /// </summary>
+    public class JsonSchema
+    {
+        private IList<string> enumList;
+        private IDictionary<string, JsonSchema> properties;
+        private IList<string> requiredList;
+        private IList<JsonSchema> resources;
+
+        /// <summary>
+        /// A reference to the location in the parent schema where this schema's definition can be
+        /// found.
+        /// </summary>
+        public string Ref { get; set; }
+
+        /// <summary>
+        /// The JSONSchema that will be applied to the elements of this schema, assuming this
+        /// schema is an array schema type.
+        /// </summary>
+        public JsonSchema Items { get; set; }
+
+        /// <summary>
+        /// The description metadata that describes this schema.
+        /// </summary>
+        public string Description { get; set; }
+
+        /// <summary>
+        /// The type metadata of this schema that describes what type matching JSON values must be.
+        /// For example, this value will be either "object", "string", "array", "integer",
+        /// "number", or "boolean".
+        /// </summary>
+        public string JsonType { get; set; }
+
+        /// <summary>
+        /// Get the resource type of this JsonSchema. If this JsonSchema defines an Azure Resource,
+        /// then this value will be found in definition.properties.type.enum[0]. If this JsonSchema
+        /// does not define an Azure Resource, then this will return null.
+        /// </summary>
+        public string ResourceType
+        {
+            get
+            {
+                string result = null;
+
+                if (Properties != null &&
+                    Properties.ContainsKey("type") &&
+                    Properties["type"].Enum != null)
+                {
+                    result = Properties["type"].Enum.SingleOrDefault();
+                }
+
+                return result;
+            }
+            set
+            {
+                if (properties == null)
+                {
+                    properties = new Dictionary<string, JsonSchema>();
+                }
+
+                if (!Properties.ContainsKey("type"))
+                {
+                    Properties["type"] = new JsonSchema();
+                }
+
+                Properties["type"].enumList = new List<string>() { value };
+            }
+        }
+
+        /// <summary>
+        /// The schema that matches additional properties that have not been specified in the
+        /// Properties dictionary.
+        /// </summary>
+        public JsonSchema AdditionalProperties { get; set; }
+
+        /// <summary>
+        /// An enumeration of values that will match this JSON schema. Any value not in this
+        /// enumeration will not match this schema.
+        /// </summary>
+        public IList<string> Enum
+        {
+            get { return enumList; }
+        }
+
+        /// <summary>
+        /// The schemas that describe the properties of a matching JSON value.
+        /// </summary>
+        public IDictionary<string,JsonSchema> Properties
+        {
+            get { return properties; }
+        }
+
+        /// <summary>
+        /// The names of the properties that are required for a matching JSON value.
+        /// </summary>
+        public IList<string> Required
+        {
+            get { return requiredList; }
+        }
+
+        /// <summary>
+        /// The child resources that are allowed for this JsonSchema.
+        /// </summary>
+        public IList<JsonSchema> Resources
+        {
+            get { return resources; }
+        }
+
+        /// <summary>
+        /// Add a new value (or values) to this JsonSchema's enum list. This JsonSchema (with the
+        /// new value(s)) is then returned so that additional changes can be chained together.
+        /// </summary>
+        /// <param name="enumValue"></param>
+        /// <param name="extraEnumValues"></param>
+        /// <returns></returns>
+        public JsonSchema AddEnum(string enumValue, params string[] extraEnumValues)
+        {
+            if (string.IsNullOrWhiteSpace(enumValue))
+            {
+                throw new ArgumentException("enumValue cannot be null or whitespace", "enumValue");
+            }
+
+            if (enumList == null)
+            {
+                enumList = new List<string>();
+            }
+
+            if (enumList.Contains(enumValue))
+            {
+                throw new ArgumentException("enumValue (" + enumValue + ") already exists in the list of allowed values.", "enumValue");
+            }
+            enumList.Add(enumValue);
+
+            if (extraEnumValues != null && extraEnumValues.Length > 0)
+            {
+                foreach (string extraEnumValue in extraEnumValues)
+                {
+                    if (enumList.Contains(extraEnumValue))
+                    {
+                        throw new ArgumentException("extraEnumValue (" + extraEnumValue + ") already exists in the list of allowed values.", "extraEnumValues");
+                    }
+                    enumList.Add(extraEnumValue);
+                }
+            }
+
+            return this;
+        }
+
+        /// <summary>
+        /// Add a new property to this JsonSchema, and then return this JsonSchema so that
+        /// additional changes can be chained together.
+        /// </summary>
+        /// <param name="propertyName">The name of the property to add.</param>
+        /// <param name="propertyDefinition">The JsonSchema definition of the property to add.</param>
+        /// <returns></returns>
+        public JsonSchema AddProperty(string propertyName, JsonSchema propertyDefinition)
+        {
+            return AddProperty(propertyName, propertyDefinition, false);
+        }
+
+        /// <summary>
+        /// Add a new property to this JsonSchema, and then return this JsonSchema so that
+        /// additional changes can be chained together.
+        /// </summary>
+        /// <param name="propertyName">The name of the property to add.</param>
+        /// <param name="propertyDefinition">The JsonSchema definition of the property to add.</param>
+        /// <param name="isRequired">Whether this property is required or not.</param>
+        /// <returns></returns>
+        public JsonSchema AddProperty(string propertyName, JsonSchema propertyDefinition, bool isRequired)
+        {
+            if (string.IsNullOrWhiteSpace(propertyName))
+            {
+                throw new ArgumentException("propertyName cannot be null or whitespace", "propertyName");
+            }
+            if (propertyDefinition == null)
+            {
+                throw new ArgumentNullException("propertyDefinition");
+            }
+            
+            if (properties == null)
+            {
+                properties = new Dictionary<string, JsonSchema>();
+            }
+
+            if (properties.ContainsKey(propertyName))
+            {
+                throw new ArgumentException("A property with the name \"" + propertyName + "\" already exists in this JSONSchema", "propertyName");
+            }
+
+            properties[propertyName] = propertyDefinition;
+
+            if (isRequired)
+            {
+                AddRequired(propertyName);
+            }
+
+            return this;
+        }
+
+        /// <summary>
+        /// Add the provided required property names to this JSON schema's list of required property names.
+        /// </summary>
+        /// <param name="requiredPropertyName"></param>
+        /// <param name="extraRequiredPropertyNames"></param>
+        public JsonSchema AddRequired(string requiredPropertyName, params string[] extraRequiredPropertyNames)
+        {
+            if (Properties == null || !Properties.ContainsKey(requiredPropertyName))
+            {
+                throw new ArgumentException("No property exists with the provided requiredPropertyName (" + requiredPropertyName + ")", "requiredPropertyName");
+            }
+
+            if (requiredList == null)
+            {
+                requiredList = new List<string>();
+            }
+
+            if (requiredList.Contains(requiredPropertyName))
+            {
+                throw new ArgumentException("'" + requiredPropertyName + "' is already a required property.", "requiredPropertyName");
+            }
+            requiredList.Add(requiredPropertyName);
+
+            if (extraRequiredPropertyNames != null)
+            {
+                foreach (string extraRequiredPropertyName in extraRequiredPropertyNames)
+                {
+                    if (Properties == null || !Properties.ContainsKey(extraRequiredPropertyName))
+                    {
+                        throw new ArgumentException("No property exists with the provided extraRequiredPropertyName (" + extraRequiredPropertyName + ")", "extraRequiredPropertyNames");
+                    }
+                    if (requiredList.Contains(extraRequiredPropertyName))
+                    {
+                        throw new ArgumentException("'" + extraRequiredPropertyName + "' is already a required property.", "extraRequiredPropertyNames");
+                    }
+                    requiredList.Add(extraRequiredPropertyName);
+                }
+            }
+
+            return this;
+        }
+
+        /// <summary>
+        /// Add a child resource schema to this JsonSchema.
+        /// </summary>
+        /// <param name="childResourceSchema">The child resource schema to add to this JsonSchema.</param>
+        /// <returns></returns>
+        public JsonSchema AddResource(JsonSchema childResourceSchema)
+        {
+            if (childResourceSchema == null)
+            {
+                throw new ArgumentNullException("childResourceSchema");
+            }
+
+            if (resources == null)
+            {
+                resources = new List<JsonSchema>();
+            }
+            resources.Add(childResourceSchema);
+
+            return this;
+        }
+
+        /// <summary>
+        /// Create a new JsonSchema that is an exact copy of this one.
+        /// </summary>
+        /// <returns></returns>
+        public JsonSchema Clone()
+        {
+            JsonSchema result = new JsonSchema();
+            result.Ref = Ref;
+            result.Items = Clone(Items);
+            result.Description = Description;
+            result.JsonType = JsonType;
+            result.AdditionalProperties = Clone(AdditionalProperties);
+            result.enumList = Clone(Enum);
+            result.properties = Clone(Properties);
+            result.requiredList = Clone(Required);
+            result.resources = Clone(Resources);
+            return result;
+        }
+
+        private static JsonSchema Clone(JsonSchema toClone)
+        {
+            JsonSchema result = null;
+
+            if (toClone != null)
+            {
+                result = toClone.Clone();
+            }
+
+            return result;
+        }
+
+        private static IList<string> Clone(IList<string> toClone)
+        {
+            IList<string> result = null;
+
+            if (toClone != null)
+            {
+                result = new List<string>(toClone);
+            }
+
+            return result;
+        }
+
+        private static IList<JsonSchema> Clone(IList<JsonSchema> toClone)
+        {
+            IList<JsonSchema> result = null;
+
+            if (toClone != null)
+            {
+                result = new List<JsonSchema>();
+                foreach (JsonSchema schema in toClone)
+                {
+                    result.Add(Clone(schema));
+                }
+            }
+
+            return result;
+        }
+
+        private static IDictionary<string,JsonSchema> Clone(IDictionary<string,JsonSchema> toClone)
+        {
+            IDictionary<string, JsonSchema> result = null;
+
+            if (toClone != null)
+            {
+                result = new Dictionary<string, JsonSchema>();
+                foreach (string key in toClone.Keys)
+                {
+                    result.Add(key, Clone(toClone[key]));
+                }
+            }
+
+            return result;
+        }
+
+        public override bool Equals(object obj)
+        {
+            bool result = false;
+
+            JsonSchema rhs = obj as JsonSchema;
+            if (rhs != null)
+            {
+                result = Equals(Ref, rhs.Ref) &&
+                         Equals(Items, rhs.Items) &&
+                         Equals(JsonType, rhs.JsonType) &&
+                         Equals(AdditionalProperties, rhs.AdditionalProperties) &&
+                         Equals(Enum, rhs.Enum) &&
+                         Equals(Properties, rhs.Properties) &&
+                         Equals(Required, rhs.Required) &&
+                         Equals(Description, rhs.Description);
+            }
+
+            return result;
+        }
+
+        public override int GetHashCode()
+        {
+            return GetHashCode(GetType()) ^
+                   GetHashCode(Ref) ^
+                   GetHashCode(Items) ^
+                   GetHashCode(Description) ^
+                   GetHashCode(JsonType) ^
+                   GetHashCode(AdditionalProperties) ^
+                   GetHashCode(Enum) ^
+                   GetHashCode(Properties) ^
+                   GetHashCode(Required) ^
+                   GetHashCode(Description);
+        }
+
+        private static int GetHashCode(object value)
+        {
+            return value == null ? 0 : value.GetHashCode();
+        }
+
+        private static bool Equals(IEnumerable<string> lhs, IEnumerable<string> rhs)
+        {
+            bool result = lhs == rhs;
+
+            if (!result &&
+                lhs != null &&
+                rhs != null &&
+                lhs.Count() == rhs.Count())
+            {
+                result = true;
+
+                IEnumerator<string> lhsEnumerator = lhs.GetEnumerator();
+                IEnumerator<string> rhsEnumerator = rhs.GetEnumerator();
+                while (lhsEnumerator.MoveNext() && rhsEnumerator.MoveNext())
+                {
+                    if (!Equals(lhsEnumerator.Current, rhsEnumerator.Current))
+                    {
+                        result = false;
+                        break;
+                    }
+                }
+            }
+
+            return result;
+        }
+
+        private static bool Equals(IDictionary<string, JsonSchema> lhs, IDictionary<string, JsonSchema> rhs)
+        {
+            bool result = lhs == rhs;
+
+            if (!result &&
+                lhs != null &&
+                rhs != null &&
+                lhs.Count == rhs.Count)
+            {
+                result = true;
+
+                foreach (string key in lhs.Keys)
+                {
+                    if (rhs.ContainsKey(key) == false ||
+                        !Equals(lhs[key], rhs[key]))
+                    {
+                        result = false;
+                        break;
+                    }
+                }
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/Properties/AssemblyInfo.cs b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/Properties/AssemblyInfo.cs
index 34f7036d5899a..da321c159d8f4 100644
--- a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/Properties/AssemblyInfo.cs
+++ b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/Properties/AssemblyInfo.cs
@@ -1,4 +1,5 @@
-using System.Reflection;
+using System;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -32,5 +33,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: CLSCompliant(true)]
 [assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: InternalsVisibleTo("AutoRest.Generator.AzureResourceSchema.Tests")]
diff --git a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/ResourceSchema.cs b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/ResourceSchema.cs
new file mode 100644
index 0000000000000..b13224550c1cd
--- /dev/null
+++ b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/ResourceSchema.cs
@@ -0,0 +1,139 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.Rest.Generator.AzureResourceSchema
+{
+    /// <summary>
+    /// An object representing an Azure Resource Schema. It is important to note that an Azure
+    /// resource schema is actually not a valid JSON schema by itself. It is part of the
+    /// deploymentTemplate.json schema.
+    /// </summary>
+    public class ResourceSchema
+    {
+        private IDictionary<string, JsonSchema> resourceDefinitions = new Dictionary<string,JsonSchema>();
+        private IDictionary<string, JsonSchema> definitions = new Dictionary<string, JsonSchema>();
+
+        /// <summary>
+        /// The id metadata that uniquely identifies this schema. Usually this will be the URL to
+        /// the permanent location of this schema in schema.management.azure.com/schemas/.
+        /// </summary>
+        public string Id { get; set; }
+
+        /// <summary>
+        /// The JSON schema metadata url that points to the schema that can be used to validate
+        /// this schema.
+        /// </summary>
+        public string Schema { get; set; }
+
+        /// <summary>
+        /// The title metadata for this schema.
+        /// </summary>
+        public string Title { get; set; }
+
+        /// <summary>
+        /// The description metadata that describes this schema.
+        /// </summary>
+        public string Description { get; set; }
+
+        /// <summary>
+        /// The named JSON schemas that define the resources of this resource schema.
+        /// </summary>
+        public IDictionary<string, JsonSchema> ResourceDefinitions
+        {
+            get { return resourceDefinitions; }
+        }
+
+        /// <summary>
+        /// The named reusable JSON schemas that the resource definitions reference. These
+        /// definitions can also reference each other or themselves.
+        /// </summary>
+        public IDictionary<string,JsonSchema> Definitions
+        {
+            get { return definitions; }
+        }
+
+        /// <summary>
+        /// Search this ResourceSchema for a resource definition that has the provided type.
+        /// </summary>
+        /// <param name="resourceType">The resource type to look for in this ResourceSchema.</param>
+        /// <returns></returns>
+        public JsonSchema GetResourceDefinitionByResourceType(string resourceType)
+        {
+            if (string.IsNullOrWhiteSpace(resourceType))
+            {
+                throw new ArgumentException("resourceType cannot be null or whitespace.", "resourceType");
+            }
+
+            JsonSchema result = null;
+
+            if (resourceDefinitions != null && resourceDefinitions.Count > 0)
+            {
+                foreach(JsonSchema resourceDefinition in resourceDefinitions.Values)
+                {
+                    if (resourceDefinition.ResourceType == resourceType)
+                    {
+                        result = resourceDefinition;
+                        break;
+                    }
+                }
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Add the provided resource definition JSON schema to this resourceh schema.
+        /// </summary>
+        /// <param name="resourceName">The name of the resource definition.</param>
+        /// <param name="resourceDefinition">The JSON schema that describes the resource.</param>
+        public ResourceSchema AddResourceDefinition(string resourceName, JsonSchema resourceDefinition)
+        {
+            if (string.IsNullOrWhiteSpace(resourceName))
+            {
+                throw new ArgumentException("resourceName cannot be null or whitespace", "resourceName");
+            }
+            if (resourceDefinition == null)
+            {
+                throw new ArgumentNullException("resourceDefinition");
+            }
+
+            if (resourceDefinitions.ContainsKey(resourceName))
+            {
+                throw new ArgumentException("A resource definition for \"" + resourceName + "\" already exists in this resource schema.", "resourceName");
+            }
+
+            resourceDefinitions.Add(resourceName, resourceDefinition);
+
+            return this;
+        }
+
+        /// <summary>
+        /// Add the provided definition JSON schema to this resourceh schema.
+        /// </summary>
+        /// <param name="definitionName">The name of the resource definition.</param>
+        /// <param name="definition">The JSON schema that describes the resource.</param>
+        public ResourceSchema AddDefinition(string definitionName, JsonSchema definition)
+        {
+            if (string.IsNullOrWhiteSpace(definitionName))
+            {
+                throw new ArgumentException("definitionName cannot be null or whitespace", "definitionName");
+            }
+            if (definition == null)
+            {
+                throw new ArgumentNullException("definition");
+            }
+
+            if (definitions.ContainsKey(definitionName))
+            {
+                throw new ArgumentException("A definition for \"" + definitionName + "\" already exists in this resource schema.", "definitionName");
+            }
+
+            definitions.Add(definitionName, definition);
+
+            return this;
+        }
+    }
+}
diff --git a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/ResourceSchemaParser.cs b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/ResourceSchemaParser.cs
new file mode 100644
index 0000000000000..28abf47ca8657
--- /dev/null
+++ b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/ResourceSchemaParser.cs
@@ -0,0 +1,424 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using Microsoft.Rest.Generator.ClientModel;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.Linq;
+
+namespace Microsoft.Rest.Generator.AzureResourceSchema
+{
+    /// <summary>
+    /// The ResourceSchemaParser class is responsible for converting a ServiceClient object into a
+    /// ResourceSchemaModel.
+    /// </summary>
+    public static class ResourceSchemaParser
+    {
+        private const string resourceMethodPrefix = "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/";
+
+        /// <summary>
+        /// Parse a ResourceSchemaModel from the provided ServiceClient.
+        /// </summary>
+        /// <param name="serviceClient"></param>
+        /// <returns></returns>
+        public static IDictionary<string,ResourceSchema> Parse(ServiceClient serviceClient)
+        {
+            if (serviceClient == null)
+            {
+                throw new ArgumentNullException("serviceClient");
+            }
+
+            IDictionary<string,ResourceSchema> result = new Dictionary<string,ResourceSchema>();
+            
+            List<Method> createResourceMethods = new List<Method>();
+            foreach (Method method in serviceClient.Methods)
+            {
+                if (IsCreateResourceMethod(method))
+                {
+                    createResourceMethods.Add(method);
+                }
+            }
+
+            string apiVersion = serviceClient.ApiVersion;
+            
+            foreach (Method createResourceMethod in createResourceMethods)
+            {
+                JsonSchema resourceDefinition = new JsonSchema();
+                resourceDefinition.JsonType = "object";
+
+                string afterPrefix = createResourceMethod.Url.Substring(resourceMethodPrefix.Length);
+                int forwardSlashIndexAfterProvider = afterPrefix.IndexOf('/');
+                string resourceProvider = afterPrefix.Substring(0, forwardSlashIndexAfterProvider);
+
+                ResourceSchema resourceSchema;
+                if (!result.ContainsKey(resourceProvider))
+                {
+                    resourceSchema = new ResourceSchema();
+
+                    if (apiVersion != null)
+                    {
+                        resourceSchema.Id = string.Format(CultureInfo.InvariantCulture, "http://schema.management.azure.com/schemas/{0}/{1}.json#", apiVersion, resourceProvider);
+                    }
+
+                    resourceSchema.Title = resourceProvider;
+                    resourceSchema.Description = resourceProvider.Replace('.', ' ') + " Resource Types";
+                    resourceSchema.Schema = "http://json-schema.org/draft-04/schema#";
+
+                    result.Add(resourceProvider, resourceSchema);
+                }
+                else
+                {
+                    resourceSchema = result[resourceProvider];
+                }
+
+                string methodUrlPathAfterProvider = afterPrefix.Substring(forwardSlashIndexAfterProvider + 1);
+                string resourceType = GetResourceType(resourceProvider, methodUrlPathAfterProvider);
+
+                resourceDefinition.AddProperty("type", new JsonSchema()
+                    {
+                        JsonType = "string"
+                    }
+                    .AddEnum(resourceType));
+
+                if (!string.IsNullOrWhiteSpace(apiVersion))
+                {
+                    resourceDefinition.AddProperty("apiVersion", new JsonSchema()
+                        {
+                            JsonType = "string"
+                        }
+                        .AddEnum(apiVersion));
+                }
+
+                CompositeType body = createResourceMethod.Body.Type as CompositeType;
+                Debug.Assert(body != null, "The create resource method's body must be a CompositeType and cannot be null.");
+                if (body != null)
+                {
+                    foreach (Property property in body.Properties)
+                    {
+                        JsonSchema propertyDefinition = ParseProperty(property, resourceSchema.Definitions);
+                        if (propertyDefinition != null)
+                        {
+                            resourceDefinition.AddProperty(property.Name, propertyDefinition, property.IsRequired);
+                        }
+                    }
+                }
+
+                resourceDefinition.Description = resourceType;
+
+                foreach (string standardPropertyName in new string[] { "properties", "apiVersion", "type" })
+                {
+                    if (resourceDefinition.Properties.ContainsKey(standardPropertyName))
+                    {
+                        if (resourceDefinition.Required == null)
+                        {
+                            resourceDefinition.AddRequired(standardPropertyName);
+                        }
+                        else
+                        {
+                            resourceDefinition.Required.Insert(0, standardPropertyName);
+                        }
+                    }
+                }
+
+                string resourcePropertyName = resourceType.Replace('/', '_');
+                Debug.Assert(!resourceSchema.ResourceDefinitions.ContainsKey(resourcePropertyName));
+                resourceSchema.AddResourceDefinition(resourcePropertyName, resourceDefinition);
+            }
+
+            // This loop adds child resource schemas to their parent resource schemas. We can't do
+            // this until we're done adding all resources as top level resources, though, because
+            // it's possible that we will parse a child resource before we parse the parent
+            // resource.
+            foreach (ResourceSchema resourceSchema in result.Values)
+            {
+                // By iterating over the reverse order of the defined resource definitions, I'm
+                // counting on the resource definitions being in sorted order. That way I'm
+                // guaranteed to visit child resource definitions before I visit their parent
+                // resource definitions. By doing this, I've guaranteed that grandchildren resource
+                // definitions will be added to their grandparent (and beyond) ancestor
+                // resource definitions.
+                foreach (string resourcePropertyName in resourceSchema.ResourceDefinitions.Keys.Reverse())
+                {
+                    JsonSchema resourceDefinition = resourceSchema.ResourceDefinitions[resourcePropertyName];
+
+                    string resourceType = resourceDefinition.ResourceType;
+                    int lastSlashIndex = resourceType.LastIndexOf('/');
+                    string parentResourceType = resourceType.Substring(0, lastSlashIndex);
+                    JsonSchema parentResourceDefinition = resourceSchema.GetResourceDefinitionByResourceType(parentResourceType);
+                    if (parentResourceDefinition != null)
+                    {
+                        string childResourceType = resourceType.Substring(lastSlashIndex + 1);
+
+                        JsonSchema childResourceDefinition = resourceDefinition.Clone();
+                        childResourceDefinition.ResourceType = childResourceType;
+                        string childResourceDefinitionPropertyName = resourcePropertyName + "_childResource";
+                        resourceSchema.AddDefinition(childResourceDefinitionPropertyName, childResourceDefinition);
+
+                        parentResourceDefinition.AddResource(new JsonSchema()
+                        {
+                            Ref = "#/definitions/" + childResourceDefinitionPropertyName,
+                        });
+                    }
+                }
+            }
+
+            return result;
+        }
+
+        private static JsonSchema ParseProperty(Property property, IDictionary<string, JsonSchema> definitionMap)
+        {
+            JsonSchema propertyDefinition = null;
+
+            if (!property.IsReadOnly)
+            {
+                propertyDefinition = new JsonSchema();
+
+                IType propertyType = property.Type;
+
+                CompositeType compositeType = propertyType as CompositeType;
+                if (compositeType != null)
+                {
+                    propertyDefinition = ParseCompositeType(compositeType, definitionMap);
+                    propertyDefinition.Description = property.Documentation;
+                }
+                else
+                {
+                    DictionaryType dictionaryType = propertyType as DictionaryType;
+                    if (dictionaryType != null)
+                    {
+                        propertyDefinition.JsonType = "object";
+                        propertyDefinition.Description = property.Documentation;
+
+                        PrimaryType dictionaryPrimaryType = dictionaryType.ValueType as PrimaryType;
+                        if (dictionaryPrimaryType != null)
+                        {
+                            propertyDefinition.AdditionalProperties = ParsePrimaryType(dictionaryPrimaryType);
+                        }
+                        else
+                        {
+                            CompositeType dictionaryCompositeType = dictionaryType.ValueType as CompositeType;
+                            if (dictionaryCompositeType != null)
+                            {
+                                propertyDefinition.AdditionalProperties = ParseCompositeType(dictionaryCompositeType, definitionMap);
+                            }
+                            else
+                            {
+                                Debug.Assert(false, "Unrecognized DictionaryType.ValueType: " + dictionaryType.ValueType.GetType());
+                            }
+                        }
+                    }
+                    else
+                    {
+                        EnumType enumType = propertyType as EnumType;
+                        if (enumType != null)
+                        {
+                            propertyDefinition = ParseEnumType(enumType);
+                            propertyDefinition.Description = property.Documentation;
+                        }
+                        else
+                        {
+                            PrimaryType primaryType = propertyType as PrimaryType;
+                            if (primaryType != null)
+                            {
+                                propertyDefinition = ParsePrimaryType(primaryType);
+                                propertyDefinition.Description = property.Documentation;
+
+                                if (property.DefaultValue != null)
+                                {
+                                    propertyDefinition.AddEnum(property.DefaultValue);
+                                }
+                            }
+                            else
+                            {
+                                SequenceType sequenceType = propertyType as SequenceType;
+                                if (sequenceType != null)
+                                {
+                                    propertyDefinition.JsonType = "array";
+                                    propertyDefinition.Description = property.Documentation;
+
+                                    IType sequenceElementType = sequenceType.ElementType;
+
+                                    CompositeType sequenceCompositeType = sequenceElementType as CompositeType;
+                                    if (sequenceCompositeType != null)
+                                    {
+                                        propertyDefinition.Items = ParseCompositeType(sequenceCompositeType, definitionMap);
+                                    }
+                                    else
+                                    {
+                                        PrimaryType sequencePrimaryType = sequenceElementType as PrimaryType;
+                                        if (sequencePrimaryType != null)
+                                        {
+                                            propertyDefinition.Items = ParsePrimaryType(sequencePrimaryType);
+                                        }
+                                        else
+                                        {
+                                            EnumType sequenceEnumType = sequenceElementType as EnumType;
+                                            if (sequenceEnumType != null)
+                                            {
+                                                propertyDefinition = ParseEnumType(sequenceEnumType);
+                                            }
+                                            else
+                                            {
+                                                Debug.Assert(false, "Unrecognized SequenceType.ElementType: " + sequenceType.ElementType.GetType());
+                                            }
+                                        }
+                                    }       
+                                }
+                                else
+                                {
+                                    Debug.Assert(false, "Unrecognized property type: " + propertyType.GetType());
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            return propertyDefinition;
+        }
+
+        private static JsonSchema ParseCompositeType(CompositeType compositeType, IDictionary<string, JsonSchema> definitionMap)
+        {
+            JsonSchema result = new JsonSchema();
+
+            string definitionName = compositeType.Name;
+
+            if (!definitionMap.ContainsKey(definitionName))
+            {
+                JsonSchema definition = new JsonSchema();
+                definitionMap.Add(definitionName, definition);
+
+                definition.JsonType = "object";
+
+                foreach (Property subProperty in compositeType.ComposedProperties)
+                {
+                    JsonSchema subPropertyDefinition = ParseProperty(subProperty, definitionMap);
+                    if (subPropertyDefinition != null)
+                    {
+                        definition.AddProperty(subProperty.Name, subPropertyDefinition, subProperty.IsRequired);
+                    }
+                }
+
+                definition.Description = compositeType.Documentation;
+            }
+
+            result.Ref = "#/definitions/" + definitionName;
+
+            return result;
+        }
+
+        private static JsonSchema ParseEnumType(EnumType enumType)
+        {
+            JsonSchema result = new JsonSchema();
+
+            result.JsonType = "string";
+            foreach (EnumValue enumValue in enumType.Values)
+            {
+                result.AddEnum(enumValue.Name);
+            }
+
+            return result;
+        }
+
+        private static JsonSchema ParsePrimaryType(PrimaryType primaryType)
+        {
+            JsonSchema result = new JsonSchema();
+
+            switch (primaryType.Type)
+            {
+                case KnownPrimaryType.Boolean:
+                    result.JsonType = "boolean";
+                    break;
+
+                case KnownPrimaryType.Int:
+                case KnownPrimaryType.Long:
+                    result.JsonType = "integer";
+                    break;
+
+                case KnownPrimaryType.Double:
+                    result.JsonType = "number";
+                    break;
+
+                case KnownPrimaryType.Object:
+                    result.JsonType = "object";
+                    break;
+
+                case KnownPrimaryType.DateTime:
+                case KnownPrimaryType.String:
+                    result.JsonType = "string";
+                    break;
+
+                default:
+                    Debug.Assert(false, "Unrecognized known property type: " + primaryType.Type);
+                    break;
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Determine whether the provided method object represents an Azure REST API that would
+        /// create an Azure resource.
+        /// </summary>
+        /// <param name="method"></param>
+        /// <returns></returns>
+        internal static bool IsCreateResourceMethod(Method method)
+        {
+            if (method == null)
+            {
+                throw new ArgumentNullException("method");
+            }
+
+            bool result = false;
+
+            if (!string.IsNullOrWhiteSpace(method.Url) &&
+                method.Url.StartsWith(resourceMethodPrefix, StringComparison.Ordinal) &&
+                method.Url.EndsWith("}", StringComparison.Ordinal) && // Only methods that end with the resource's name ({name}) are resource create methods.
+                method.HttpMethod == HttpMethod.Put &&
+                method.ReturnType.Body != null)
+            {
+                CompositeType body = method.ReturnType.Body as CompositeType;
+                if (body != null)
+                {
+                    Dictionary<string, object> bodyComposedExtensions = body.ComposedExtensions;
+                    const string azureResource = "x-ms-azure-resource";
+                    result = bodyComposedExtensions.ContainsKey(azureResource) ? (bool)bodyComposedExtensions[azureResource] : false;
+                }
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Get the resource type from the provided resourceProvider and the portion of the method
+        /// URL path that comes after the resourceProvider section.
+        /// </summary>
+        /// <param name="resourceProvider"></param>
+        /// <param name="methodUrlPathAfterProvider"></param>
+        /// <returns></returns>
+        internal static string GetResourceType(string resourceProvider, string methodUrlPathAfterProvider)
+        {
+            if (string.IsNullOrWhiteSpace(resourceProvider))
+            {
+                throw new ArgumentException("resourceProvider cannot be null or whitespace", "resourceProvider");
+            }
+            if (string.IsNullOrWhiteSpace(methodUrlPathAfterProvider))
+            {
+                throw new ArgumentException("methodUrlPathAfterProvider cannot be null or whitespace", "methodUrlPathAfterProvider");
+            }
+
+            List<string> resourceTypeParts = new List<string>();
+            resourceTypeParts.Add(resourceProvider);
+
+            string[] pathSegments = methodUrlPathAfterProvider.Split(new char[] { '/' });
+            for (int i = 0; i < pathSegments.Length; i += 2)
+            {
+                resourceTypeParts.Add(pathSegments[i]);
+            }
+
+            return string.Join("/", resourceTypeParts);
+        }
+    }
+}
diff --git a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/ResourceSchemaWriter.cs b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/ResourceSchemaWriter.cs
new file mode 100644
index 0000000000000..0a36309d0ac4f
--- /dev/null
+++ b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/ResourceSchemaWriter.cs
@@ -0,0 +1,212 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+namespace Microsoft.Rest.Generator.AzureResourceSchema
+{
+    public static class ResourceSchemaWriter
+    {
+        public static void Write(TextWriter writer, ResourceSchema resourceSchema)
+        {
+            if (writer == null)
+            {
+                throw new ArgumentNullException("writer");
+            }
+            if (resourceSchema == null)
+            {
+                throw new ArgumentNullException("resourceSchema");
+            }
+
+            using (JsonTextWriter jsonWriter = new JsonTextWriter(writer))
+            {
+                jsonWriter.Formatting = Formatting.Indented;
+                jsonWriter.Indentation = 2;
+                jsonWriter.IndentChar = ' ';
+                jsonWriter.QuoteChar = '\"';
+
+                Write(jsonWriter, resourceSchema);
+            }
+        }
+
+        internal static void Write(JsonTextWriter writer, ResourceSchema resourceSchema)
+        {
+            if (writer == null)
+            {
+                throw new ArgumentNullException("writer");
+            }
+            if (resourceSchema == null)
+            {
+                throw new ArgumentNullException("resourceSchema");
+            }
+
+            writer.WriteStartObject();
+
+            WriteProperty(writer, "id", resourceSchema.Id);
+            WriteProperty(writer, "$schema", resourceSchema.Schema);
+            WriteProperty(writer, "title", resourceSchema.Title);
+            WriteProperty(writer, "description", resourceSchema.Description);
+
+            WriteDefinitionMap(writer, "resourceDefinitions", resourceSchema.ResourceDefinitions, sortDefinitions: true);
+
+            WriteDefinitionMap(writer, "definitions", resourceSchema.Definitions, sortDefinitions: true);
+
+            writer.WriteEndObject();
+        }
+
+        private static void WriteDefinitionMap(JsonTextWriter writer, string definitionMapName, IDictionary<string,JsonSchema> definitionMap, bool sortDefinitions = false, bool addExpressionReferences = false)
+        {
+            if (definitionMap != null && definitionMap.Count > 0)
+            {
+                writer.WritePropertyName(definitionMapName);
+                writer.WriteStartObject();
+
+                IEnumerable<string> definitionNames = definitionMap.Keys;
+                if (sortDefinitions)
+                {
+                    definitionNames = definitionNames.OrderBy(key => key);
+                }
+
+                foreach (string definitionName in definitionNames)
+                {
+                    JsonSchema definition = definitionMap[definitionName];
+
+                    bool shouldAddExpressionReference = addExpressionReferences &&
+                                                        (definition.JsonType != "string" ||
+                                                            (definition.Enum != null &&
+                                                             definition.Enum.Count() > 0 &&
+                                                             definitionName != "type" &&
+                                                             definitionName != "apiVersion"));
+
+                    if (!shouldAddExpressionReference)
+                    {
+                        WriteDefinition(writer, definitionName, definition);
+                    }
+                    else
+                    {
+                        string definitionDescription = null;
+
+                        writer.WritePropertyName(definitionName);
+                        writer.WriteStartObject();
+
+                        writer.WritePropertyName("oneOf");
+                        writer.WriteStartArray();
+
+                        if (definition.Description != null)
+                        {
+                            definitionDescription = definition.Description;
+
+                            definition = definition.Clone();
+                            definition.Description = null;
+                        }
+                        WriteDefinition(writer, definition);
+
+                        WriteDefinition(writer, new JsonSchema()
+                        {
+                            Ref = "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+                        });
+
+                        writer.WriteEndArray();
+
+                        WriteProperty(writer, "description", definitionDescription);
+                        writer.WriteEndObject();
+                    }
+                }
+                writer.WriteEndObject();
+            }
+        }
+
+        internal static void WriteDefinition(JsonTextWriter writer, string resourceName, JsonSchema definition)
+        {
+            if (definition != null)
+            {
+                writer.WritePropertyName(resourceName);
+                WriteDefinition(writer, definition);
+            }
+        }
+
+        private static void WriteDefinition(JsonTextWriter writer, JsonSchema definition)
+        {
+            if (definition == null)
+            {
+                throw new ArgumentNullException("definition");
+            }
+
+            writer.WriteStartObject();
+
+            WriteProperty(writer, "type", definition.JsonType);
+            WriteStringArray(writer, "enum", definition.Enum);
+            WriteProperty(writer, "$ref", definition.Ref);
+            WriteDefinition(writer, "items", definition.Items);
+            WriteDefinition(writer, "additionalProperties", definition.AdditionalProperties);
+            WriteDefinitionMap(writer, "properties", definition.Properties, addExpressionReferences: true);
+            WriteDefinitionArray(writer, "resources", definition.Resources);
+            WriteStringArray(writer, "required", definition.Required);
+            WriteProperty(writer, "description", definition.Description);
+
+            writer.WriteEndObject();
+        }
+
+        private static void WriteStringArray(JsonTextWriter writer, string arrayName, IEnumerable<string> arrayValues)
+        {
+            if (arrayValues != null && arrayValues.Count() > 0)
+            {
+                writer.WritePropertyName(arrayName);
+                writer.WriteStartArray();
+                foreach (string arrayValue in arrayValues)
+                {
+                    writer.WriteValue(arrayValue);
+                }
+                writer.WriteEndArray();
+            }
+        }
+
+        private static void WriteDefinitionArray(JsonTextWriter writer, string arrayName, IEnumerable<JsonSchema> arrayDefinitions)
+        {
+            if (arrayDefinitions != null && arrayDefinitions.Count() > 0)
+            {
+                writer.WritePropertyName(arrayName);
+                writer.WriteStartObject();
+
+                WriteProperty(writer, "type", "array");
+
+                writer.WritePropertyName("items");
+                writer.WriteStartObject();
+
+                writer.WritePropertyName("oneOf");
+                writer.WriteStartArray();
+                foreach (JsonSchema definition in arrayDefinitions)
+                {
+                    WriteDefinition(writer, definition);
+                }
+                writer.WriteEndArray();
+
+                writer.WriteEndObject();
+
+                writer.WriteEndObject();
+            }
+        }
+
+        internal static void WriteProperty(JsonTextWriter writer, string propertyName, string propertyValue)
+        {
+            if (writer == null)
+            {
+                throw new ArgumentNullException("writer");
+            }
+            if (string.IsNullOrWhiteSpace(propertyName))
+            {
+                throw new ArgumentException("propertyName cannot be null or whitespace", "propertyName");
+            }
+
+            if (!string.IsNullOrWhiteSpace(propertyValue))
+            {
+                writer.WritePropertyName(propertyName);
+                writer.WriteValue(propertyValue);
+            }
+        }
+    }
+}
diff --git a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/packages.config b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/packages.config
new file mode 100644
index 0000000000000..505e58836baea
--- /dev/null
+++ b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
+</packages>
\ No newline at end of file
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/AcceptanceTests.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/AcceptanceTests.cs
index d04c712fd1c96..6c254399697c3 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/AcceptanceTests.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/AcceptanceTests.cs
@@ -274,6 +274,10 @@ public void LroSadPathTests()
                 Assert.Equal("Error from the server", exception.Body.Message);
                 Assert.NotNull(exception.Request);
                 Assert.NotNull(exception.Response);
+                exception =
+                    Assert.Throws<CloudException>(() => client.LROSADs.PutNonRetry201Creating400InvalidJson(new Product { Location = "West US" }));
+                Assert.Null(exception.Body);
+                Assert.Equal("Long running operation failed with status 'BadRequest'.", exception.Message);
                 exception =
                     Assert.Throws<CloudException>(
                         () => client.LROSADs.PutAsyncRelativeRetry400(new Product {Location = "West US"}));
@@ -527,8 +531,7 @@ public void AzureODataTests()
                     Top = 10,
                     OrderBy = "id"
                 };
-                var filterString = Uri.EscapeDataString("id gt 5 and name eq 'foo'");
-                Assert.Equal(string.Format("$filter={0}&$orderby=id&$top=10", filterString), filter.ToString());
+                Assert.Equal("$filter=id gt 5 and name eq 'foo'&$orderby=id&$top=10", filter.ToString());
                 client.Odata.GetWithFilter(filter);
             }
         }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureBodyDuration/DurationOperations.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureBodyDuration/DurationOperations.cs
index 1bb297f05c5be..0a81d725f40a0 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureBodyDuration/DurationOperations.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureBodyDuration/DurationOperations.cs
@@ -262,12 +262,9 @@ public async Task<AzureOperationResponse> PutPositiveDurationWithHttpMessagesAsy
 
             // Serialize Request
             string _requestContent = null;
-            if(durationBody != null)
-            {
-                _requestContent = SafeJsonConvert.SerializeObject(durationBody, this.Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
+            _requestContent = SafeJsonConvert.SerializeObject(durationBody, this.Client.SerializationSettings);
+            _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+            _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             // Set Credentials
             if (this.Client.Credentials != null)
             {
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureCompositeModelClient/Models/Basic.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureCompositeModelClient/Models/Basic.cs
index e30aad46136d3..a3f115e527736 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureCompositeModelClient/Models/Basic.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureCompositeModelClient/Models/Basic.cs
@@ -44,7 +44,8 @@ public Basic(int? id = default(int?), string name = default(string), string colo
         public string Name { get; set; }
 
         /// <summary>
-        /// Possible values include: 'cyan', 'Magenta', 'YELLOW', 'blacK'
+        /// Gets or sets possible values include: 'cyan', 'Magenta', 'YELLOW',
+        /// 'blacK'
         /// </summary>
         [JsonProperty(PropertyName = "color")]
         public string Color { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureCompositeModelClient/Models/CatalogArray.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureCompositeModelClient/Models/CatalogArray.cs
index 66c81ff69df2e..7d380e403bc71 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureCompositeModelClient/Models/CatalogArray.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureCompositeModelClient/Models/CatalogArray.cs
@@ -32,7 +32,7 @@ public CatalogArray(IList<Product> productArray = default(IList<Product>))
         }
 
         /// <summary>
-        /// Array of products
+        /// Gets or sets array of products
         /// </summary>
         [JsonProperty(PropertyName = "productArray")]
         public IList<Product> ProductArray { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureCompositeModelClient/Models/CatalogArrayOfDictionary.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureCompositeModelClient/Models/CatalogArrayOfDictionary.cs
index 893eaa5620e00..5f64fd7d8be66 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureCompositeModelClient/Models/CatalogArrayOfDictionary.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureCompositeModelClient/Models/CatalogArrayOfDictionary.cs
@@ -32,7 +32,7 @@ public CatalogArrayOfDictionary(IList<IDictionary<string, Product>> productArray
         }
 
         /// <summary>
-        /// Array of dictionary of products
+        /// Gets or sets array of dictionary of products
         /// </summary>
         [JsonProperty(PropertyName = "productArrayOfDictionary")]
         public IList<IDictionary<string, Product>> ProductArrayOfDictionary { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureCompositeModelClient/Models/CatalogDictionary.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureCompositeModelClient/Models/CatalogDictionary.cs
index fc5886801b627..f3b008a02d974 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureCompositeModelClient/Models/CatalogDictionary.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureCompositeModelClient/Models/CatalogDictionary.cs
@@ -32,7 +32,7 @@ public CatalogDictionary(IDictionary<string, Product> productDictionary = defaul
         }
 
         /// <summary>
-        /// Dictionary of products
+        /// Gets or sets dictionary of products
         /// </summary>
         [JsonProperty(PropertyName = "productDictionary")]
         public IDictionary<string, Product> ProductDictionary { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureCompositeModelClient/Models/CatalogDictionaryOfArray.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureCompositeModelClient/Models/CatalogDictionaryOfArray.cs
index 08422bdccb508..1ce6d5bda5059 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureCompositeModelClient/Models/CatalogDictionaryOfArray.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureCompositeModelClient/Models/CatalogDictionaryOfArray.cs
@@ -32,7 +32,7 @@ public CatalogDictionaryOfArray(IDictionary<string, IList<Product>> productDicti
         }
 
         /// <summary>
-        /// Dictionary of Array of product
+        /// Gets or sets dictionary of Array of product
         /// </summary>
         [JsonProperty(PropertyName = "productDictionaryOfArray")]
         public IDictionary<string, IList<Product>> ProductDictionaryOfArray { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureCompositeModelClient/Models/Product.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureCompositeModelClient/Models/Product.cs
index f09206d4572f6..6490bfe15f7b7 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureCompositeModelClient/Models/Product.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureCompositeModelClient/Models/Product.cs
@@ -39,33 +39,34 @@ public Product(string productId = default(string), string description = default(
         }
 
         /// <summary>
-        /// Unique identifier representing a specific product for a given
-        /// latitude &amp; longitude. For example, uberX in San Francisco
-        /// will have a different product_id than uberX in Los Angeles.
+        /// Gets or sets unique identifier representing a specific product for
+        /// a given latitude &amp; longitude. For example, uberX in San
+        /// Francisco will have a different product_id than uberX in Los
+        /// Angeles.
         /// </summary>
         [JsonProperty(PropertyName = "product_id")]
         public string ProductId { get; set; }
 
         /// <summary>
-        /// Description of product.
+        /// Gets or sets description of product.
         /// </summary>
         [JsonProperty(PropertyName = "description")]
         public string Description { get; set; }
 
         /// <summary>
-        /// Display name of product.
+        /// Gets or sets display name of product.
         /// </summary>
         [JsonProperty(PropertyName = "display_name")]
         public string DisplayName { get; set; }
 
         /// <summary>
-        /// Capacity of product. For example, 4 people.
+        /// Gets or sets capacity of product. For example, 4 people.
         /// </summary>
         [JsonProperty(PropertyName = "capacity")]
         public string Capacity { get; set; }
 
         /// <summary>
-        /// Image URL representing the product.
+        /// Gets or sets image URL representing the product.
         /// </summary>
         [JsonProperty(PropertyName = "image")]
         public string Image { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureParameterGrouping/Models/FirstParameterGroup.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureParameterGrouping/Models/FirstParameterGroup.cs
index 0b05e6b45209b..4e2fe34867c21 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureParameterGrouping/Models/FirstParameterGroup.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureParameterGrouping/Models/FirstParameterGroup.cs
@@ -17,7 +17,9 @@ namespace Fixtures.Azure.AcceptanceTestsAzureParameterGrouping.Models
     using Microsoft.Rest.Azure;
 
     /// <summary>
-    /// Additional parameters for the postMultiParamGroups operation.
+    /// Additional parameters for a set of operations, such as:
+    /// parameterGrouping_postMultiParamGroups,
+    /// parameterGrouping_postSharedParameterGroupObject.
     /// </summary>
     public partial class FirstParameterGroup
     {
@@ -41,7 +43,7 @@ public FirstParameterGroup(string headerOne = default(string), int? queryOne = d
         public string HeaderOne { get; set; }
 
         /// <summary>
-        /// Query parameter with default
+        /// Gets or sets query parameter with default
         /// </summary>
         [JsonProperty(PropertyName = "")]
         public int? QueryOne { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureParameterGrouping/Models/ParameterGroupingPostMultiParamGroupsSecondParamGroup.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureParameterGrouping/Models/ParameterGroupingPostMultiParamGroupsSecondParamGroup.cs
index b62aab87f7c4e..6d81fef18781c 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureParameterGrouping/Models/ParameterGroupingPostMultiParamGroupsSecondParamGroup.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureParameterGrouping/Models/ParameterGroupingPostMultiParamGroupsSecondParamGroup.cs
@@ -17,7 +17,8 @@ namespace Fixtures.Azure.AcceptanceTestsAzureParameterGrouping.Models
     using Microsoft.Rest.Azure;
 
     /// <summary>
-    /// Additional parameters for the postMultiParamGroups operation.
+    /// Additional parameters for the parameterGrouping_postMultiParamGroups
+    /// operation.
     /// </summary>
     public partial class ParameterGroupingPostMultiParamGroupsSecondParamGroup
     {
@@ -43,7 +44,7 @@ public ParameterGroupingPostMultiParamGroupsSecondParamGroup(string headerTwo =
         public string HeaderTwo { get; set; }
 
         /// <summary>
-        /// Query parameter with default
+        /// Gets or sets query parameter with default
         /// </summary>
         [JsonProperty(PropertyName = "")]
         public int? QueryTwo { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureParameterGrouping/Models/ParameterGroupingPostOptionalParameters.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureParameterGrouping/Models/ParameterGroupingPostOptionalParameters.cs
index ad34300acc32a..3a3dcc12562a8 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureParameterGrouping/Models/ParameterGroupingPostOptionalParameters.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureParameterGrouping/Models/ParameterGroupingPostOptionalParameters.cs
@@ -17,7 +17,7 @@ namespace Fixtures.Azure.AcceptanceTestsAzureParameterGrouping.Models
     using Microsoft.Rest.Azure;
 
     /// <summary>
-    /// Additional parameters for the postOptional operation.
+    /// Additional parameters for the parameterGrouping_postOptional operation.
     /// </summary>
     public partial class ParameterGroupingPostOptionalParameters
     {
@@ -43,7 +43,7 @@ public ParameterGroupingPostOptionalParameters(string customHeader = default(str
         public string CustomHeader { get; set; }
 
         /// <summary>
-        /// Query parameter with default
+        /// Gets or sets query parameter with default
         /// </summary>
         [JsonProperty(PropertyName = "")]
         public int? Query { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureParameterGrouping/Models/ParameterGroupingPostRequiredParameters.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureParameterGrouping/Models/ParameterGroupingPostRequiredParameters.cs
index 65b9f511989af..4251abe07005e 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureParameterGrouping/Models/ParameterGroupingPostRequiredParameters.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureParameterGrouping/Models/ParameterGroupingPostRequiredParameters.cs
@@ -17,7 +17,7 @@ namespace Fixtures.Azure.AcceptanceTestsAzureParameterGrouping.Models
     using Microsoft.Rest.Azure;
 
     /// <summary>
-    /// Additional parameters for the postRequired operation.
+    /// Additional parameters for the parameterGrouping_postRequired operation.
     /// </summary>
     public partial class ParameterGroupingPostRequiredParameters
     {
@@ -50,13 +50,13 @@ public ParameterGroupingPostRequiredParameters(int body, string path, string cus
         public string CustomHeader { get; set; }
 
         /// <summary>
-        /// Query parameter with default
+        /// Gets or sets query parameter with default
         /// </summary>
         [JsonProperty(PropertyName = "")]
         public int? Query { get; set; }
 
         /// <summary>
-        /// Path parameter
+        /// Gets or sets path parameter
         /// </summary>
         [JsonProperty(PropertyName = "")]
         public string Path { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureParameterGrouping/ParameterGroupingOperations.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureParameterGrouping/ParameterGroupingOperations.cs
index 7fe382cfcdee6..9a2bf74564bac 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureParameterGrouping/ParameterGroupingOperations.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureParameterGrouping/ParameterGroupingOperations.cs
@@ -161,12 +161,9 @@ public async Task<AzureOperationResponse> PostRequiredWithHttpMessagesAsync(Para
 
             // Serialize Request
             string _requestContent = null;
-            if(body != null)
-            {
-                _requestContent = SafeJsonConvert.SerializeObject(body, this.Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
+            _requestContent = SafeJsonConvert.SerializeObject(body, this.Client.SerializationSettings);
+            _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+            _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             // Set Credentials
             if (this.Client.Credentials != null)
             {
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureResource/Models/Resource.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureResource/Models/Resource.cs
index 8e0914cc4e682..61d81a2722b2c 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureResource/Models/Resource.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureResource/Models/Resource.cs
@@ -36,13 +36,13 @@ public Resource(string id = default(string), string type = default(string), IDic
         }
 
         /// <summary>
-        /// Resource Id
+        /// Gets resource Id
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public string Id { get; private set; }
 
         /// <summary>
-        /// Resource Type
+        /// Gets resource Type
         /// </summary>
         [JsonProperty(PropertyName = "type")]
         public string Type { get; private set; }
@@ -53,13 +53,13 @@ public Resource(string id = default(string), string type = default(string), IDic
         public IDictionary<string, string> Tags { get; set; }
 
         /// <summary>
-        /// Resource Location
+        /// Gets or sets resource Location
         /// </summary>
         [JsonProperty(PropertyName = "location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Resource Name
+        /// Gets resource Name
         /// </summary>
         [JsonProperty(PropertyName = "name")]
         public string Name { get; private set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureSpecials/Models/HeaderCustomNamedRequestIdHeaders.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureSpecials/Models/HeaderCustomNamedRequestIdHeaders.cs
index d00b60f8390f2..4328e58dfa0ed 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureSpecials/Models/HeaderCustomNamedRequestIdHeaders.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureSpecials/Models/HeaderCustomNamedRequestIdHeaders.cs
@@ -37,7 +37,7 @@ public HeaderCustomNamedRequestIdHeaders(string fooRequestId = default(string))
         }
 
         /// <summary>
-        /// Gets the foo-request-id.
+        /// Gets or sets gets the foo-request-id.
         /// </summary>
         [JsonProperty(PropertyName = "foo-request-id")]
         public string FooRequestId { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/ILROSADsOperations.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/ILROSADsOperations.cs
index 60ac71a045d3e..5717f7f8f64e8 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/ILROSADsOperations.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/ILROSADsOperations.cs
@@ -79,6 +79,34 @@ public partial interface ILROSADsOperations
         /// </param>
         Task<AzureOperationResponse<Product>> BeginPutNonRetry201Creating400WithHttpMessagesAsync(Product product = default(Product), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
+        /// Long running put request, service returns a Product with
+        /// 'ProvisioningState' = 'Creating' and 201 response code
+        /// </summary>
+        /// <param name='product'>
+        /// Product to put
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        Task<AzureOperationResponse<Product>> PutNonRetry201Creating400InvalidJsonWithHttpMessagesAsync(Product product = default(Product), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Long running put request, service returns a Product with
+        /// 'ProvisioningState' = 'Creating' and 201 response code
+        /// </summary>
+        /// <param name='product'>
+        /// Product to put
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        Task<AzureOperationResponse<Product>> BeginPutNonRetry201Creating400InvalidJsonWithHttpMessagesAsync(Product product = default(Product), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
         /// Long running put request, service returns a 200 with
         /// ProvisioningState=’Creating’. Poll the endpoint indicated in the
         /// Azure-AsyncOperation header for operation status
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/LROSADsOperations.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/LROSADsOperations.cs
index 7b0662de0c29e..cbd54f78112ae 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/LROSADsOperations.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/LROSADsOperations.cs
@@ -453,6 +453,209 @@ public async Task<AzureOperationResponse<Product>> BeginPutNonRetry201Creating40
             return _result;
         }
 
+        /// <summary>
+        /// Long running put request, service returns a Product with
+        /// 'ProvisioningState' = 'Creating' and 201 response code
+        /// </summary>
+        /// <param name='product'>
+        /// Product to put
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        public async Task<AzureOperationResponse<Product>> PutNonRetry201Creating400InvalidJsonWithHttpMessagesAsync(Product product = default(Product), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            // Send Request
+            AzureOperationResponse<Product> _response = await BeginPutNonRetry201Creating400InvalidJsonWithHttpMessagesAsync(
+                product, customHeaders, cancellationToken);
+            return await this.Client.GetPutOrPatchOperationResultAsync(_response,
+                customHeaders,
+                cancellationToken);
+        }
+
+        /// <summary>
+        /// Long running put request, service returns a Product with
+        /// 'ProvisioningState' = 'Creating' and 201 response code
+        /// </summary>
+        /// <param name='product'>
+        /// Product to put
+        /// </param>
+        /// <param name='customHeaders'>
+        /// Headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <return>
+        /// A response object containing the response body and response headers.
+        /// </return>
+        public async Task<AzureOperationResponse<Product>> BeginPutNonRetry201Creating400InvalidJsonWithHttpMessagesAsync(Product product = default(Product), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            // Tracing
+            bool _shouldTrace = ServiceClientTracing.IsEnabled;
+            string _invocationId = null;
+            if (_shouldTrace)
+            {
+                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
+                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
+                tracingParameters.Add("product", product);
+                tracingParameters.Add("cancellationToken", cancellationToken);
+                ServiceClientTracing.Enter(_invocationId, this, "BeginPutNonRetry201Creating400InvalidJson", tracingParameters);
+            }
+            // Construct URL
+            var _baseUrl = this.Client.BaseUri.AbsoluteUri;
+            var _url = new Uri(new Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "lro/nonretryerror/put/201/creating/400/invalidjson").ToString();
+            List<string> _queryParameters = new List<string>();
+            if (_queryParameters.Count > 0)
+            {
+                _url += "?" + string.Join("&", _queryParameters);
+            }
+            // Create HTTP transport objects
+            HttpRequestMessage _httpRequest = new HttpRequestMessage();
+            HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new HttpMethod("PUT");
+            _httpRequest.RequestUri = new Uri(_url);
+            // Set Headers
+            if (this.Client.GenerateClientRequestId != null && this.Client.GenerateClientRequestId.Value)
+            {
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", Guid.NewGuid().ToString());
+            }
+            if (this.Client.AcceptLanguage != null)
+            {
+                if (_httpRequest.Headers.Contains("accept-language"))
+                {
+                    _httpRequest.Headers.Remove("accept-language");
+                }
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.Client.AcceptLanguage);
+            }
+            if (customHeaders != null)
+            {
+                foreach(var _header in customHeaders)
+                {
+                    if (_httpRequest.Headers.Contains(_header.Key))
+                    {
+                        _httpRequest.Headers.Remove(_header.Key);
+                    }
+                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
+                }
+            }
+
+            // Serialize Request
+            string _requestContent = null;
+            if(product != null)
+            {
+                _requestContent = SafeJsonConvert.SerializeObject(product, this.Client.SerializationSettings);
+                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+            }
+            // Set Credentials
+            if (this.Client.Credentials != null)
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+                await this.Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            }
+            // Send Request
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
+            }
+            cancellationToken.ThrowIfCancellationRequested();
+            _httpResponse = await this.Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
+            }
+            HttpStatusCode _statusCode = _httpResponse.StatusCode;
+            cancellationToken.ThrowIfCancellationRequested();
+            string _responseContent = null;
+            if ((int)_statusCode != 200 && (int)_statusCode != 201)
+            {
+                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    CloudError _errorBody = SafeJsonConvert.DeserializeObject<CloudError>(_responseContent, this.Client.DeserializationSettings);
+                    if (_errorBody != null)
+                    {
+                        ex = new CloudException(_errorBody.Message);
+                        ex.Body = _errorBody;
+                    }
+                }
+                catch (JsonException)
+                {
+                    // Ignore the exception
+                }
+                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
+                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
+                if (_httpResponse.Headers.Contains("x-ms-request-id"))
+                {
+                    ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
+                }
+                if (_shouldTrace)
+                {
+                    ServiceClientTracing.Error(_invocationId, ex);
+                }
+                _httpRequest.Dispose();
+                if (_httpResponse != null)
+                {
+                    _httpResponse.Dispose();
+                }
+                throw ex;
+            }
+            // Create Result
+            var _result = new AzureOperationResponse<Product>();
+            _result.Request = _httpRequest;
+            _result.Response = _httpResponse;
+            if (_httpResponse.Headers.Contains("x-ms-request-id"))
+            {
+                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
+            }
+            // Deserialize Response
+            if ((int)_statusCode == 200)
+            {
+                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                try
+                {
+                    _result.Body = SafeJsonConvert.DeserializeObject<Product>(_responseContent, this.Client.DeserializationSettings);
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
+            // Deserialize Response
+            if ((int)_statusCode == 201)
+            {
+                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                try
+                {
+                    _result.Body = SafeJsonConvert.DeserializeObject<Product>(_responseContent, this.Client.DeserializationSettings);
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.Exit(_invocationId, _result);
+            }
+            return _result;
+        }
+
         /// <summary>
         /// Long running put request, service returns a 200 with
         /// ProvisioningState=’Creating’. Poll the endpoint indicated in the
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/LROSADsOperationsExtensions.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/LROSADsOperationsExtensions.cs
index 86b6c1b083fc9..dc7d177cbe402 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/LROSADsOperationsExtensions.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/LROSADsOperationsExtensions.cs
@@ -162,6 +162,78 @@ public static async Task<Product> BeginPutNonRetry201Creating400Async(this ILROS
                 }
             }
 
+            /// <summary>
+            /// Long running put request, service returns a Product with
+            /// 'ProvisioningState' = 'Creating' and 201 response code
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='product'>
+            /// Product to put
+            /// </param>
+            public static Product PutNonRetry201Creating400InvalidJson(this ILROSADsOperations operations, Product product = default(Product))
+            {
+                return Task.Factory.StartNew(s => ((ILROSADsOperations)s).PutNonRetry201Creating400InvalidJsonAsync(product), operations, CancellationToken.None, TaskCreationOptions.None, TaskScheduler.Default).Unwrap().GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Long running put request, service returns a Product with
+            /// 'ProvisioningState' = 'Creating' and 201 response code
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='product'>
+            /// Product to put
+            /// </param>
+            /// <param name='cancellationToken'>
+            /// The cancellation token.
+            /// </param>
+            public static async Task<Product> PutNonRetry201Creating400InvalidJsonAsync(this ILROSADsOperations operations, Product product = default(Product), CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.PutNonRetry201Creating400InvalidJsonWithHttpMessagesAsync(product, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
+            /// <summary>
+            /// Long running put request, service returns a Product with
+            /// 'ProvisioningState' = 'Creating' and 201 response code
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='product'>
+            /// Product to put
+            /// </param>
+            public static Product BeginPutNonRetry201Creating400InvalidJson(this ILROSADsOperations operations, Product product = default(Product))
+            {
+                return Task.Factory.StartNew(s => ((ILROSADsOperations)s).BeginPutNonRetry201Creating400InvalidJsonAsync(product), operations, CancellationToken.None, TaskCreationOptions.None, TaskScheduler.Default).Unwrap().GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Long running put request, service returns a Product with
+            /// 'ProvisioningState' = 'Creating' and 201 response code
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='product'>
+            /// Product to put
+            /// </param>
+            /// <param name='cancellationToken'>
+            /// The cancellation token.
+            /// </param>
+            public static async Task<Product> BeginPutNonRetry201Creating400InvalidJsonAsync(this ILROSADsOperations operations, Product product = default(Product), CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.BeginPutNonRetry201Creating400InvalidJsonWithHttpMessagesAsync(product, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
             /// <summary>
             /// Long running put request, service returns a 200 with
             /// ProvisioningState=’Creating’. Poll the endpoint indicated in the
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LRORetrysDelete202Retry200Headers.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LRORetrysDelete202Retry200Headers.cs
index 5a86816dc6a3b..48c5638bc1344 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LRORetrysDelete202Retry200Headers.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LRORetrysDelete202Retry200Headers.cs
@@ -38,15 +38,15 @@ public LRORetrysDelete202Retry200Headers(string location = default(string), int?
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/retryerror/delete/202/retry/200
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LRORetrysDeleteAsyncRelativeRetrySucceededHeaders.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LRORetrysDeleteAsyncRelativeRetrySucceededHeaders.cs
index e368937f0d639..095ed23b916b1 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LRORetrysDeleteAsyncRelativeRetrySucceededHeaders.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LRORetrysDeleteAsyncRelativeRetrySucceededHeaders.cs
@@ -39,22 +39,22 @@ public LRORetrysDeleteAsyncRelativeRetrySucceededHeaders(string azureAsyncOperat
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/retryerror/deleteasync/retry/succeeded/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Azure-AsyncOperation")]
         public string AzureAsyncOperation { get; set; }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/retryerror/deleteasync/retry/succeeded/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LRORetrysDeleteProvisioning202Accepted200SucceededHeaders.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LRORetrysDeleteProvisioning202Accepted200SucceededHeaders.cs
index 6bf24c3d9a7cc..3c239e13c5061 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LRORetrysDeleteProvisioning202Accepted200SucceededHeaders.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LRORetrysDeleteProvisioning202Accepted200SucceededHeaders.cs
@@ -39,15 +39,15 @@ public LRORetrysDeleteProvisioning202Accepted200SucceededHeaders(string location
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/retryerror/delete/provisioning/202/accepted/200/succeeded
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LRORetrysPost202Retry200Headers.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LRORetrysPost202Retry200Headers.cs
index d8e377089a104..be801531b1e35 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LRORetrysPost202Retry200Headers.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LRORetrysPost202Retry200Headers.cs
@@ -38,15 +38,15 @@ public LRORetrysPost202Retry200Headers(string location = default(string), int? r
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/retryerror/post/202/retry/200
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LRORetrysPostAsyncRelativeRetrySucceededHeaders.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LRORetrysPostAsyncRelativeRetrySucceededHeaders.cs
index 0cf65de610684..694c6f60c6043 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LRORetrysPostAsyncRelativeRetrySucceededHeaders.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LRORetrysPostAsyncRelativeRetrySucceededHeaders.cs
@@ -39,22 +39,22 @@ public LRORetrysPostAsyncRelativeRetrySucceededHeaders(string azureAsyncOperatio
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/retryerror/putasync/retry/succeeded/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Azure-AsyncOperation")]
         public string AzureAsyncOperation { get; set; }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/retryerror/putasync/retry/succeeded/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LRORetrysPutAsyncRelativeRetrySucceededHeaders.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LRORetrysPutAsyncRelativeRetrySucceededHeaders.cs
index eeb61fc755b1c..02693514b3115 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LRORetrysPutAsyncRelativeRetrySucceededHeaders.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LRORetrysPutAsyncRelativeRetrySucceededHeaders.cs
@@ -39,22 +39,22 @@ public LRORetrysPutAsyncRelativeRetrySucceededHeaders(string azureAsyncOperation
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/retryerror/putasync/retry/succeeded/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Azure-AsyncOperation")]
         public string AzureAsyncOperation { get; set; }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/retryerror/putasync/retry/succeeded/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsDelete202NonRetry400Headers.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsDelete202NonRetry400Headers.cs
index 5178d27baa190..116d6a7e5db40 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsDelete202NonRetry400Headers.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsDelete202NonRetry400Headers.cs
@@ -38,15 +38,15 @@ public LROSADsDelete202NonRetry400Headers(string location = default(string), int
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/retryerror/delete/202/retry/200
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsDelete202RetryInvalidHeaderHeaders.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsDelete202RetryInvalidHeaderHeaders.cs
index 74944259a2ca3..727b01276234f 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsDelete202RetryInvalidHeaderHeaders.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsDelete202RetryInvalidHeaderHeaders.cs
@@ -38,14 +38,15 @@ public LROSADsDelete202RetryInvalidHeaderHeaders(string location = default(strin
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to /foo
+        /// Gets or sets location to poll for result status: will be set to
+        /// /foo
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to /bar
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to /bar
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsDeleteAsyncRelativeRetry400Headers.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsDeleteAsyncRelativeRetry400Headers.cs
index fc54f97d80671..4c1ac5d129b81 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsDeleteAsyncRelativeRetry400Headers.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsDeleteAsyncRelativeRetry400Headers.cs
@@ -39,22 +39,22 @@ public LROSADsDeleteAsyncRelativeRetry400Headers(string azureAsyncOperation = de
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/nonretryerror/deleteasync/retry/operationResults/400
         /// </summary>
         [JsonProperty(PropertyName = "Azure-AsyncOperation")]
         public string AzureAsyncOperation { get; set; }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/nonretryerror/deleteasync/retry/operationResults/400
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsDeleteAsyncRelativeRetryInvalidHeaderHeaders.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsDeleteAsyncRelativeRetryInvalidHeaderHeaders.cs
index 1c1262eb4bd11..bcb53a47e9945 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsDeleteAsyncRelativeRetryInvalidHeaderHeaders.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsDeleteAsyncRelativeRetryInvalidHeaderHeaders.cs
@@ -39,20 +39,22 @@ public LROSADsDeleteAsyncRelativeRetryInvalidHeaderHeaders(string azureAsyncOper
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to /foo
+        /// Gets or sets location to poll for result status: will be set to
+        /// /foo
         /// </summary>
         [JsonProperty(PropertyName = "Azure-AsyncOperation")]
         public string AzureAsyncOperation { get; set; }
 
         /// <summary>
-        /// Location to poll for result status: will be set to /foo
+        /// Gets or sets location to poll for result status: will be set to
+        /// /foo
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to /bar
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to /bar
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsDeleteAsyncRelativeRetryInvalidJsonPollingHeaders.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsDeleteAsyncRelativeRetryInvalidJsonPollingHeaders.cs
index 2ccbcaf1f68b6..8c30a0a4f97c9 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsDeleteAsyncRelativeRetryInvalidJsonPollingHeaders.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsDeleteAsyncRelativeRetryInvalidJsonPollingHeaders.cs
@@ -40,22 +40,22 @@ public LROSADsDeleteAsyncRelativeRetryInvalidJsonPollingHeaders(string azureAsyn
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/error/deleteasync/retry/failed/operationResults/invalidjsonpolling
         /// </summary>
         [JsonProperty(PropertyName = "Azure-AsyncOperation")]
         public string AzureAsyncOperation { get; set; }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/error/deleteasync/retry/failed/operationResults/invalidjsonpolling
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsDeleteAsyncRelativeRetryNoStatusHeaders.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsDeleteAsyncRelativeRetryNoStatusHeaders.cs
index a3b082bc44677..1a6afea5086b7 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsDeleteAsyncRelativeRetryNoStatusHeaders.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsDeleteAsyncRelativeRetryNoStatusHeaders.cs
@@ -39,22 +39,22 @@ public LROSADsDeleteAsyncRelativeRetryNoStatusHeaders(string azureAsyncOperation
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/deleteasync/retry/succeeded/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Azure-AsyncOperation")]
         public string AzureAsyncOperation { get; set; }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/deleteasync/retry/succeeded/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsDeleteNonRetry400Headers.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsDeleteNonRetry400Headers.cs
index 8388c132dbadb..202e5b5d8b720 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsDeleteNonRetry400Headers.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsDeleteNonRetry400Headers.cs
@@ -38,15 +38,15 @@ public LROSADsDeleteNonRetry400Headers(string location = default(string), int? r
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/retryerror/delete/202/retry/200
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPost202NoLocationHeaders.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPost202NoLocationHeaders.cs
index d0ff72b0480ad..275c476a53236 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPost202NoLocationHeaders.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPost202NoLocationHeaders.cs
@@ -38,14 +38,14 @@ public LROSADsPost202NoLocationHeaders(string location = default(string), int? r
         }
 
         /// <summary>
-        /// Location to poll for result status: will not be set
+        /// Gets or sets location to poll for result status: will not be set
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPost202NonRetry400Headers.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPost202NonRetry400Headers.cs
index 4a631690e2b5d..448c6f2ed5db5 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPost202NonRetry400Headers.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPost202NonRetry400Headers.cs
@@ -38,15 +38,15 @@ public LROSADsPost202NonRetry400Headers(string location = default(string), int?
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/retryerror/post/202/retry/200
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPost202RetryInvalidHeaderHeaders.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPost202RetryInvalidHeaderHeaders.cs
index 8d258cf724680..31373a1d5bc26 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPost202RetryInvalidHeaderHeaders.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPost202RetryInvalidHeaderHeaders.cs
@@ -38,14 +38,15 @@ public LROSADsPost202RetryInvalidHeaderHeaders(string location = default(string)
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to /foo
+        /// Gets or sets location to poll for result status: will be set to
+        /// /foo
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to /bar
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to /bar
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPostAsyncRelativeRetry400Headers.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPostAsyncRelativeRetry400Headers.cs
index 8b4d91544b02e..0c8e775eb0b59 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPostAsyncRelativeRetry400Headers.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPostAsyncRelativeRetry400Headers.cs
@@ -39,22 +39,22 @@ public LROSADsPostAsyncRelativeRetry400Headers(string azureAsyncOperation = defa
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/nonretryerror/putasync/retry/operationResults/400
         /// </summary>
         [JsonProperty(PropertyName = "Azure-AsyncOperation")]
         public string AzureAsyncOperation { get; set; }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/nonretryerror/putasync/retry/operationResults/400
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPostAsyncRelativeRetryInvalidHeaderHeaders.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPostAsyncRelativeRetryInvalidHeaderHeaders.cs
index ff5102bac8892..8b4a8487a6840 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPostAsyncRelativeRetryInvalidHeaderHeaders.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPostAsyncRelativeRetryInvalidHeaderHeaders.cs
@@ -39,20 +39,20 @@ public LROSADsPostAsyncRelativeRetryInvalidHeaderHeaders(string azureAsyncOperat
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to foo
+        /// Gets or sets location to poll for result status: will be set to foo
         /// </summary>
         [JsonProperty(PropertyName = "Azure-AsyncOperation")]
         public string AzureAsyncOperation { get; set; }
 
         /// <summary>
-        /// Location to poll for result status: will be set to foo
+        /// Gets or sets location to poll for result status: will be set to foo
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to /bar
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to /bar
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPostAsyncRelativeRetryInvalidJsonPollingHeaders.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPostAsyncRelativeRetryInvalidJsonPollingHeaders.cs
index 6b33dddde0813..55f40ad33f05d 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPostAsyncRelativeRetryInvalidJsonPollingHeaders.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPostAsyncRelativeRetryInvalidJsonPollingHeaders.cs
@@ -39,22 +39,22 @@ public LROSADsPostAsyncRelativeRetryInvalidJsonPollingHeaders(string azureAsyncO
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/error/postasync/retry/failed/operationResults/invalidjsonpolling
         /// </summary>
         [JsonProperty(PropertyName = "Azure-AsyncOperation")]
         public string AzureAsyncOperation { get; set; }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/error/postasync/retry/failed/operationResults/invalidjsonpolling
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPostAsyncRelativeRetryNoPayloadHeaders.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPostAsyncRelativeRetryNoPayloadHeaders.cs
index 6b879e10ce3ce..c5a6c9a6a4b88 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPostAsyncRelativeRetryNoPayloadHeaders.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPostAsyncRelativeRetryNoPayloadHeaders.cs
@@ -39,22 +39,22 @@ public LROSADsPostAsyncRelativeRetryNoPayloadHeaders(string azureAsyncOperation
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/error/putasync/retry/failed/operationResults/nopayload
         /// </summary>
         [JsonProperty(PropertyName = "Azure-AsyncOperation")]
         public string AzureAsyncOperation { get; set; }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/error/putasync/retry/failed/operationResults/nopayload
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPostNonRetry400Headers.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPostNonRetry400Headers.cs
index b84f0a4ab2dae..a063b6ed3c2b3 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPostNonRetry400Headers.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPostNonRetry400Headers.cs
@@ -38,15 +38,15 @@ public LROSADsPostNonRetry400Headers(string location = default(string), int? ret
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/retryerror/post/202/retry/200
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPutAsyncRelativeRetry400Headers.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPutAsyncRelativeRetry400Headers.cs
index 4517f177b7c4e..a8fdaaf7b9fdf 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPutAsyncRelativeRetry400Headers.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPutAsyncRelativeRetry400Headers.cs
@@ -39,22 +39,22 @@ public LROSADsPutAsyncRelativeRetry400Headers(string azureAsyncOperation = defau
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/nonretryerror/putasync/retry/operationResults/400
         /// </summary>
         [JsonProperty(PropertyName = "Azure-AsyncOperation")]
         public string AzureAsyncOperation { get; set; }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/nonretryerror/putasync/retry/operationResults/400
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPutAsyncRelativeRetryInvalidHeaderHeaders.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPutAsyncRelativeRetryInvalidHeaderHeaders.cs
index 31f90b28d94dd..730e2a89f794b 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPutAsyncRelativeRetryInvalidHeaderHeaders.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPutAsyncRelativeRetryInvalidHeaderHeaders.cs
@@ -39,22 +39,22 @@ public LROSADsPutAsyncRelativeRetryInvalidHeaderHeaders(string azureAsyncOperati
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/putasync/retry/succeeded/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Azure-AsyncOperation")]
         public string AzureAsyncOperation { get; set; }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/putasync/retry/succeeded/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPutAsyncRelativeRetryInvalidJsonPollingHeaders.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPutAsyncRelativeRetryInvalidJsonPollingHeaders.cs
index cca85263d8ad6..0854ea59e12cd 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPutAsyncRelativeRetryInvalidJsonPollingHeaders.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPutAsyncRelativeRetryInvalidJsonPollingHeaders.cs
@@ -39,22 +39,22 @@ public LROSADsPutAsyncRelativeRetryInvalidJsonPollingHeaders(string azureAsyncOp
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/putasync/retry/failed/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Azure-AsyncOperation")]
         public string AzureAsyncOperation { get; set; }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/putasync/retry/failed/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPutAsyncRelativeRetryNoStatusHeaders.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPutAsyncRelativeRetryNoStatusHeaders.cs
index 5a4aeef323fc4..2d63d0682d5d4 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPutAsyncRelativeRetryNoStatusHeaders.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPutAsyncRelativeRetryNoStatusHeaders.cs
@@ -39,22 +39,22 @@ public LROSADsPutAsyncRelativeRetryNoStatusHeaders(string azureAsyncOperation =
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/putasync/retry/succeeded/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Azure-AsyncOperation")]
         public string AzureAsyncOperation { get; set; }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/putasync/retry/succeeded/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPutAsyncRelativeRetryNoStatusPayloadHeaders.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPutAsyncRelativeRetryNoStatusPayloadHeaders.cs
index d027036126ada..5c75b72ec2e31 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPutAsyncRelativeRetryNoStatusPayloadHeaders.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROSADsPutAsyncRelativeRetryNoStatusPayloadHeaders.cs
@@ -39,22 +39,22 @@ public LROSADsPutAsyncRelativeRetryNoStatusPayloadHeaders(string azureAsyncOpera
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/putasync/retry/succeeded/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Azure-AsyncOperation")]
         public string AzureAsyncOperation { get; set; }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/putasync/retry/succeeded/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsCustomHeaderPost202Retry200Headers.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsCustomHeaderPost202Retry200Headers.cs
index 462144eb416ec..ab928a160295a 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsCustomHeaderPost202Retry200Headers.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsCustomHeaderPost202Retry200Headers.cs
@@ -38,15 +38,15 @@ public LROsCustomHeaderPost202Retry200Headers(string location = default(string),
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/customheader/post/202/retry/200
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsCustomHeaderPostAsyncRetrySucceededHeaders.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsCustomHeaderPostAsyncRetrySucceededHeaders.cs
index 5a4c1cc9000a0..10a93dfb18dd5 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsCustomHeaderPostAsyncRetrySucceededHeaders.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsCustomHeaderPostAsyncRetrySucceededHeaders.cs
@@ -39,22 +39,22 @@ public LROsCustomHeaderPostAsyncRetrySucceededHeaders(string azureAsyncOperation
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/customheader/putasync/retry/succeeded/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Azure-AsyncOperation")]
         public string AzureAsyncOperation { get; set; }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/customheader/putasync/retry/succeeded/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsCustomHeaderPutAsyncRetrySucceededHeaders.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsCustomHeaderPutAsyncRetrySucceededHeaders.cs
index 40a58b667514d..66cb66baec84a 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsCustomHeaderPutAsyncRetrySucceededHeaders.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsCustomHeaderPutAsyncRetrySucceededHeaders.cs
@@ -39,22 +39,22 @@ public LROsCustomHeaderPutAsyncRetrySucceededHeaders(string azureAsyncOperation
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/customheader/putasync/retry/succeeded/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Azure-AsyncOperation")]
         public string AzureAsyncOperation { get; set; }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/customheader/putasync/retry/succeeded/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDelete202NoRetry204Headers.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDelete202NoRetry204Headers.cs
index 74f325ecf891e..9c1043c99e9c2 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDelete202NoRetry204Headers.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDelete202NoRetry204Headers.cs
@@ -38,15 +38,15 @@ public LROsDelete202NoRetry204Headers(string location = default(string), int? re
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/delete/202/noretry/204
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDelete202Retry200Headers.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDelete202Retry200Headers.cs
index 73fec76b069e5..53c58b72c187b 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDelete202Retry200Headers.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDelete202Retry200Headers.cs
@@ -38,15 +38,15 @@ public LROsDelete202Retry200Headers(string location = default(string), int? retr
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/delete/202/retry/200
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDeleteAsyncNoHeaderInRetryHeaders.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDeleteAsyncNoHeaderInRetryHeaders.cs
index 2be5bc4d04650..71283acb56866 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDeleteAsyncNoHeaderInRetryHeaders.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDeleteAsyncNoHeaderInRetryHeaders.cs
@@ -37,7 +37,7 @@ public LROsDeleteAsyncNoHeaderInRetryHeaders(string location = default(string))
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/put/noheader/202/204/operationresults
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDeleteAsyncNoRetrySucceededHeaders.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDeleteAsyncNoRetrySucceededHeaders.cs
index edbb8bacea891..177d0dbd34861 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDeleteAsyncNoRetrySucceededHeaders.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDeleteAsyncNoRetrySucceededHeaders.cs
@@ -39,22 +39,22 @@ public LROsDeleteAsyncNoRetrySucceededHeaders(string azureAsyncOperation = defau
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/deleteasync/noretry/succeeded/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Azure-AsyncOperation")]
         public string AzureAsyncOperation { get; set; }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/deleteasync/noretry/succeeded/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDeleteAsyncRetryFailedHeaders.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDeleteAsyncRetryFailedHeaders.cs
index f23c19fe68bc5..8f3aebdc781a2 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDeleteAsyncRetryFailedHeaders.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDeleteAsyncRetryFailedHeaders.cs
@@ -39,22 +39,22 @@ public LROsDeleteAsyncRetryFailedHeaders(string azureAsyncOperation = default(st
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/deleteasync/retry/failed/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Azure-AsyncOperation")]
         public string AzureAsyncOperation { get; set; }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/deleteasync/retry/failed/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDeleteAsyncRetrySucceededHeaders.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDeleteAsyncRetrySucceededHeaders.cs
index be0fa3a4ea8f4..acfd07ed5a1cd 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDeleteAsyncRetrySucceededHeaders.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDeleteAsyncRetrySucceededHeaders.cs
@@ -39,22 +39,22 @@ public LROsDeleteAsyncRetrySucceededHeaders(string azureAsyncOperation = default
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/deleteasync/retry/succeeded/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Azure-AsyncOperation")]
         public string AzureAsyncOperation { get; set; }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/deleteasync/retry/succeeded/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDeleteAsyncRetrycanceledHeaders.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDeleteAsyncRetrycanceledHeaders.cs
index ce2675bf5c3d6..a5d86a7f1b956 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDeleteAsyncRetrycanceledHeaders.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDeleteAsyncRetrycanceledHeaders.cs
@@ -39,22 +39,22 @@ public LROsDeleteAsyncRetrycanceledHeaders(string azureAsyncOperation = default(
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/deleteasync/retry/canceled/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Azure-AsyncOperation")]
         public string AzureAsyncOperation { get; set; }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/deleteasync/retry/canceled/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDeleteNoHeaderInRetryHeaders.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDeleteNoHeaderInRetryHeaders.cs
index 039a86d9a9f1a..7dc3e9b001a7b 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDeleteNoHeaderInRetryHeaders.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDeleteNoHeaderInRetryHeaders.cs
@@ -37,7 +37,7 @@ public LROsDeleteNoHeaderInRetryHeaders(string location = default(string))
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/put/noheader/202/204/operationresults
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDeleteProvisioning202Accepted200SucceededHeaders.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDeleteProvisioning202Accepted200SucceededHeaders.cs
index af5c4ef25cfa3..9902e42b88cd1 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDeleteProvisioning202Accepted200SucceededHeaders.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDeleteProvisioning202Accepted200SucceededHeaders.cs
@@ -39,15 +39,15 @@ public LROsDeleteProvisioning202Accepted200SucceededHeaders(string location = de
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/delete/provisioning/202/accepted/200/succeeded
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDeleteProvisioning202DeletingFailed200Headers.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDeleteProvisioning202DeletingFailed200Headers.cs
index c7cd89096d21e..aacc2cc6d51f1 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDeleteProvisioning202DeletingFailed200Headers.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDeleteProvisioning202DeletingFailed200Headers.cs
@@ -38,15 +38,15 @@ public LROsDeleteProvisioning202DeletingFailed200Headers(string location = defau
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/delete/provisioning/202/deleting/200/failed
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDeleteProvisioning202Deletingcanceled200Headers.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDeleteProvisioning202Deletingcanceled200Headers.cs
index 0ded45ed5163a..929ce769234e2 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDeleteProvisioning202Deletingcanceled200Headers.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsDeleteProvisioning202Deletingcanceled200Headers.cs
@@ -38,15 +38,15 @@ public LROsDeleteProvisioning202Deletingcanceled200Headers(string location = def
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/delete/provisioning/202/deleting/200/canceled
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPost202NoRetry204Headers.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPost202NoRetry204Headers.cs
index 5ee71af14e56e..2b1b350499ac7 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPost202NoRetry204Headers.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPost202NoRetry204Headers.cs
@@ -38,15 +38,15 @@ public LROsPost202NoRetry204Headers(string location = default(string), int? retr
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/post/202/noretry/204
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPost202Retry200Headers.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPost202Retry200Headers.cs
index 15ec65630416b..ac65636a94e0d 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPost202Retry200Headers.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPost202Retry200Headers.cs
@@ -36,15 +36,15 @@ public LROsPost202Retry200Headers(string location = default(string), int? retryA
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/post/202/retry/200
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPostAsyncNoRetrySucceededHeaders.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPostAsyncNoRetrySucceededHeaders.cs
index b42d705c25373..ecfca7fc20346 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPostAsyncNoRetrySucceededHeaders.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPostAsyncNoRetrySucceededHeaders.cs
@@ -39,22 +39,22 @@ public LROsPostAsyncNoRetrySucceededHeaders(string azureAsyncOperation = default
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/putasync/retry/succeeded/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Azure-AsyncOperation")]
         public string AzureAsyncOperation { get; set; }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/putasync/retry/succeeded/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPostAsyncRetryFailedHeaders.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPostAsyncRetryFailedHeaders.cs
index c917433f206d0..075c922deed85 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPostAsyncRetryFailedHeaders.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPostAsyncRetryFailedHeaders.cs
@@ -39,22 +39,22 @@ public LROsPostAsyncRetryFailedHeaders(string azureAsyncOperation = default(stri
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/putasync/retry/failed/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Azure-AsyncOperation")]
         public string AzureAsyncOperation { get; set; }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/putasync/retry/failed/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPostAsyncRetrySucceededHeaders.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPostAsyncRetrySucceededHeaders.cs
index 54b3e15d511b2..c5130f0ffe7d6 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPostAsyncRetrySucceededHeaders.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPostAsyncRetrySucceededHeaders.cs
@@ -39,22 +39,22 @@ public LROsPostAsyncRetrySucceededHeaders(string azureAsyncOperation = default(s
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/putasync/retry/succeeded/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Azure-AsyncOperation")]
         public string AzureAsyncOperation { get; set; }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/putasync/retry/succeeded/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPostAsyncRetrycanceledHeaders.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPostAsyncRetrycanceledHeaders.cs
index 0b4068d4ec5ed..a55f69e4730e4 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPostAsyncRetrycanceledHeaders.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPostAsyncRetrycanceledHeaders.cs
@@ -39,22 +39,22 @@ public LROsPostAsyncRetrycanceledHeaders(string azureAsyncOperation = default(st
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/putasync/retry/canceled/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Azure-AsyncOperation")]
         public string AzureAsyncOperation { get; set; }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/putasync/retry/canceled/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPutAsyncNoRetrySucceededHeaders.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPutAsyncNoRetrySucceededHeaders.cs
index 517418b91e280..b33f4f7df5d1f 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPutAsyncNoRetrySucceededHeaders.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPutAsyncNoRetrySucceededHeaders.cs
@@ -38,14 +38,14 @@ public LROsPutAsyncNoRetrySucceededHeaders(string azureAsyncOperation = default(
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/putasync/noretry/succeeded/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Azure-AsyncOperation")]
         public string AzureAsyncOperation { get; set; }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/putasync/noretry/succeeded/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPutAsyncNoRetrycanceledHeaders.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPutAsyncNoRetrycanceledHeaders.cs
index d2d6debcc6834..4c8bd617507b3 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPutAsyncNoRetrycanceledHeaders.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPutAsyncNoRetrycanceledHeaders.cs
@@ -38,14 +38,14 @@ public LROsPutAsyncNoRetrycanceledHeaders(string azureAsyncOperation = default(s
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/putasync/noretry/canceled/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Azure-AsyncOperation")]
         public string AzureAsyncOperation { get; set; }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/putasync/noretry/canceled/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPutAsyncRetryFailedHeaders.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPutAsyncRetryFailedHeaders.cs
index d4d12deacaf96..c840b00f06da1 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPutAsyncRetryFailedHeaders.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPutAsyncRetryFailedHeaders.cs
@@ -39,22 +39,22 @@ public LROsPutAsyncRetryFailedHeaders(string azureAsyncOperation = default(strin
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/putasync/retry/failed/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Azure-AsyncOperation")]
         public string AzureAsyncOperation { get; set; }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/putasync/retry/failed/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPutAsyncRetrySucceededHeaders.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPutAsyncRetrySucceededHeaders.cs
index 3b09b57d0c161..b6b88a22380cd 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPutAsyncRetrySucceededHeaders.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPutAsyncRetrySucceededHeaders.cs
@@ -39,22 +39,22 @@ public LROsPutAsyncRetrySucceededHeaders(string azureAsyncOperation = default(st
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/putasync/retry/succeeded/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Azure-AsyncOperation")]
         public string AzureAsyncOperation { get; set; }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/putasync/retry/succeeded/operationResults/200
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Number of milliseconds until the next poll should be sent, will be
-        /// set to zero
+        /// Gets or sets number of milliseconds until the next poll should be
+        /// sent, will be set to zero
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPutNoHeaderInRetryHeaders.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPutNoHeaderInRetryHeaders.cs
index 66cec59294444..e0bbd41f30034 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPutNoHeaderInRetryHeaders.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/LROsPutNoHeaderInRetryHeaders.cs
@@ -37,7 +37,7 @@ public LROsPutNoHeaderInRetryHeaders(string location = default(string))
         }
 
         /// <summary>
-        /// Location to poll for result status: will be set to
+        /// Gets or sets location to poll for result status: will be set to
         /// /lro/putasync/noheader/202/200/operationResults
         /// </summary>
         [JsonProperty(PropertyName = "location")]
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/OperationResult.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/OperationResult.cs
index 644400aec8bae..ac96c786203b9 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/OperationResult.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/OperationResult.cs
@@ -33,9 +33,9 @@ public OperationResult(string status = default(string), OperationResultError err
         }
 
         /// <summary>
-        /// The status of the request. Possible values include: 'Succeeded',
-        /// 'Failed', 'canceled', 'Accepted', 'Creating', 'Created',
-        /// 'Updating', 'Updated', 'Deleting', 'Deleted', 'OK'
+        /// Gets or sets the status of the request. Possible values include:
+        /// 'Succeeded', 'Failed', 'canceled', 'Accepted', 'Creating',
+        /// 'Created', 'Updating', 'Updated', 'Deleting', 'Deleted', 'OK'
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/OperationResultError.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/OperationResultError.cs
index e215156e349d1..879bd79f188ef 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/OperationResultError.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/OperationResultError.cs
@@ -33,13 +33,13 @@ public OperationResultError(int? code = default(int?), string message = default(
         }
 
         /// <summary>
-        /// The error code for an operation failure
+        /// Gets or sets the error code for an operation failure
         /// </summary>
         [JsonProperty(PropertyName = "code")]
         public int? Code { get; set; }
 
         /// <summary>
-        /// The detailed arror message
+        /// Gets or sets the detailed arror message
         /// </summary>
         [JsonProperty(PropertyName = "message")]
         public string Message { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/Product.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/Product.cs
index 989a0ca86de57..aa45a2ce75f42 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/Product.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/Product.cs
@@ -40,7 +40,7 @@ public Product(string id = default(string), string type = default(string), IDict
         public string ProvisioningState { get; set; }
 
         /// <summary>
-        /// Possible values include: 'Succeeded', 'Failed', 'canceled',
+        /// Gets possible values include: 'Succeeded', 'Failed', 'canceled',
         /// 'Accepted', 'Creating', 'Created', 'Updating', 'Updated',
         /// 'Deleting', 'Deleted', 'OK'
         /// </summary>
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/Resource.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/Resource.cs
index f723039e2ea2a..ccedfcfae70c4 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/Resource.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/Resource.cs
@@ -36,13 +36,13 @@ public Resource(string id = default(string), string type = default(string), IDic
         }
 
         /// <summary>
-        /// Resource Id
+        /// Gets resource Id
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public string Id { get; private set; }
 
         /// <summary>
-        /// Resource Type
+        /// Gets resource Type
         /// </summary>
         [JsonProperty(PropertyName = "type")]
         public string Type { get; private set; }
@@ -53,13 +53,13 @@ public Resource(string id = default(string), string type = default(string), IDic
         public IDictionary<string, string> Tags { get; set; }
 
         /// <summary>
-        /// Resource Location
+        /// Gets or sets resource Location
         /// </summary>
         [JsonProperty(PropertyName = "location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Resource Name
+        /// Gets resource Name
         /// </summary>
         [JsonProperty(PropertyName = "name")]
         public string Name { get; private set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/SubProduct.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/SubProduct.cs
index 3e2dfb91369cd..838d1be2a237a 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/SubProduct.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/SubProduct.cs
@@ -40,7 +40,7 @@ public SubProduct(string id = default(string), string provisioningState = defaul
         public string ProvisioningState { get; set; }
 
         /// <summary>
-        /// Possible values include: 'Succeeded', 'Failed', 'canceled',
+        /// Gets possible values include: 'Succeeded', 'Failed', 'canceled',
         /// 'Accepted', 'Creating', 'Created', 'Updating', 'Updated',
         /// 'Deleting', 'Deleted', 'OK'
         /// </summary>
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/SubResource.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/SubResource.cs
index a41dc0dd848fe..55a46212dfea1 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/SubResource.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Lro/Models/SubResource.cs
@@ -32,7 +32,7 @@ public SubResource(string id = default(string))
         }
 
         /// <summary>
-        /// Sub Resource Id
+        /// Gets sub Resource Id
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public string Id { get; private set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Paging/Models/OperationResult.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Paging/Models/OperationResult.cs
index 584dc52c773b4..69a3704652479 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Paging/Models/OperationResult.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Paging/Models/OperationResult.cs
@@ -32,9 +32,9 @@ public OperationResult(string status = default(string))
         }
 
         /// <summary>
-        /// The status of the request. Possible values include: 'Succeeded',
-        /// 'Failed', 'canceled', 'Accepted', 'Creating', 'Created',
-        /// 'Updating', 'Updated', 'Deleting', 'Deleted', 'OK'
+        /// Gets or sets the status of the request. Possible values include:
+        /// 'Succeeded', 'Failed', 'canceled', 'Accepted', 'Creating',
+        /// 'Created', 'Updating', 'Updated', 'Deleting', 'Deleted', 'OK'
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Paging/Models/PagingGetMultiplePagesOptions.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Paging/Models/PagingGetMultiplePagesOptions.cs
index 3b1227cd3b0f5..2c900f171ed91 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Paging/Models/PagingGetMultiplePagesOptions.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Paging/Models/PagingGetMultiplePagesOptions.cs
@@ -17,7 +17,7 @@ namespace Fixtures.Azure.AcceptanceTestsPaging.Models
     using Microsoft.Rest.Azure;
 
     /// <summary>
-    /// Additional parameters for the getMultiplePages operation.
+    /// Additional parameters for the Paging_getMultiplePages operation.
     /// </summary>
     public partial class PagingGetMultiplePagesOptions
     {
@@ -38,14 +38,15 @@ public PagingGetMultiplePagesOptions(int? maxresults = default(int?), int? timeo
         }
 
         /// <summary>
-        /// Sets the maximum number of items to return in the response.
+        /// Gets or sets sets the maximum number of items to return in the
+        /// response.
         /// </summary>
         [JsonProperty(PropertyName = "")]
         public int? Maxresults { get; set; }
 
         /// <summary>
-        /// Sets the maximum time that the server can spend processing the
-        /// request, in seconds. The default is 30 seconds.
+        /// Gets or sets sets the maximum time that the server can spend
+        /// processing the request, in seconds. The default is 30 seconds.
         /// </summary>
         [JsonProperty(PropertyName = "")]
         public int? Timeout { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Paging/Models/PagingGetMultiplePagesWithOffsetNextOptions.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Paging/Models/PagingGetMultiplePagesWithOffsetNextOptions.cs
index 78992ebfb834e..13885d8129848 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Paging/Models/PagingGetMultiplePagesWithOffsetNextOptions.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Paging/Models/PagingGetMultiplePagesWithOffsetNextOptions.cs
@@ -38,14 +38,15 @@ public PagingGetMultiplePagesWithOffsetNextOptions(int? maxresults = default(int
         }
 
         /// <summary>
-        /// Sets the maximum number of items to return in the response.
+        /// Gets or sets sets the maximum number of items to return in the
+        /// response.
         /// </summary>
         [JsonProperty(PropertyName = "")]
         public int? Maxresults { get; set; }
 
         /// <summary>
-        /// Sets the maximum time that the server can spend processing the
-        /// request, in seconds. The default is 30 seconds.
+        /// Gets or sets sets the maximum time that the server can spend
+        /// processing the request, in seconds. The default is 30 seconds.
         /// </summary>
         [JsonProperty(PropertyName = "")]
         public int? Timeout { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Paging/Models/PagingGetMultiplePagesWithOffsetOptions.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Paging/Models/PagingGetMultiplePagesWithOffsetOptions.cs
index e4c74a8e57a6e..076d5bf8587b8 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Paging/Models/PagingGetMultiplePagesWithOffsetOptions.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/Paging/Models/PagingGetMultiplePagesWithOffsetOptions.cs
@@ -17,7 +17,8 @@ namespace Fixtures.Azure.AcceptanceTestsPaging.Models
     using Microsoft.Rest.Azure;
 
     /// <summary>
-    /// Additional parameters for the getMultiplePagesWithOffset operation.
+    /// Additional parameters for the Paging_getMultiplePagesWithOffset
+    /// operation.
     /// </summary>
     public partial class PagingGetMultiplePagesWithOffsetOptions
     {
@@ -39,20 +40,21 @@ public PagingGetMultiplePagesWithOffsetOptions(int offset, int? maxresults = def
         }
 
         /// <summary>
-        /// Sets the maximum number of items to return in the response.
+        /// Gets or sets sets the maximum number of items to return in the
+        /// response.
         /// </summary>
         [JsonProperty(PropertyName = "")]
         public int? Maxresults { get; set; }
 
         /// <summary>
-        /// Offset of return value
+        /// Gets or sets offset of return value
         /// </summary>
         [JsonProperty(PropertyName = "")]
         public int Offset { get; set; }
 
         /// <summary>
-        /// Sets the maximum time that the server can spend processing the
-        /// request, in seconds. The default is 30 seconds.
+        /// Gets or sets sets the maximum time that the server can spend
+        /// processing the request, in seconds. The default is 30 seconds.
         /// </summary>
         [JsonProperty(PropertyName = "")]
         public int? Timeout { get; set; }
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/SubscriptionIdApiVersion/Models/SampleResourceGroup.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/SubscriptionIdApiVersion/Models/SampleResourceGroup.cs
index 4b1187cae87dd..6ce67ca345a8b 100644
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/SubscriptionIdApiVersion/Models/SampleResourceGroup.cs
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/SubscriptionIdApiVersion/Models/SampleResourceGroup.cs
@@ -33,13 +33,13 @@ public SampleResourceGroup(string name = default(string), string location = defa
         }
 
         /// <summary>
-        /// resource group name 'testgroup101'
+        /// Gets or sets resource group name 'testgroup101'
         /// </summary>
         [JsonProperty(PropertyName = "name")]
         public string Name { get; set; }
 
         /// <summary>
-        /// resource group location 'West US'
+        /// Gets or sets resource group location 'West US'
         /// </summary>
         [JsonProperty(PropertyName = "location")]
         public string Location { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/AcceptanceTests.cs b/AutoRest/Generators/CSharp/CSharp.Tests/AcceptanceTests.cs
index 0c6e31b1c1467..bdd10a6f30136 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/AcceptanceTests.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/AcceptanceTests.cs
@@ -50,6 +50,7 @@
 using Fixtures.PetstoreV2;
 using Fixtures.AcceptanceTestsCompositeBoolIntClient;
 using Fixtures.AcceptanceTestsCustomBaseUri;
+using Fixtures.AcceptanceTestsCustomBaseUriMoreOptions;
 using System.Net.Http;
 using Fixtures.AcceptanceTestsModelFlattening;
 using Fixtures.AcceptanceTestsModelFlattening.Models;
@@ -197,12 +198,16 @@ public void IntegerTests()
             client.IntModel.PutMin32(Int32.MinValue);
             client.IntModel.PutMax64(Int64.MaxValue);
             client.IntModel.PutMin64(Int64.MinValue);
+            client.IntModel.PutUnixTimeDate(new DateTime(2016, 4, 13, 0, 0, 0));
             client.IntModel.GetNull();
             Assert.Throws<SerializationException>(() => client.IntModel.GetInvalid());
             Assert.Throws<SerializationException>(() => client.IntModel.GetOverflowInt32());
             Assert.Throws<SerializationException>(() => client.IntModel.GetOverflowInt64());
             Assert.Throws<SerializationException>(() => client.IntModel.GetUnderflowInt32());
             Assert.Throws<SerializationException>(() => client.IntModel.GetUnderflowInt64());
+            Assert.Throws<SerializationException>(() => client.IntModel.GetInvalidUnixTime());
+            Assert.Null(client.IntModel.GetNullUnixTime());
+            Assert.Equal(new DateTime(2016, 4, 13, 0, 0, 0), client.IntModel.GetUnixTime());
         }
 
         [Fact]
@@ -1350,6 +1355,7 @@ public void UrlPathTests()
                 client.Paths.Base64Url(Encoding.UTF8.GetBytes("lorem"));
                 var testArray = new List<string> { "ArrayPath1", @"begin!*'();:@ &=+$,/?#[]end", null, "" };
                 client.Paths.ArrayCsvInPath(testArray);
+                client.Paths.UnixTimeUrl(new DateTime(2016, 4, 13, 0, 0, 0));
             }
         }
 
@@ -1360,6 +1366,9 @@ public void HeaderTests()
                 SwaggerPath("header.json"), ExpectedPath("Header"));
             using (var client = new AutoRestSwaggerBATHeaderService(Fixture.Uri))
             {
+                // Check the UserAgent ProductInfoHeaderValue
+                Assert.Equal("1.5.0.1", client.UserAgent.Select(c => c.Product.Version.ToString()).FirstOrDefault());
+
                 // POST param/prim/integer
                 client.Header.ParamInteger("positive", 1);
                 client.Header.ParamInteger("negative", -2);
@@ -1951,6 +1960,21 @@ public void CustomBaseUriTests()
             }
         }
 
+        [Fact]
+        public void CustomBaseUriMoreOptionsTests()
+        {
+            SwaggerSpecRunner.RunTests(
+                SwaggerPath("custom-baseUrl-more-options.json"), ExpectedPath("CustomBaseUriMoreOptions"));
+            using (var client = new AutoRestParameterizedCustomHostTestClient())
+            {
+                client.SubscriptionId = "test12";
+                // small modification to the "host" portion to include the port and the '.'
+                client.DnsSuffix = string.Format(CultureInfo.InvariantCulture, "{0}.:{1}", "host", Fixture.Port);
+                Assert.Equal(HttpStatusCode.OK,
+                    client.Paths.GetEmptyWithHttpMessagesAsync("http://lo", "cal", "key1").Result.Response.StatusCode);
+            }
+        }
+
         [Fact]
         public void CustomBaseUriNegativeTests()
         {
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyBoolean/BoolModel.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyBoolean/BoolModel.cs
index d78403311ec8c..d287e6188c543 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyBoolean/BoolModel.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyBoolean/BoolModel.cs
@@ -217,12 +217,9 @@ public async Task<HttpOperationResponse> PutTrueWithHttpMessagesAsync(bool boolB
 
             // Serialize Request
             string _requestContent = null;
-            if(boolBody != null)
-            {
-                _requestContent = SafeJsonConvert.SerializeObject(boolBody, this.Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
+            _requestContent = SafeJsonConvert.SerializeObject(boolBody, this.Client.SerializationSettings);
+            _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+            _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             // Send Request
             if (_shouldTrace)
             {
@@ -446,12 +443,9 @@ public async Task<HttpOperationResponse> PutFalseWithHttpMessagesAsync(bool bool
 
             // Serialize Request
             string _requestContent = null;
-            if(boolBody != null)
-            {
-                _requestContent = SafeJsonConvert.SerializeObject(boolBody, this.Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
+            _requestContent = SafeJsonConvert.SerializeObject(boolBody, this.Client.SerializationSettings);
+            _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+            _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             // Send Request
             if (_shouldTrace)
             {
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyComplex/Models/Basic.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyComplex/Models/Basic.cs
index 37a8fff6fc165..be0b4041263e4 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyComplex/Models/Basic.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyComplex/Models/Basic.cs
@@ -43,7 +43,8 @@ public Basic(int? id = default(int?), string name = default(string), string colo
         public string Name { get; set; }
 
         /// <summary>
-        /// Possible values include: 'cyan', 'Magenta', 'YELLOW', 'blacK'
+        /// Gets or sets possible values include: 'cyan', 'Magenta', 'YELLOW',
+        /// 'blacK'
         /// </summary>
         [JsonProperty(PropertyName = "color")]
         public string Color { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDate/Date.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDate/Date.cs
index 0a4c07170740d..509781fe382c5 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDate/Date.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDate/Date.cs
@@ -574,12 +574,9 @@ public async Task<HttpOperationResponse> PutMaxDateWithHttpMessagesAsync(DateTim
 
             // Serialize Request
             string _requestContent = null;
-            if(dateBody != null)
-            {
-                _requestContent = SafeJsonConvert.SerializeObject(dateBody, new DateJsonConverter());
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
+            _requestContent = SafeJsonConvert.SerializeObject(dateBody, new DateJsonConverter());
+            _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+            _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             // Send Request
             if (_shouldTrace)
             {
@@ -803,12 +800,9 @@ public async Task<HttpOperationResponse> PutMinDateWithHttpMessagesAsync(DateTim
 
             // Serialize Request
             string _requestContent = null;
-            if(dateBody != null)
-            {
-                _requestContent = SafeJsonConvert.SerializeObject(dateBody, new DateJsonConverter());
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
+            _requestContent = SafeJsonConvert.SerializeObject(dateBody, new DateJsonConverter());
+            _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+            _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             // Send Request
             if (_shouldTrace)
             {
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDateTime/Datetime.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDateTime/Datetime.cs
index 2248d4263b000..a46a03a8ae9b4 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDateTime/Datetime.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDateTime/Datetime.cs
@@ -574,12 +574,9 @@ public async Task<HttpOperationResponse> PutUtcMaxDateTimeWithHttpMessagesAsync(
 
             // Serialize Request
             string _requestContent = null;
-            if(datetimeBody != null)
-            {
-                _requestContent = SafeJsonConvert.SerializeObject(datetimeBody, this.Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
+            _requestContent = SafeJsonConvert.SerializeObject(datetimeBody, this.Client.SerializationSettings);
+            _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+            _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             // Send Request
             if (_shouldTrace)
             {
@@ -923,12 +920,9 @@ public async Task<HttpOperationResponse> PutLocalPositiveOffsetMaxDateTimeWithHt
 
             // Serialize Request
             string _requestContent = null;
-            if(datetimeBody != null)
-            {
-                _requestContent = SafeJsonConvert.SerializeObject(datetimeBody, this.Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
+            _requestContent = SafeJsonConvert.SerializeObject(datetimeBody, this.Client.SerializationSettings);
+            _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+            _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             // Send Request
             if (_shouldTrace)
             {
@@ -1274,12 +1268,9 @@ public async Task<HttpOperationResponse> PutLocalNegativeOffsetMaxDateTimeWithHt
 
             // Serialize Request
             string _requestContent = null;
-            if(datetimeBody != null)
-            {
-                _requestContent = SafeJsonConvert.SerializeObject(datetimeBody, this.Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
+            _requestContent = SafeJsonConvert.SerializeObject(datetimeBody, this.Client.SerializationSettings);
+            _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+            _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             // Send Request
             if (_shouldTrace)
             {
@@ -1624,12 +1615,9 @@ public async Task<HttpOperationResponse> PutUtcMinDateTimeWithHttpMessagesAsync(
 
             // Serialize Request
             string _requestContent = null;
-            if(datetimeBody != null)
-            {
-                _requestContent = SafeJsonConvert.SerializeObject(datetimeBody, this.Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
+            _requestContent = SafeJsonConvert.SerializeObject(datetimeBody, this.Client.SerializationSettings);
+            _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+            _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             // Send Request
             if (_shouldTrace)
             {
@@ -1853,12 +1841,9 @@ public async Task<HttpOperationResponse> PutLocalPositiveOffsetMinDateTimeWithHt
 
             // Serialize Request
             string _requestContent = null;
-            if(datetimeBody != null)
-            {
-                _requestContent = SafeJsonConvert.SerializeObject(datetimeBody, this.Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
+            _requestContent = SafeJsonConvert.SerializeObject(datetimeBody, this.Client.SerializationSettings);
+            _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+            _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             // Send Request
             if (_shouldTrace)
             {
@@ -2082,12 +2067,9 @@ public async Task<HttpOperationResponse> PutLocalNegativeOffsetMinDateTimeWithHt
 
             // Serialize Request
             string _requestContent = null;
-            if(datetimeBody != null)
-            {
-                _requestContent = SafeJsonConvert.SerializeObject(datetimeBody, this.Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
+            _requestContent = SafeJsonConvert.SerializeObject(datetimeBody, this.Client.SerializationSettings);
+            _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+            _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             // Send Request
             if (_shouldTrace)
             {
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDateTimeRfc1123/Datetimerfc1123.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDateTimeRfc1123/Datetimerfc1123.cs
index 068aced56df75..2506c533d5633 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDateTimeRfc1123/Datetimerfc1123.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDateTimeRfc1123/Datetimerfc1123.cs
@@ -574,12 +574,9 @@ public async Task<HttpOperationResponse> PutUtcMaxDateTimeWithHttpMessagesAsync(
 
             // Serialize Request
             string _requestContent = null;
-            if(datetimeBody != null)
-            {
-                _requestContent = SafeJsonConvert.SerializeObject(datetimeBody, new DateTimeRfc1123JsonConverter());
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
+            _requestContent = SafeJsonConvert.SerializeObject(datetimeBody, new DateTimeRfc1123JsonConverter());
+            _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+            _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             // Send Request
             if (_shouldTrace)
             {
@@ -922,12 +919,9 @@ public async Task<HttpOperationResponse> PutUtcMinDateTimeWithHttpMessagesAsync(
 
             // Serialize Request
             string _requestContent = null;
-            if(datetimeBody != null)
-            {
-                _requestContent = SafeJsonConvert.SerializeObject(datetimeBody, new DateTimeRfc1123JsonConverter());
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
+            _requestContent = SafeJsonConvert.SerializeObject(datetimeBody, new DateTimeRfc1123JsonConverter());
+            _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+            _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             // Send Request
             if (_shouldTrace)
             {
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDuration/Duration.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDuration/Duration.cs
index 42b50edf64d33..7893ed1ee8506 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDuration/Duration.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDuration/Duration.cs
@@ -217,12 +217,9 @@ public async Task<HttpOperationResponse> PutPositiveDurationWithHttpMessagesAsyn
 
             // Serialize Request
             string _requestContent = null;
-            if(durationBody != null)
-            {
-                _requestContent = SafeJsonConvert.SerializeObject(durationBody, this.Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
+            _requestContent = SafeJsonConvert.SerializeObject(durationBody, this.Client.SerializationSettings);
+            _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+            _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             // Send Request
             if (_shouldTrace)
             {
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyInteger/IIntModel.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyInteger/IIntModel.cs
index 4b90323fef26b..7131504bb1855 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyInteger/IIntModel.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyInteger/IIntModel.cs
@@ -129,5 +129,47 @@ public partial interface IIntModel
         /// The cancellation token.
         /// </param>
         Task<HttpOperationResponse> PutMin64WithHttpMessagesAsync(long intBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Get datetime encoded as Unix time value
+        /// </summary>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        Task<HttpOperationResponse<DateTime?>> GetUnixTimeWithHttpMessagesAsync(Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Put datetime encoded as Unix time
+        /// </summary>
+        /// <param name='intBody'>
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        Task<HttpOperationResponse> PutUnixTimeDateWithHttpMessagesAsync(DateTime intBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Get invalid Unix time value
+        /// </summary>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        Task<HttpOperationResponse<DateTime?>> GetInvalidUnixTimeWithHttpMessagesAsync(Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Get null Unix time value
+        /// </summary>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        Task<HttpOperationResponse<DateTime?>> GetNullUnixTimeWithHttpMessagesAsync(Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
     }
 }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyInteger/IntModel.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyInteger/IntModel.cs
index feb0d3013f373..03b6a56c686c0 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyInteger/IntModel.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyInteger/IntModel.cs
@@ -812,12 +812,9 @@ public async Task<HttpOperationResponse> PutMax32WithHttpMessagesAsync(int intBo
 
             // Serialize Request
             string _requestContent = null;
-            if(intBody != null)
-            {
-                _requestContent = SafeJsonConvert.SerializeObject(intBody, this.Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
+            _requestContent = SafeJsonConvert.SerializeObject(intBody, this.Client.SerializationSettings);
+            _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+            _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             // Send Request
             if (_shouldTrace)
             {
@@ -922,12 +919,9 @@ public async Task<HttpOperationResponse> PutMax64WithHttpMessagesAsync(long intB
 
             // Serialize Request
             string _requestContent = null;
-            if(intBody != null)
-            {
-                _requestContent = SafeJsonConvert.SerializeObject(intBody, this.Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
+            _requestContent = SafeJsonConvert.SerializeObject(intBody, this.Client.SerializationSettings);
+            _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+            _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             // Send Request
             if (_shouldTrace)
             {
@@ -1032,12 +1026,9 @@ public async Task<HttpOperationResponse> PutMin32WithHttpMessagesAsync(int intBo
 
             // Serialize Request
             string _requestContent = null;
-            if(intBody != null)
-            {
-                _requestContent = SafeJsonConvert.SerializeObject(intBody, this.Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
+            _requestContent = SafeJsonConvert.SerializeObject(intBody, this.Client.SerializationSettings);
+            _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+            _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             // Send Request
             if (_shouldTrace)
             {
@@ -1142,12 +1133,235 @@ public async Task<HttpOperationResponse> PutMin64WithHttpMessagesAsync(long intB
 
             // Serialize Request
             string _requestContent = null;
-            if(intBody != null)
+            _requestContent = SafeJsonConvert.SerializeObject(intBody, this.Client.SerializationSettings);
+            _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+            _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+            // Send Request
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
+            }
+            cancellationToken.ThrowIfCancellationRequested();
+            _httpResponse = await this.Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
+            }
+            HttpStatusCode _statusCode = _httpResponse.StatusCode;
+            cancellationToken.ThrowIfCancellationRequested();
+            string _responseContent = null;
+            if ((int)_statusCode != 200)
+            {
+                var ex = new ErrorException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    Error _errorBody = SafeJsonConvert.DeserializeObject<Error>(_responseContent, this.Client.DeserializationSettings);
+                    if (_errorBody != null)
+                    {
+                        ex.Body = _errorBody;
+                    }
+                }
+                catch (JsonException)
+                {
+                    // Ignore the exception
+                }
+                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
+                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
+                if (_shouldTrace)
+                {
+                    ServiceClientTracing.Error(_invocationId, ex);
+                }
+                _httpRequest.Dispose();
+                if (_httpResponse != null)
+                {
+                    _httpResponse.Dispose();
+                }
+                throw ex;
+            }
+            // Create Result
+            var _result = new HttpOperationResponse();
+            _result.Request = _httpRequest;
+            _result.Response = _httpResponse;
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.Exit(_invocationId, _result);
+            }
+            return _result;
+        }
+
+        /// <summary>
+        /// Get datetime encoded as Unix time value
+        /// </summary>
+        /// <param name='customHeaders'>
+        /// Headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <return>
+        /// A response object containing the response body and response headers.
+        /// </return>
+        public async Task<HttpOperationResponse<DateTime?>> GetUnixTimeWithHttpMessagesAsync(Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            // Tracing
+            bool _shouldTrace = ServiceClientTracing.IsEnabled;
+            string _invocationId = null;
+            if (_shouldTrace)
+            {
+                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
+                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
+                tracingParameters.Add("cancellationToken", cancellationToken);
+                ServiceClientTracing.Enter(_invocationId, this, "GetUnixTime", tracingParameters);
+            }
+            // Construct URL
+            var _baseUrl = this.Client.BaseUri.AbsoluteUri;
+            var _url = new Uri(new Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "int/unixtime").ToString();
+            // Create HTTP transport objects
+            HttpRequestMessage _httpRequest = new HttpRequestMessage();
+            HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.RequestUri = new Uri(_url);
+            // Set Headers
+            if (customHeaders != null)
+            {
+                foreach(var _header in customHeaders)
+                {
+                    if (_httpRequest.Headers.Contains(_header.Key))
+                    {
+                        _httpRequest.Headers.Remove(_header.Key);
+                    }
+                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
+                }
+            }
+
+            // Serialize Request
+            string _requestContent = null;
+            // Send Request
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
+            }
+            cancellationToken.ThrowIfCancellationRequested();
+            _httpResponse = await this.Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            if (_shouldTrace)
             {
-                _requestContent = SafeJsonConvert.SerializeObject(intBody, this.Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
+            }
+            HttpStatusCode _statusCode = _httpResponse.StatusCode;
+            cancellationToken.ThrowIfCancellationRequested();
+            string _responseContent = null;
+            if ((int)_statusCode != 200)
+            {
+                var ex = new ErrorException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    Error _errorBody = SafeJsonConvert.DeserializeObject<Error>(_responseContent, this.Client.DeserializationSettings);
+                    if (_errorBody != null)
+                    {
+                        ex.Body = _errorBody;
+                    }
+                }
+                catch (JsonException)
+                {
+                    // Ignore the exception
+                }
+                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
+                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
+                if (_shouldTrace)
+                {
+                    ServiceClientTracing.Error(_invocationId, ex);
+                }
+                _httpRequest.Dispose();
+                if (_httpResponse != null)
+                {
+                    _httpResponse.Dispose();
+                }
+                throw ex;
+            }
+            // Create Result
+            var _result = new HttpOperationResponse<DateTime?>();
+            _result.Request = _httpRequest;
+            _result.Response = _httpResponse;
+            // Deserialize Response
+            if ((int)_statusCode == 200)
+            {
+                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                try
+                {
+                    _result.Body = SafeJsonConvert.DeserializeObject<DateTime?>(_responseContent, new UnixTimeJsonConverter());
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
             }
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.Exit(_invocationId, _result);
+            }
+            return _result;
+        }
+
+        /// <summary>
+        /// Put datetime encoded as Unix time
+        /// </summary>
+        /// <param name='intBody'>
+        /// </param>
+        /// <param name='customHeaders'>
+        /// Headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <return>
+        /// A response object containing the response body and response headers.
+        /// </return>
+        public async Task<HttpOperationResponse> PutUnixTimeDateWithHttpMessagesAsync(DateTime intBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            // Tracing
+            bool _shouldTrace = ServiceClientTracing.IsEnabled;
+            string _invocationId = null;
+            if (_shouldTrace)
+            {
+                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
+                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
+                tracingParameters.Add("intBody", intBody);
+                tracingParameters.Add("cancellationToken", cancellationToken);
+                ServiceClientTracing.Enter(_invocationId, this, "PutUnixTimeDate", tracingParameters);
+            }
+            // Construct URL
+            var _baseUrl = this.Client.BaseUri.AbsoluteUri;
+            var _url = new Uri(new Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "int/unixtime").ToString();
+            // Create HTTP transport objects
+            HttpRequestMessage _httpRequest = new HttpRequestMessage();
+            HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new HttpMethod("PUT");
+            _httpRequest.RequestUri = new Uri(_url);
+            // Set Headers
+            if (customHeaders != null)
+            {
+                foreach(var _header in customHeaders)
+                {
+                    if (_httpRequest.Headers.Contains(_header.Key))
+                    {
+                        _httpRequest.Headers.Remove(_header.Key);
+                    }
+                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
+                }
+            }
+
+            // Serialize Request
+            string _requestContent = null;
+            _requestContent = SafeJsonConvert.SerializeObject(intBody, new UnixTimeJsonConverter());
+            _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+            _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             // Send Request
             if (_shouldTrace)
             {
@@ -1202,5 +1416,243 @@ public async Task<HttpOperationResponse> PutMin64WithHttpMessagesAsync(long intB
             return _result;
         }
 
+        /// <summary>
+        /// Get invalid Unix time value
+        /// </summary>
+        /// <param name='customHeaders'>
+        /// Headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <return>
+        /// A response object containing the response body and response headers.
+        /// </return>
+        public async Task<HttpOperationResponse<DateTime?>> GetInvalidUnixTimeWithHttpMessagesAsync(Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            // Tracing
+            bool _shouldTrace = ServiceClientTracing.IsEnabled;
+            string _invocationId = null;
+            if (_shouldTrace)
+            {
+                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
+                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
+                tracingParameters.Add("cancellationToken", cancellationToken);
+                ServiceClientTracing.Enter(_invocationId, this, "GetInvalidUnixTime", tracingParameters);
+            }
+            // Construct URL
+            var _baseUrl = this.Client.BaseUri.AbsoluteUri;
+            var _url = new Uri(new Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "int/invalidunixtime").ToString();
+            // Create HTTP transport objects
+            HttpRequestMessage _httpRequest = new HttpRequestMessage();
+            HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.RequestUri = new Uri(_url);
+            // Set Headers
+            if (customHeaders != null)
+            {
+                foreach(var _header in customHeaders)
+                {
+                    if (_httpRequest.Headers.Contains(_header.Key))
+                    {
+                        _httpRequest.Headers.Remove(_header.Key);
+                    }
+                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
+                }
+            }
+
+            // Serialize Request
+            string _requestContent = null;
+            // Send Request
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
+            }
+            cancellationToken.ThrowIfCancellationRequested();
+            _httpResponse = await this.Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
+            }
+            HttpStatusCode _statusCode = _httpResponse.StatusCode;
+            cancellationToken.ThrowIfCancellationRequested();
+            string _responseContent = null;
+            if ((int)_statusCode != 200)
+            {
+                var ex = new ErrorException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    Error _errorBody = SafeJsonConvert.DeserializeObject<Error>(_responseContent, this.Client.DeserializationSettings);
+                    if (_errorBody != null)
+                    {
+                        ex.Body = _errorBody;
+                    }
+                }
+                catch (JsonException)
+                {
+                    // Ignore the exception
+                }
+                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
+                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
+                if (_shouldTrace)
+                {
+                    ServiceClientTracing.Error(_invocationId, ex);
+                }
+                _httpRequest.Dispose();
+                if (_httpResponse != null)
+                {
+                    _httpResponse.Dispose();
+                }
+                throw ex;
+            }
+            // Create Result
+            var _result = new HttpOperationResponse<DateTime?>();
+            _result.Request = _httpRequest;
+            _result.Response = _httpResponse;
+            // Deserialize Response
+            if ((int)_statusCode == 200)
+            {
+                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                try
+                {
+                    _result.Body = SafeJsonConvert.DeserializeObject<DateTime?>(_responseContent, new UnixTimeJsonConverter());
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.Exit(_invocationId, _result);
+            }
+            return _result;
+        }
+
+        /// <summary>
+        /// Get null Unix time value
+        /// </summary>
+        /// <param name='customHeaders'>
+        /// Headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <return>
+        /// A response object containing the response body and response headers.
+        /// </return>
+        public async Task<HttpOperationResponse<DateTime?>> GetNullUnixTimeWithHttpMessagesAsync(Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            // Tracing
+            bool _shouldTrace = ServiceClientTracing.IsEnabled;
+            string _invocationId = null;
+            if (_shouldTrace)
+            {
+                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
+                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
+                tracingParameters.Add("cancellationToken", cancellationToken);
+                ServiceClientTracing.Enter(_invocationId, this, "GetNullUnixTime", tracingParameters);
+            }
+            // Construct URL
+            var _baseUrl = this.Client.BaseUri.AbsoluteUri;
+            var _url = new Uri(new Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "int/nullunixtime").ToString();
+            // Create HTTP transport objects
+            HttpRequestMessage _httpRequest = new HttpRequestMessage();
+            HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.RequestUri = new Uri(_url);
+            // Set Headers
+            if (customHeaders != null)
+            {
+                foreach(var _header in customHeaders)
+                {
+                    if (_httpRequest.Headers.Contains(_header.Key))
+                    {
+                        _httpRequest.Headers.Remove(_header.Key);
+                    }
+                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
+                }
+            }
+
+            // Serialize Request
+            string _requestContent = null;
+            // Send Request
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
+            }
+            cancellationToken.ThrowIfCancellationRequested();
+            _httpResponse = await this.Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
+            }
+            HttpStatusCode _statusCode = _httpResponse.StatusCode;
+            cancellationToken.ThrowIfCancellationRequested();
+            string _responseContent = null;
+            if ((int)_statusCode != 200)
+            {
+                var ex = new ErrorException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    Error _errorBody = SafeJsonConvert.DeserializeObject<Error>(_responseContent, this.Client.DeserializationSettings);
+                    if (_errorBody != null)
+                    {
+                        ex.Body = _errorBody;
+                    }
+                }
+                catch (JsonException)
+                {
+                    // Ignore the exception
+                }
+                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
+                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
+                if (_shouldTrace)
+                {
+                    ServiceClientTracing.Error(_invocationId, ex);
+                }
+                _httpRequest.Dispose();
+                if (_httpResponse != null)
+                {
+                    _httpResponse.Dispose();
+                }
+                throw ex;
+            }
+            // Create Result
+            var _result = new HttpOperationResponse<DateTime?>();
+            _result.Request = _httpRequest;
+            _result.Response = _httpResponse;
+            // Deserialize Response
+            if ((int)_statusCode == 200)
+            {
+                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                try
+                {
+                    _result.Body = SafeJsonConvert.DeserializeObject<DateTime?>(_responseContent, new UnixTimeJsonConverter());
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.Exit(_invocationId, _result);
+            }
+            return _result;
+        }
+
     }
 }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyInteger/IntModelExtensions.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyInteger/IntModelExtensions.cs
index 0c57e20b0aade..c0bc0812ebde8 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyInteger/IntModelExtensions.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyInteger/IntModelExtensions.cs
@@ -305,5 +305,118 @@ public static async Task PutMin64Async(this IIntModel operations, long intBody,
                 await operations.PutMin64WithHttpMessagesAsync(intBody, null, cancellationToken).ConfigureAwait(false);
             }
 
+            /// <summary>
+            /// Get datetime encoded as Unix time value
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            public static DateTime? GetUnixTime(this IIntModel operations)
+            {
+                return Task.Factory.StartNew(s => ((IIntModel)s).GetUnixTimeAsync(), operations, CancellationToken.None, TaskCreationOptions.None, TaskScheduler.Default).Unwrap().GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Get datetime encoded as Unix time value
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='cancellationToken'>
+            /// The cancellation token.
+            /// </param>
+            public static async Task<DateTime?> GetUnixTimeAsync(this IIntModel operations, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.GetUnixTimeWithHttpMessagesAsync(null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
+            /// <summary>
+            /// Put datetime encoded as Unix time
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='intBody'>
+            /// </param>
+            public static void PutUnixTimeDate(this IIntModel operations, DateTime intBody)
+            {
+                Task.Factory.StartNew(s => ((IIntModel)s).PutUnixTimeDateAsync(intBody), operations, CancellationToken.None, TaskCreationOptions.None, TaskScheduler.Default).Unwrap().GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Put datetime encoded as Unix time
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='intBody'>
+            /// </param>
+            /// <param name='cancellationToken'>
+            /// The cancellation token.
+            /// </param>
+            public static async Task PutUnixTimeDateAsync(this IIntModel operations, DateTime intBody, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                await operations.PutUnixTimeDateWithHttpMessagesAsync(intBody, null, cancellationToken).ConfigureAwait(false);
+            }
+
+            /// <summary>
+            /// Get invalid Unix time value
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            public static DateTime? GetInvalidUnixTime(this IIntModel operations)
+            {
+                return Task.Factory.StartNew(s => ((IIntModel)s).GetInvalidUnixTimeAsync(), operations, CancellationToken.None, TaskCreationOptions.None, TaskScheduler.Default).Unwrap().GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Get invalid Unix time value
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='cancellationToken'>
+            /// The cancellation token.
+            /// </param>
+            public static async Task<DateTime?> GetInvalidUnixTimeAsync(this IIntModel operations, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.GetInvalidUnixTimeWithHttpMessagesAsync(null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
+            /// <summary>
+            /// Get null Unix time value
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            public static DateTime? GetNullUnixTime(this IIntModel operations)
+            {
+                return Task.Factory.StartNew(s => ((IIntModel)s).GetNullUnixTimeAsync(), operations, CancellationToken.None, TaskCreationOptions.None, TaskScheduler.Default).Unwrap().GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Get null Unix time value
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='cancellationToken'>
+            /// The cancellation token.
+            /// </param>
+            public static async Task<DateTime?> GetNullUnixTimeAsync(this IIntModel operations, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.GetNullUnixTimeWithHttpMessagesAsync(null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
     }
 }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyNumber/Number.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyNumber/Number.cs
index 4b60b5582025a..dc98d33d86449 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyNumber/Number.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyNumber/Number.cs
@@ -574,12 +574,9 @@ public async Task<HttpOperationResponse> PutBigFloatWithHttpMessagesAsync(double
 
             // Serialize Request
             string _requestContent = null;
-            if(numberBody != null)
-            {
-                _requestContent = SafeJsonConvert.SerializeObject(numberBody, this.Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
+            _requestContent = SafeJsonConvert.SerializeObject(numberBody, this.Client.SerializationSettings);
+            _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+            _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             // Send Request
             if (_shouldTrace)
             {
@@ -803,12 +800,9 @@ public async Task<HttpOperationResponse> PutBigDoubleWithHttpMessagesAsync(doubl
 
             // Serialize Request
             string _requestContent = null;
-            if(numberBody != null)
-            {
-                _requestContent = SafeJsonConvert.SerializeObject(numberBody, this.Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
+            _requestContent = SafeJsonConvert.SerializeObject(numberBody, this.Client.SerializationSettings);
+            _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+            _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             // Send Request
             if (_shouldTrace)
             {
@@ -1032,12 +1026,9 @@ public async Task<HttpOperationResponse> PutBigDoublePositiveDecimalWithHttpMess
 
             // Serialize Request
             string _requestContent = null;
-            if(numberBody != null)
-            {
-                _requestContent = SafeJsonConvert.SerializeObject(numberBody, this.Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
+            _requestContent = SafeJsonConvert.SerializeObject(numberBody, this.Client.SerializationSettings);
+            _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+            _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             // Send Request
             if (_shouldTrace)
             {
@@ -1261,12 +1252,9 @@ public async Task<HttpOperationResponse> PutBigDoubleNegativeDecimalWithHttpMess
 
             // Serialize Request
             string _requestContent = null;
-            if(numberBody != null)
-            {
-                _requestContent = SafeJsonConvert.SerializeObject(numberBody, this.Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
+            _requestContent = SafeJsonConvert.SerializeObject(numberBody, this.Client.SerializationSettings);
+            _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+            _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             // Send Request
             if (_shouldTrace)
             {
@@ -1490,12 +1478,9 @@ public async Task<HttpOperationResponse> PutBigDecimalWithHttpMessagesAsync(deci
 
             // Serialize Request
             string _requestContent = null;
-            if(numberBody != null)
-            {
-                _requestContent = SafeJsonConvert.SerializeObject(numberBody, this.Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
+            _requestContent = SafeJsonConvert.SerializeObject(numberBody, this.Client.SerializationSettings);
+            _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+            _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             // Send Request
             if (_shouldTrace)
             {
@@ -1719,12 +1704,9 @@ public async Task<HttpOperationResponse> PutBigDecimalPositiveDecimalWithHttpMes
 
             // Serialize Request
             string _requestContent = null;
-            if(numberBody != null)
-            {
-                _requestContent = SafeJsonConvert.SerializeObject(numberBody, this.Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
+            _requestContent = SafeJsonConvert.SerializeObject(numberBody, this.Client.SerializationSettings);
+            _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+            _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             // Send Request
             if (_shouldTrace)
             {
@@ -1948,12 +1930,9 @@ public async Task<HttpOperationResponse> PutBigDecimalNegativeDecimalWithHttpMes
 
             // Serialize Request
             string _requestContent = null;
-            if(numberBody != null)
-            {
-                _requestContent = SafeJsonConvert.SerializeObject(numberBody, this.Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
+            _requestContent = SafeJsonConvert.SerializeObject(numberBody, this.Client.SerializationSettings);
+            _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+            _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             // Send Request
             if (_shouldTrace)
             {
@@ -2177,12 +2156,9 @@ public async Task<HttpOperationResponse> PutSmallFloatWithHttpMessagesAsync(doub
 
             // Serialize Request
             string _requestContent = null;
-            if(numberBody != null)
-            {
-                _requestContent = SafeJsonConvert.SerializeObject(numberBody, this.Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
+            _requestContent = SafeJsonConvert.SerializeObject(numberBody, this.Client.SerializationSettings);
+            _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+            _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             // Send Request
             if (_shouldTrace)
             {
@@ -2406,12 +2382,9 @@ public async Task<HttpOperationResponse> PutSmallDoubleWithHttpMessagesAsync(dou
 
             // Serialize Request
             string _requestContent = null;
-            if(numberBody != null)
-            {
-                _requestContent = SafeJsonConvert.SerializeObject(numberBody, this.Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
+            _requestContent = SafeJsonConvert.SerializeObject(numberBody, this.Client.SerializationSettings);
+            _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+            _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             // Send Request
             if (_shouldTrace)
             {
@@ -2635,12 +2608,9 @@ public async Task<HttpOperationResponse> PutSmallDecimalWithHttpMessagesAsync(de
 
             // Serialize Request
             string _requestContent = null;
-            if(numberBody != null)
-            {
-                _requestContent = SafeJsonConvert.SerializeObject(numberBody, this.Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
+            _requestContent = SafeJsonConvert.SerializeObject(numberBody, this.Client.SerializationSettings);
+            _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+            _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             // Send Request
             if (_shouldTrace)
             {
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyString/EnumModel.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyString/EnumModel.cs
index 8861a350c04b9..c1701bfb31ad1 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyString/EnumModel.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyString/EnumModel.cs
@@ -220,12 +220,9 @@ public async Task<HttpOperationResponse> PutNotExpandableWithHttpMessagesAsync(C
 
             // Serialize Request
             string _requestContent = null;
-            if(stringBody != null)
-            {
-                _requestContent = SafeJsonConvert.SerializeObject(stringBody, this.Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
+            _requestContent = SafeJsonConvert.SerializeObject(stringBody, this.Client.SerializationSettings);
+            _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+            _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             // Send Request
             if (_shouldTrace)
             {
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CompositeBoolIntClient/BoolModel.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CompositeBoolIntClient/BoolModel.cs
index 22ff99e128385..9c761510fc304 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CompositeBoolIntClient/BoolModel.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CompositeBoolIntClient/BoolModel.cs
@@ -217,12 +217,9 @@ public async Task<HttpOperationResponse> PutTrueWithHttpMessagesAsync(bool boolB
 
             // Serialize Request
             string _requestContent = null;
-            if(boolBody != null)
-            {
-                _requestContent = SafeJsonConvert.SerializeObject(boolBody, this.Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
+            _requestContent = SafeJsonConvert.SerializeObject(boolBody, this.Client.SerializationSettings);
+            _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+            _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             // Send Request
             if (_shouldTrace)
             {
@@ -446,12 +443,9 @@ public async Task<HttpOperationResponse> PutFalseWithHttpMessagesAsync(bool bool
 
             // Serialize Request
             string _requestContent = null;
-            if(boolBody != null)
-            {
-                _requestContent = SafeJsonConvert.SerializeObject(boolBody, this.Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
+            _requestContent = SafeJsonConvert.SerializeObject(boolBody, this.Client.SerializationSettings);
+            _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+            _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             // Send Request
             if (_shouldTrace)
             {
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CompositeBoolIntClient/IIntModel.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CompositeBoolIntClient/IIntModel.cs
index 4917e355224d7..d0b518478669c 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CompositeBoolIntClient/IIntModel.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CompositeBoolIntClient/IIntModel.cs
@@ -129,5 +129,47 @@ public partial interface IIntModel
         /// The cancellation token.
         /// </param>
         Task<HttpOperationResponse> PutMin64WithHttpMessagesAsync(long intBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Get datetime encoded as Unix time value
+        /// </summary>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        Task<HttpOperationResponse<DateTime?>> GetUnixTimeWithHttpMessagesAsync(Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Put datetime encoded as Unix time
+        /// </summary>
+        /// <param name='intBody'>
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        Task<HttpOperationResponse> PutUnixTimeDateWithHttpMessagesAsync(DateTime intBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Get invalid Unix time value
+        /// </summary>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        Task<HttpOperationResponse<DateTime?>> GetInvalidUnixTimeWithHttpMessagesAsync(Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Get null Unix time value
+        /// </summary>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        Task<HttpOperationResponse<DateTime?>> GetNullUnixTimeWithHttpMessagesAsync(Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
     }
 }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CompositeBoolIntClient/IntModel.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CompositeBoolIntClient/IntModel.cs
index 1ed42f86ca54e..c730d55f15474 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CompositeBoolIntClient/IntModel.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CompositeBoolIntClient/IntModel.cs
@@ -812,12 +812,9 @@ public async Task<HttpOperationResponse> PutMax32WithHttpMessagesAsync(int intBo
 
             // Serialize Request
             string _requestContent = null;
-            if(intBody != null)
-            {
-                _requestContent = SafeJsonConvert.SerializeObject(intBody, this.Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
+            _requestContent = SafeJsonConvert.SerializeObject(intBody, this.Client.SerializationSettings);
+            _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+            _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             // Send Request
             if (_shouldTrace)
             {
@@ -922,12 +919,9 @@ public async Task<HttpOperationResponse> PutMax64WithHttpMessagesAsync(long intB
 
             // Serialize Request
             string _requestContent = null;
-            if(intBody != null)
-            {
-                _requestContent = SafeJsonConvert.SerializeObject(intBody, this.Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
+            _requestContent = SafeJsonConvert.SerializeObject(intBody, this.Client.SerializationSettings);
+            _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+            _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             // Send Request
             if (_shouldTrace)
             {
@@ -1032,12 +1026,9 @@ public async Task<HttpOperationResponse> PutMin32WithHttpMessagesAsync(int intBo
 
             // Serialize Request
             string _requestContent = null;
-            if(intBody != null)
-            {
-                _requestContent = SafeJsonConvert.SerializeObject(intBody, this.Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
+            _requestContent = SafeJsonConvert.SerializeObject(intBody, this.Client.SerializationSettings);
+            _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+            _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             // Send Request
             if (_shouldTrace)
             {
@@ -1142,12 +1133,235 @@ public async Task<HttpOperationResponse> PutMin64WithHttpMessagesAsync(long intB
 
             // Serialize Request
             string _requestContent = null;
-            if(intBody != null)
+            _requestContent = SafeJsonConvert.SerializeObject(intBody, this.Client.SerializationSettings);
+            _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+            _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+            // Send Request
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
+            }
+            cancellationToken.ThrowIfCancellationRequested();
+            _httpResponse = await this.Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
+            }
+            HttpStatusCode _statusCode = _httpResponse.StatusCode;
+            cancellationToken.ThrowIfCancellationRequested();
+            string _responseContent = null;
+            if ((int)_statusCode != 200)
+            {
+                var ex = new ErrorException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    Error _errorBody = SafeJsonConvert.DeserializeObject<Error>(_responseContent, this.Client.DeserializationSettings);
+                    if (_errorBody != null)
+                    {
+                        ex.Body = _errorBody;
+                    }
+                }
+                catch (JsonException)
+                {
+                    // Ignore the exception
+                }
+                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
+                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
+                if (_shouldTrace)
+                {
+                    ServiceClientTracing.Error(_invocationId, ex);
+                }
+                _httpRequest.Dispose();
+                if (_httpResponse != null)
+                {
+                    _httpResponse.Dispose();
+                }
+                throw ex;
+            }
+            // Create Result
+            var _result = new HttpOperationResponse();
+            _result.Request = _httpRequest;
+            _result.Response = _httpResponse;
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.Exit(_invocationId, _result);
+            }
+            return _result;
+        }
+
+        /// <summary>
+        /// Get datetime encoded as Unix time value
+        /// </summary>
+        /// <param name='customHeaders'>
+        /// Headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <return>
+        /// A response object containing the response body and response headers.
+        /// </return>
+        public async Task<HttpOperationResponse<DateTime?>> GetUnixTimeWithHttpMessagesAsync(Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            // Tracing
+            bool _shouldTrace = ServiceClientTracing.IsEnabled;
+            string _invocationId = null;
+            if (_shouldTrace)
+            {
+                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
+                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
+                tracingParameters.Add("cancellationToken", cancellationToken);
+                ServiceClientTracing.Enter(_invocationId, this, "GetUnixTime", tracingParameters);
+            }
+            // Construct URL
+            var _baseUrl = this.Client.BaseUri.AbsoluteUri;
+            var _url = new Uri(new Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "int/unixtime").ToString();
+            // Create HTTP transport objects
+            HttpRequestMessage _httpRequest = new HttpRequestMessage();
+            HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.RequestUri = new Uri(_url);
+            // Set Headers
+            if (customHeaders != null)
+            {
+                foreach(var _header in customHeaders)
+                {
+                    if (_httpRequest.Headers.Contains(_header.Key))
+                    {
+                        _httpRequest.Headers.Remove(_header.Key);
+                    }
+                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
+                }
+            }
+
+            // Serialize Request
+            string _requestContent = null;
+            // Send Request
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
+            }
+            cancellationToken.ThrowIfCancellationRequested();
+            _httpResponse = await this.Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            if (_shouldTrace)
             {
-                _requestContent = SafeJsonConvert.SerializeObject(intBody, this.Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
+            }
+            HttpStatusCode _statusCode = _httpResponse.StatusCode;
+            cancellationToken.ThrowIfCancellationRequested();
+            string _responseContent = null;
+            if ((int)_statusCode != 200)
+            {
+                var ex = new ErrorException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    Error _errorBody = SafeJsonConvert.DeserializeObject<Error>(_responseContent, this.Client.DeserializationSettings);
+                    if (_errorBody != null)
+                    {
+                        ex.Body = _errorBody;
+                    }
+                }
+                catch (JsonException)
+                {
+                    // Ignore the exception
+                }
+                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
+                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
+                if (_shouldTrace)
+                {
+                    ServiceClientTracing.Error(_invocationId, ex);
+                }
+                _httpRequest.Dispose();
+                if (_httpResponse != null)
+                {
+                    _httpResponse.Dispose();
+                }
+                throw ex;
+            }
+            // Create Result
+            var _result = new HttpOperationResponse<DateTime?>();
+            _result.Request = _httpRequest;
+            _result.Response = _httpResponse;
+            // Deserialize Response
+            if ((int)_statusCode == 200)
+            {
+                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                try
+                {
+                    _result.Body = SafeJsonConvert.DeserializeObject<DateTime?>(_responseContent, new UnixTimeJsonConverter());
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
             }
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.Exit(_invocationId, _result);
+            }
+            return _result;
+        }
+
+        /// <summary>
+        /// Put datetime encoded as Unix time
+        /// </summary>
+        /// <param name='intBody'>
+        /// </param>
+        /// <param name='customHeaders'>
+        /// Headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <return>
+        /// A response object containing the response body and response headers.
+        /// </return>
+        public async Task<HttpOperationResponse> PutUnixTimeDateWithHttpMessagesAsync(DateTime intBody, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            // Tracing
+            bool _shouldTrace = ServiceClientTracing.IsEnabled;
+            string _invocationId = null;
+            if (_shouldTrace)
+            {
+                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
+                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
+                tracingParameters.Add("intBody", intBody);
+                tracingParameters.Add("cancellationToken", cancellationToken);
+                ServiceClientTracing.Enter(_invocationId, this, "PutUnixTimeDate", tracingParameters);
+            }
+            // Construct URL
+            var _baseUrl = this.Client.BaseUri.AbsoluteUri;
+            var _url = new Uri(new Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "int/unixtime").ToString();
+            // Create HTTP transport objects
+            HttpRequestMessage _httpRequest = new HttpRequestMessage();
+            HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new HttpMethod("PUT");
+            _httpRequest.RequestUri = new Uri(_url);
+            // Set Headers
+            if (customHeaders != null)
+            {
+                foreach(var _header in customHeaders)
+                {
+                    if (_httpRequest.Headers.Contains(_header.Key))
+                    {
+                        _httpRequest.Headers.Remove(_header.Key);
+                    }
+                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
+                }
+            }
+
+            // Serialize Request
+            string _requestContent = null;
+            _requestContent = SafeJsonConvert.SerializeObject(intBody, new UnixTimeJsonConverter());
+            _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+            _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             // Send Request
             if (_shouldTrace)
             {
@@ -1202,5 +1416,243 @@ public async Task<HttpOperationResponse> PutMin64WithHttpMessagesAsync(long intB
             return _result;
         }
 
+        /// <summary>
+        /// Get invalid Unix time value
+        /// </summary>
+        /// <param name='customHeaders'>
+        /// Headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <return>
+        /// A response object containing the response body and response headers.
+        /// </return>
+        public async Task<HttpOperationResponse<DateTime?>> GetInvalidUnixTimeWithHttpMessagesAsync(Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            // Tracing
+            bool _shouldTrace = ServiceClientTracing.IsEnabled;
+            string _invocationId = null;
+            if (_shouldTrace)
+            {
+                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
+                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
+                tracingParameters.Add("cancellationToken", cancellationToken);
+                ServiceClientTracing.Enter(_invocationId, this, "GetInvalidUnixTime", tracingParameters);
+            }
+            // Construct URL
+            var _baseUrl = this.Client.BaseUri.AbsoluteUri;
+            var _url = new Uri(new Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "int/invalidunixtime").ToString();
+            // Create HTTP transport objects
+            HttpRequestMessage _httpRequest = new HttpRequestMessage();
+            HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.RequestUri = new Uri(_url);
+            // Set Headers
+            if (customHeaders != null)
+            {
+                foreach(var _header in customHeaders)
+                {
+                    if (_httpRequest.Headers.Contains(_header.Key))
+                    {
+                        _httpRequest.Headers.Remove(_header.Key);
+                    }
+                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
+                }
+            }
+
+            // Serialize Request
+            string _requestContent = null;
+            // Send Request
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
+            }
+            cancellationToken.ThrowIfCancellationRequested();
+            _httpResponse = await this.Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
+            }
+            HttpStatusCode _statusCode = _httpResponse.StatusCode;
+            cancellationToken.ThrowIfCancellationRequested();
+            string _responseContent = null;
+            if ((int)_statusCode != 200)
+            {
+                var ex = new ErrorException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    Error _errorBody = SafeJsonConvert.DeserializeObject<Error>(_responseContent, this.Client.DeserializationSettings);
+                    if (_errorBody != null)
+                    {
+                        ex.Body = _errorBody;
+                    }
+                }
+                catch (JsonException)
+                {
+                    // Ignore the exception
+                }
+                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
+                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
+                if (_shouldTrace)
+                {
+                    ServiceClientTracing.Error(_invocationId, ex);
+                }
+                _httpRequest.Dispose();
+                if (_httpResponse != null)
+                {
+                    _httpResponse.Dispose();
+                }
+                throw ex;
+            }
+            // Create Result
+            var _result = new HttpOperationResponse<DateTime?>();
+            _result.Request = _httpRequest;
+            _result.Response = _httpResponse;
+            // Deserialize Response
+            if ((int)_statusCode == 200)
+            {
+                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                try
+                {
+                    _result.Body = SafeJsonConvert.DeserializeObject<DateTime?>(_responseContent, new UnixTimeJsonConverter());
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.Exit(_invocationId, _result);
+            }
+            return _result;
+        }
+
+        /// <summary>
+        /// Get null Unix time value
+        /// </summary>
+        /// <param name='customHeaders'>
+        /// Headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <return>
+        /// A response object containing the response body and response headers.
+        /// </return>
+        public async Task<HttpOperationResponse<DateTime?>> GetNullUnixTimeWithHttpMessagesAsync(Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            // Tracing
+            bool _shouldTrace = ServiceClientTracing.IsEnabled;
+            string _invocationId = null;
+            if (_shouldTrace)
+            {
+                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
+                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
+                tracingParameters.Add("cancellationToken", cancellationToken);
+                ServiceClientTracing.Enter(_invocationId, this, "GetNullUnixTime", tracingParameters);
+            }
+            // Construct URL
+            var _baseUrl = this.Client.BaseUri.AbsoluteUri;
+            var _url = new Uri(new Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "int/nullunixtime").ToString();
+            // Create HTTP transport objects
+            HttpRequestMessage _httpRequest = new HttpRequestMessage();
+            HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.RequestUri = new Uri(_url);
+            // Set Headers
+            if (customHeaders != null)
+            {
+                foreach(var _header in customHeaders)
+                {
+                    if (_httpRequest.Headers.Contains(_header.Key))
+                    {
+                        _httpRequest.Headers.Remove(_header.Key);
+                    }
+                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
+                }
+            }
+
+            // Serialize Request
+            string _requestContent = null;
+            // Send Request
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
+            }
+            cancellationToken.ThrowIfCancellationRequested();
+            _httpResponse = await this.Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
+            }
+            HttpStatusCode _statusCode = _httpResponse.StatusCode;
+            cancellationToken.ThrowIfCancellationRequested();
+            string _responseContent = null;
+            if ((int)_statusCode != 200)
+            {
+                var ex = new ErrorException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    Error _errorBody = SafeJsonConvert.DeserializeObject<Error>(_responseContent, this.Client.DeserializationSettings);
+                    if (_errorBody != null)
+                    {
+                        ex.Body = _errorBody;
+                    }
+                }
+                catch (JsonException)
+                {
+                    // Ignore the exception
+                }
+                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
+                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
+                if (_shouldTrace)
+                {
+                    ServiceClientTracing.Error(_invocationId, ex);
+                }
+                _httpRequest.Dispose();
+                if (_httpResponse != null)
+                {
+                    _httpResponse.Dispose();
+                }
+                throw ex;
+            }
+            // Create Result
+            var _result = new HttpOperationResponse<DateTime?>();
+            _result.Request = _httpRequest;
+            _result.Response = _httpResponse;
+            // Deserialize Response
+            if ((int)_statusCode == 200)
+            {
+                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                try
+                {
+                    _result.Body = SafeJsonConvert.DeserializeObject<DateTime?>(_responseContent, new UnixTimeJsonConverter());
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.Exit(_invocationId, _result);
+            }
+            return _result;
+        }
+
     }
 }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CompositeBoolIntClient/IntModelExtensions.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CompositeBoolIntClient/IntModelExtensions.cs
index a203d3cee39e7..009277ea5077b 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CompositeBoolIntClient/IntModelExtensions.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CompositeBoolIntClient/IntModelExtensions.cs
@@ -305,5 +305,118 @@ public static async Task PutMin64Async(this IIntModel operations, long intBody,
                 await operations.PutMin64WithHttpMessagesAsync(intBody, null, cancellationToken).ConfigureAwait(false);
             }
 
+            /// <summary>
+            /// Get datetime encoded as Unix time value
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            public static DateTime? GetUnixTime(this IIntModel operations)
+            {
+                return Task.Factory.StartNew(s => ((IIntModel)s).GetUnixTimeAsync(), operations, CancellationToken.None, TaskCreationOptions.None, TaskScheduler.Default).Unwrap().GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Get datetime encoded as Unix time value
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='cancellationToken'>
+            /// The cancellation token.
+            /// </param>
+            public static async Task<DateTime?> GetUnixTimeAsync(this IIntModel operations, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.GetUnixTimeWithHttpMessagesAsync(null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
+            /// <summary>
+            /// Put datetime encoded as Unix time
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='intBody'>
+            /// </param>
+            public static void PutUnixTimeDate(this IIntModel operations, DateTime intBody)
+            {
+                Task.Factory.StartNew(s => ((IIntModel)s).PutUnixTimeDateAsync(intBody), operations, CancellationToken.None, TaskCreationOptions.None, TaskScheduler.Default).Unwrap().GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Put datetime encoded as Unix time
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='intBody'>
+            /// </param>
+            /// <param name='cancellationToken'>
+            /// The cancellation token.
+            /// </param>
+            public static async Task PutUnixTimeDateAsync(this IIntModel operations, DateTime intBody, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                await operations.PutUnixTimeDateWithHttpMessagesAsync(intBody, null, cancellationToken).ConfigureAwait(false);
+            }
+
+            /// <summary>
+            /// Get invalid Unix time value
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            public static DateTime? GetInvalidUnixTime(this IIntModel operations)
+            {
+                return Task.Factory.StartNew(s => ((IIntModel)s).GetInvalidUnixTimeAsync(), operations, CancellationToken.None, TaskCreationOptions.None, TaskScheduler.Default).Unwrap().GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Get invalid Unix time value
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='cancellationToken'>
+            /// The cancellation token.
+            /// </param>
+            public static async Task<DateTime?> GetInvalidUnixTimeAsync(this IIntModel operations, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.GetInvalidUnixTimeWithHttpMessagesAsync(null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
+            /// <summary>
+            /// Get null Unix time value
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            public static DateTime? GetNullUnixTime(this IIntModel operations)
+            {
+                return Task.Factory.StartNew(s => ((IIntModel)s).GetNullUnixTimeAsync(), operations, CancellationToken.None, TaskCreationOptions.None, TaskScheduler.Default).Unwrap().GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Get null Unix time value
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='cancellationToken'>
+            /// The cancellation token.
+            /// </param>
+            public static async Task<DateTime?> GetNullUnixTimeAsync(this IIntModel operations, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.GetNullUnixTimeWithHttpMessagesAsync(null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
     }
 }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/AutoRestParameterizedCustomHostTestClient.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/AutoRestParameterizedCustomHostTestClient.cs
new file mode 100644
index 0000000000000..e680cbe6a8731
--- /dev/null
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/AutoRestParameterizedCustomHostTestClient.cs
@@ -0,0 +1,128 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+// 
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+
+namespace Fixtures.AcceptanceTestsCustomBaseUriMoreOptions
+{
+    using System;
+    using System.Linq;
+    using System.Collections.Generic;
+    using System.Diagnostics;
+    using System.Net;
+    using System.Net.Http;
+    using System.Net.Http.Headers;
+    using System.Text;
+    using System.Text.RegularExpressions;
+    using System.Threading;
+    using System.Threading.Tasks;
+    using Microsoft.Rest;
+    using Microsoft.Rest.Serialization;
+    using Newtonsoft.Json;
+    using Models;
+
+    /// <summary>
+    /// Test Infrastructure for AutoRest
+    /// </summary>
+    public partial class AutoRestParameterizedCustomHostTestClient : ServiceClient<AutoRestParameterizedCustomHostTestClient>, IAutoRestParameterizedCustomHostTestClient
+    {
+        /// <summary>
+        /// The base URI of the service.
+        /// </summary>
+        internal string BaseUri {get; set;}
+
+        /// <summary>
+        /// Gets or sets json serialization settings.
+        /// </summary>
+        public JsonSerializerSettings SerializationSettings { get; private set; }
+
+        /// <summary>
+        /// Gets or sets json deserialization settings.
+        /// </summary>
+        public JsonSerializerSettings DeserializationSettings { get; private set; }        
+
+        /// <summary>
+        /// The subscription id with value 'test12'.
+        /// </summary>
+        public string SubscriptionId { get; set; }
+
+        /// <summary>
+        /// A string value that is used as a global part of the parameterized host.
+        /// Default value 'host'.
+        /// </summary>
+        public string DnsSuffix { get; set; }
+
+        /// <summary>
+        /// Gets the IPaths.
+        /// </summary>
+        public virtual IPaths Paths { get; private set; }
+
+        /// <summary>
+        /// Initializes a new instance of the AutoRestParameterizedCustomHostTestClient class.
+        /// </summary>
+        /// <param name='handlers'>
+        /// Optional. The delegating handlers to add to the http client pipeline.
+        /// </param>
+        public AutoRestParameterizedCustomHostTestClient(params DelegatingHandler[] handlers) : base(handlers)
+        {
+            this.Initialize();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the AutoRestParameterizedCustomHostTestClient class.
+        /// </summary>
+        /// <param name='rootHandler'>
+        /// Optional. The http client handler used to handle http transport.
+        /// </param>
+        /// <param name='handlers'>
+        /// Optional. The delegating handlers to add to the http client pipeline.
+        /// </param>
+        public AutoRestParameterizedCustomHostTestClient(HttpClientHandler rootHandler, params DelegatingHandler[] handlers) : base(rootHandler, handlers)
+        {
+            this.Initialize();
+        }
+
+        /// <summary>
+        /// An optional partial-method to perform custom initialization.
+        ///</summary> 
+        partial void CustomInitialize();
+        /// <summary>
+        /// Initializes client properties.
+        /// </summary>
+        private void Initialize()
+        {
+            this.Paths = new Paths(this);
+            this.BaseUri = "{vault}{secret}{dnsSuffix}";
+            this.DnsSuffix = "host";
+            SerializationSettings = new JsonSerializerSettings
+            {
+                Formatting = Formatting.Indented,
+                DateFormatHandling = DateFormatHandling.IsoDateFormat,
+                DateTimeZoneHandling = DateTimeZoneHandling.Utc,
+                NullValueHandling = NullValueHandling.Ignore,
+                ReferenceLoopHandling = ReferenceLoopHandling.Serialize,
+                ContractResolver = new ReadOnlyJsonContractResolver(),
+                Converters = new List<JsonConverter>
+                    {
+                        new Iso8601TimeSpanConverter()
+                    }
+            };
+            DeserializationSettings = new JsonSerializerSettings
+            {
+                DateFormatHandling = DateFormatHandling.IsoDateFormat,
+                DateTimeZoneHandling = DateTimeZoneHandling.Utc,
+                NullValueHandling = NullValueHandling.Ignore,
+                ReferenceLoopHandling = ReferenceLoopHandling.Serialize,
+                ContractResolver = new ReadOnlyJsonContractResolver(),
+                Converters = new List<JsonConverter>
+                    {
+                        new Iso8601TimeSpanConverter()
+                    }
+            };
+            CustomInitialize();
+        }    
+    }
+}
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/IAutoRestParameterizedCustomHostTestClient.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/IAutoRestParameterizedCustomHostTestClient.cs
new file mode 100644
index 0000000000000..87db999d81c42
--- /dev/null
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/IAutoRestParameterizedCustomHostTestClient.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+// 
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+
+namespace Fixtures.AcceptanceTestsCustomBaseUriMoreOptions
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Net.Http;
+    using System.Threading;
+    using System.Threading.Tasks;
+    using Newtonsoft.Json;
+    using Microsoft.Rest;
+    using Models;
+
+    /// <summary>
+    /// Test Infrastructure for AutoRest
+    /// </summary>
+    public partial interface IAutoRestParameterizedCustomHostTestClient : IDisposable
+    {
+        /// <summary>
+        /// The base URI of the service.
+        /// </summary>
+
+        /// <summary>
+        /// Gets or sets json serialization settings.
+        /// </summary>
+        JsonSerializerSettings SerializationSettings { get; }
+
+        /// <summary>
+        /// Gets or sets json deserialization settings.
+        /// </summary>
+        JsonSerializerSettings DeserializationSettings { get; }
+
+        /// <summary>
+        /// The subscription id with value 'test12'.
+        /// </summary>
+        string SubscriptionId { get; set; }
+
+        /// <summary>
+        /// A string value that is used as a global part of the parameterized
+        /// host. Default value 'host'.
+        /// </summary>
+        string DnsSuffix { get; set; }
+
+
+        /// <summary>
+        /// Gets the IPaths.
+        /// </summary>
+        IPaths Paths { get; }
+
+    }
+}
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/IPaths.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/IPaths.cs
new file mode 100644
index 0000000000000..a117b914e7526
--- /dev/null
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/IPaths.cs
@@ -0,0 +1,47 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+// 
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+
+namespace Fixtures.AcceptanceTestsCustomBaseUriMoreOptions
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Net.Http;
+    using System.Threading;
+    using System.Threading.Tasks;
+    using Microsoft.Rest;
+    using Models;
+
+    /// <summary>
+    /// Paths operations.
+    /// </summary>
+    public partial interface IPaths
+    {
+        /// <summary>
+        /// Get a 200 to test a valid base uri
+        /// </summary>
+        /// <param name='vault'>
+        /// The vault name, e.g. https://myvault
+        /// </param>
+        /// <param name='secret'>
+        /// Secret value.
+        /// </param>
+        /// <param name='keyName'>
+        /// The key name with value 'key1'.
+        /// </param>
+        /// <param name='keyVersion'>
+        /// The key version. Default value 'v1'.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        Task<HttpOperationResponse> GetEmptyWithHttpMessagesAsync(string vault, string secret, string keyName, string keyVersion = "v1", Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+    }
+}
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/Models/Error.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/Models/Error.cs
new file mode 100644
index 0000000000000..82a4873e61389
--- /dev/null
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/Models/Error.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+// 
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+
+namespace Fixtures.AcceptanceTestsCustomBaseUriMoreOptions.Models
+{
+    using System;
+    using System.Linq;
+    using System.Collections.Generic;
+    using Newtonsoft.Json;
+    using Microsoft.Rest;
+    using Microsoft.Rest.Serialization;
+
+    public partial class Error
+    {
+        /// <summary>
+        /// Initializes a new instance of the Error class.
+        /// </summary>
+        public Error() { }
+
+        /// <summary>
+        /// Initializes a new instance of the Error class.
+        /// </summary>
+        public Error(int? status = default(int?), string message = default(string))
+        {
+            Status = status;
+            Message = message;
+        }
+
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "status")]
+        public int? Status { get; set; }
+
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "message")]
+        public string Message { get; set; }
+
+    }
+}
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/Models/ErrorException.cs
new file mode 100644
index 0000000000000..e3ab1c0a08abc
--- /dev/null
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/Models/ErrorException.cs
@@ -0,0 +1,99 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+// 
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+
+namespace Fixtures.AcceptanceTestsCustomBaseUriMoreOptions.Models
+{
+    using Microsoft.Rest;
+    using System;
+    using System.Net.Http;
+    using System.Runtime.Serialization;
+#if !PORTABLE && !DNXCORE50
+    using System.Security.Permissions;
+#endif
+
+    /// <summary>
+    /// Exception thrown for an invalid response with Error information.
+    /// </summary>
+#if !PORTABLE && !DNXCORE50
+    [Serializable]
+#endif
+    public class ErrorException : RestException
+    {
+        /// <summary>
+        /// Gets information about the associated HTTP request.
+        /// </summary>
+        public HttpRequestMessageWrapper Request { get; set; }
+
+        /// <summary>
+        /// Gets information about the associated HTTP response.
+        /// </summary>
+        public HttpResponseMessageWrapper Response { get; set; }
+
+        /// <summary>
+        /// Gets or sets the body object.
+        /// </summary>
+        public Error Body { get; set; }
+
+        /// <summary>
+        /// Initializes a new instance of the ErrorException class.
+        /// </summary>
+        public ErrorException()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the ErrorException class.
+        /// </summary>
+        /// <param name="message">The exception message.</param>
+        public ErrorException(string message)
+            : this(message, null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the ErrorException class.
+        /// </summary>
+        /// <param name="message">The exception message.</param>
+        /// <param name="innerException">Inner exception.</param>
+        public ErrorException(string message, Exception innerException)
+            : base(message, innerException)
+        {
+        }
+
+#if !PORTABLE && !DNXCORE50
+        /// <summary>
+        /// Initializes a new instance of the ErrorException class.
+        /// </summary>
+        /// <param name="info">Serialization info.</param>
+        /// <param name="context">Streaming context.</param>
+        protected ErrorException(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+
+        /// <summary>
+        /// Serializes content of the exception.
+        /// </summary>
+        /// <param name="info">Serialization info.</param>
+        /// <param name="context">Streaming context.</param>
+        [SecurityPermission(SecurityAction.Demand, SerializationFormatter = true)]
+        public override void GetObjectData(SerializationInfo info, StreamingContext context)
+        {
+            base.GetObjectData(info, context);
+            if (info == null)
+            {
+                throw new ArgumentNullException("info");
+            }
+
+            info.AddValue("Request", Request);
+            info.AddValue("Response", Response);
+            info.AddValue("Body", Body);
+        }
+#endif
+    }
+}
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/Paths.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/Paths.cs
new file mode 100644
index 0000000000000..a8599cf083382
--- /dev/null
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/Paths.cs
@@ -0,0 +1,203 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+// 
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+
+namespace Fixtures.AcceptanceTestsCustomBaseUriMoreOptions
+{
+    using System;
+    using System.Linq;
+    using System.Collections.Generic;
+    using System.Net;
+    using System.Net.Http;
+    using System.Net.Http.Headers;
+    using System.Text;
+    using System.Text.RegularExpressions;
+    using System.Threading;
+    using System.Threading.Tasks;
+    using Microsoft.Rest;
+    using Microsoft.Rest.Serialization;
+    using Newtonsoft.Json;
+    using Models;
+
+    /// <summary>
+    /// Paths operations.
+    /// </summary>
+    public partial class Paths : IServiceOperations<AutoRestParameterizedCustomHostTestClient>, IPaths
+    {
+        /// <summary>
+        /// Initializes a new instance of the Paths class.
+        /// </summary>
+        /// <param name='client'>
+        /// Reference to the service client.
+        /// </param>
+        public Paths(AutoRestParameterizedCustomHostTestClient client)
+        {
+            if (client == null) 
+            {
+                throw new ArgumentNullException("client");
+            }
+            this.Client = client;
+        }
+
+        /// <summary>
+        /// Gets a reference to the AutoRestParameterizedCustomHostTestClient
+        /// </summary>
+        public AutoRestParameterizedCustomHostTestClient Client { get; private set; }
+
+        /// <summary>
+        /// Get a 200 to test a valid base uri
+        /// </summary>
+        /// <param name='vault'>
+        /// The vault name, e.g. https://myvault
+        /// </param>
+        /// <param name='secret'>
+        /// Secret value.
+        /// </param>
+        /// <param name='keyName'>
+        /// The key name with value 'key1'.
+        /// </param>
+        /// <param name='keyVersion'>
+        /// The key version. Default value 'v1'.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// Headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <return>
+        /// A response object containing the response body and response headers.
+        /// </return>
+        public async Task<HttpOperationResponse> GetEmptyWithHttpMessagesAsync(string vault, string secret, string keyName, string keyVersion = "v1", Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            if (vault == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "vault");
+            }
+            if (secret == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "secret");
+            }
+            if (this.Client.DnsSuffix == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.DnsSuffix");
+            }
+            if (keyName == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "keyName");
+            }
+            if (this.Client.SubscriptionId == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
+            }
+            // Tracing
+            bool _shouldTrace = ServiceClientTracing.IsEnabled;
+            string _invocationId = null;
+            if (_shouldTrace)
+            {
+                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
+                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
+                tracingParameters.Add("vault", vault);
+                tracingParameters.Add("secret", secret);
+                tracingParameters.Add("keyName", keyName);
+                tracingParameters.Add("keyVersion", keyVersion);
+                tracingParameters.Add("cancellationToken", cancellationToken);
+                ServiceClientTracing.Enter(_invocationId, this, "GetEmpty", tracingParameters);
+            }
+            // Construct URL
+            var _baseUrl = this.Client.BaseUri;
+            var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "customuri/{subscriptionId}/{keyName}";
+            _url = _url.Replace("{vault}", vault);
+            _url = _url.Replace("{secret}", secret);
+            _url = _url.Replace("{dnsSuffix}", this.Client.DnsSuffix);
+            _url = _url.Replace("{keyName}", Uri.EscapeDataString(keyName));
+            _url = _url.Replace("{subscriptionId}", Uri.EscapeDataString(this.Client.SubscriptionId));
+            List<string> _queryParameters = new List<string>();
+            if (keyVersion != null)
+            {
+                _queryParameters.Add(string.Format("keyVersion={0}", Uri.EscapeDataString(keyVersion)));
+            }
+            if (_queryParameters.Count > 0)
+            {
+                _url += "?" + string.Join("&", _queryParameters);
+            }
+            // Create HTTP transport objects
+            HttpRequestMessage _httpRequest = new HttpRequestMessage();
+            HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.RequestUri = new Uri(_url);
+            // Set Headers
+            if (customHeaders != null)
+            {
+                foreach(var _header in customHeaders)
+                {
+                    if (_httpRequest.Headers.Contains(_header.Key))
+                    {
+                        _httpRequest.Headers.Remove(_header.Key);
+                    }
+                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
+                }
+            }
+
+            // Serialize Request
+            string _requestContent = null;
+            // Send Request
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
+            }
+            cancellationToken.ThrowIfCancellationRequested();
+            _httpResponse = await this.Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
+            }
+            HttpStatusCode _statusCode = _httpResponse.StatusCode;
+            cancellationToken.ThrowIfCancellationRequested();
+            string _responseContent = null;
+            if ((int)_statusCode != 200)
+            {
+                var ex = new ErrorException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    Error _errorBody = SafeJsonConvert.DeserializeObject<Error>(_responseContent, this.Client.DeserializationSettings);
+                    if (_errorBody != null)
+                    {
+                        ex.Body = _errorBody;
+                    }
+                }
+                catch (JsonException)
+                {
+                    // Ignore the exception
+                }
+                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
+                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
+                if (_shouldTrace)
+                {
+                    ServiceClientTracing.Error(_invocationId, ex);
+                }
+                _httpRequest.Dispose();
+                if (_httpResponse != null)
+                {
+                    _httpResponse.Dispose();
+                }
+                throw ex;
+            }
+            // Create Result
+            var _result = new HttpOperationResponse();
+            _result.Request = _httpRequest;
+            _result.Response = _httpResponse;
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.Exit(_invocationId, _result);
+            }
+            return _result;
+        }
+
+    }
+}
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/PathsExtensions.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/PathsExtensions.cs
new file mode 100644
index 0000000000000..c553414304ed0
--- /dev/null
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/PathsExtensions.cs
@@ -0,0 +1,74 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+// 
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+
+namespace Fixtures.AcceptanceTestsCustomBaseUriMoreOptions
+{
+    using System;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Threading;
+    using System.Threading.Tasks;
+    using Microsoft.Rest;
+    using Models;
+
+    /// <summary>
+    /// Extension methods for Paths.
+    /// </summary>
+    public static partial class PathsExtensions
+    {
+            /// <summary>
+            /// Get a 200 to test a valid base uri
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='vault'>
+            /// The vault name, e.g. https://myvault
+            /// </param>
+            /// <param name='secret'>
+            /// Secret value.
+            /// </param>
+            /// <param name='keyName'>
+            /// The key name with value 'key1'.
+            /// </param>
+            /// <param name='keyVersion'>
+            /// The key version. Default value 'v1'.
+            /// </param>
+            public static void GetEmpty(this IPaths operations, string vault, string secret, string keyName, string keyVersion = "v1")
+            {
+                Task.Factory.StartNew(s => ((IPaths)s).GetEmptyAsync(vault, secret, keyName, keyVersion), operations, CancellationToken.None, TaskCreationOptions.None, TaskScheduler.Default).Unwrap().GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Get a 200 to test a valid base uri
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='vault'>
+            /// The vault name, e.g. https://myvault
+            /// </param>
+            /// <param name='secret'>
+            /// Secret value.
+            /// </param>
+            /// <param name='keyName'>
+            /// The key name with value 'key1'.
+            /// </param>
+            /// <param name='keyVersion'>
+            /// The key version. Default value 'v1'.
+            /// </param>
+            /// <param name='cancellationToken'>
+            /// The cancellation token.
+            /// </param>
+            public static async Task GetEmptyAsync(this IPaths operations, string vault, string secret, string keyName, string keyVersion = "v1", CancellationToken cancellationToken = default(CancellationToken))
+            {
+                await operations.GetEmptyWithHttpMessagesAsync(vault, secret, keyName, keyVersion, null, cancellationToken).ConfigureAwait(false);
+            }
+
+    }
+}
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseBoolHeaders.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseBoolHeaders.cs
index 54bb390e7cb96..3461139acef89 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseBoolHeaders.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseBoolHeaders.cs
@@ -34,7 +34,7 @@ public HeaderResponseBoolHeaders(bool? value = default(bool?))
         }
 
         /// <summary>
-        /// response with header value "value": true or false
+        /// Gets or sets response with header value "value": true or false
         /// </summary>
         [JsonProperty(PropertyName = "value")]
         public bool? Value { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseByteHeaders.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseByteHeaders.cs
index 1119ed4d030a1..742bece92143d 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseByteHeaders.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseByteHeaders.cs
@@ -34,7 +34,7 @@ public HeaderResponseByteHeaders(byte[] value = default(byte[]))
         }
 
         /// <summary>
-        /// response with header values "啊齄丂狛狜隣郎隣兀﨩"
+        /// Gets or sets response with header values "啊齄丂狛狜隣郎隣兀﨩"
         /// </summary>
         [JsonProperty(PropertyName = "value")]
         public byte[] Value { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseDateHeaders.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseDateHeaders.cs
index 0cb1bd745fb51..e00cbc09557f9 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseDateHeaders.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseDateHeaders.cs
@@ -34,7 +34,8 @@ public HeaderResponseDateHeaders(DateTime? value = default(DateTime?))
         }
 
         /// <summary>
-        /// response with header values "2010-01-01" or "0001-01-01"
+        /// Gets or sets response with header values "2010-01-01" or
+        /// "0001-01-01"
         /// </summary>
         [JsonConverter(typeof(DateJsonConverter))]
         [JsonProperty(PropertyName = "value")]
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseDatetimeHeaders.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseDatetimeHeaders.cs
index 8215b0ae1c617..cffbd3421661b 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseDatetimeHeaders.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseDatetimeHeaders.cs
@@ -36,7 +36,7 @@ public HeaderResponseDatetimeHeaders(DateTime? value = default(DateTime?))
         }
 
         /// <summary>
-        /// response with header values "2010-01-01T12:34:56Z" or
+        /// Gets or sets response with header values "2010-01-01T12:34:56Z" or
         /// "0001-01-01T00:00:00Z"
         /// </summary>
         [JsonProperty(PropertyName = "value")]
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseDatetimeRfc1123Headers.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseDatetimeRfc1123Headers.cs
index 124f599f9ba0d..f188e986ab6b5 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseDatetimeRfc1123Headers.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseDatetimeRfc1123Headers.cs
@@ -36,8 +36,8 @@ public HeaderResponseDatetimeRfc1123Headers(DateTime? value = default(DateTime?)
         }
 
         /// <summary>
-        /// response with header values "Wed, 01 Jan 2010 12:34:56 GMT" or
-        /// "Mon, 01 Jan 0001 00:00:00 GMT"
+        /// Gets or sets response with header values "Wed, 01 Jan 2010
+        /// 12:34:56 GMT" or "Mon, 01 Jan 0001 00:00:00 GMT"
         /// </summary>
         [JsonConverter(typeof(DateTimeRfc1123JsonConverter))]
         [JsonProperty(PropertyName = "value")]
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseDoubleHeaders.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseDoubleHeaders.cs
index 104620a950907..e34f3b911d504 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseDoubleHeaders.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseDoubleHeaders.cs
@@ -36,7 +36,7 @@ public HeaderResponseDoubleHeaders(double? value = default(double?))
         }
 
         /// <summary>
-        /// response with header value "value": 7e120 or -3.0
+        /// Gets or sets response with header value "value": 7e120 or -3.0
         /// </summary>
         [JsonProperty(PropertyName = "value")]
         public double? Value { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseDurationHeaders.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseDurationHeaders.cs
index 71f279990a846..2795657f73e3f 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseDurationHeaders.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseDurationHeaders.cs
@@ -36,7 +36,7 @@ public HeaderResponseDurationHeaders(TimeSpan? value = default(TimeSpan?))
         }
 
         /// <summary>
-        /// response with header values "P123DT22H14M12.011S"
+        /// Gets or sets response with header values "P123DT22H14M12.011S"
         /// </summary>
         [JsonProperty(PropertyName = "value")]
         public TimeSpan? Value { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseEnumHeaders.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseEnumHeaders.cs
index 06092074d54e8..f955fca276f99 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseEnumHeaders.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseEnumHeaders.cs
@@ -34,7 +34,7 @@ public HeaderResponseEnumHeaders(GreyscaleColors? value = default(GreyscaleColor
         }
 
         /// <summary>
-        /// response with header values "GREY" or null
+        /// Gets or sets response with header values "GREY" or null
         /// </summary>
         [JsonProperty(PropertyName = "value")]
         public GreyscaleColors? Value { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseExistingKeyHeaders.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseExistingKeyHeaders.cs
index 344136218eec5..42a5c1aeda709 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseExistingKeyHeaders.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseExistingKeyHeaders.cs
@@ -36,7 +36,7 @@ public HeaderResponseExistingKeyHeaders(string userAgent = default(string))
         }
 
         /// <summary>
-        /// response with header value "User-Agent": "overwrite"
+        /// Gets or sets response with header value "User-Agent": "overwrite"
         /// </summary>
         [JsonProperty(PropertyName = "User-Agent")]
         public string UserAgent { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseFloatHeaders.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseFloatHeaders.cs
index 987718bad93bb..6e5353a3fcaeb 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseFloatHeaders.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseFloatHeaders.cs
@@ -34,7 +34,7 @@ public HeaderResponseFloatHeaders(double? value = default(double?))
         }
 
         /// <summary>
-        /// response with header value "value": 0.07 or -3.0
+        /// Gets or sets response with header value "value": 0.07 or -3.0
         /// </summary>
         [JsonProperty(PropertyName = "value")]
         public double? Value { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseIntegerHeaders.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseIntegerHeaders.cs
index 28d60394d0b77..3ce8bd066a79f 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseIntegerHeaders.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseIntegerHeaders.cs
@@ -36,7 +36,7 @@ public HeaderResponseIntegerHeaders(int? value = default(int?))
         }
 
         /// <summary>
-        /// response with header value "value": 1 or -2
+        /// Gets or sets response with header value "value": 1 or -2
         /// </summary>
         [JsonProperty(PropertyName = "value")]
         public int? Value { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseLongHeaders.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseLongHeaders.cs
index cf9efd1fe838e..6e15f2eecc4a1 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseLongHeaders.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseLongHeaders.cs
@@ -34,7 +34,7 @@ public HeaderResponseLongHeaders(long? value = default(long?))
         }
 
         /// <summary>
-        /// response with header value "value": 105 or -2
+        /// Gets or sets response with header value "value": 105 or -2
         /// </summary>
         [JsonProperty(PropertyName = "value")]
         public long? Value { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseProtectedKeyHeaders.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseProtectedKeyHeaders.cs
index abb1464ad445d..7adbdf29bebfa 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseProtectedKeyHeaders.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseProtectedKeyHeaders.cs
@@ -36,7 +36,7 @@ public HeaderResponseProtectedKeyHeaders(string contentType = default(string))
         }
 
         /// <summary>
-        /// response with header value "Content-Type": "text/html"
+        /// Gets or sets response with header value "Content-Type": "text/html"
         /// </summary>
         [JsonProperty(PropertyName = "Content-Type")]
         public string ContentType { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseStringHeaders.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseStringHeaders.cs
index 7184a38f5c59a..0744f2115b545 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseStringHeaders.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/HeaderResponseStringHeaders.cs
@@ -36,8 +36,8 @@ public HeaderResponseStringHeaders(string value = default(string))
         }
 
         /// <summary>
-        /// response with header values "The quick brown fox jumps over the
-        /// lazy dog" or null or ""
+        /// Gets or sets response with header values "The quick brown fox
+        /// jumps over the lazy dog" or null or ""
         /// </summary>
         [JsonProperty(PropertyName = "value")]
         public string Value { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsDelete307Headers.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsDelete307Headers.cs
index cbf7865f2726d..999dd9f164742 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsDelete307Headers.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsDelete307Headers.cs
@@ -36,7 +36,7 @@ public HttpRedirectsDelete307Headers(string location = default(string))
         }
 
         /// <summary>
-        /// The redirect location for this request
+        /// Gets or sets the redirect location for this request
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsGet300Headers.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsGet300Headers.cs
index d14c5fc870c9f..ad0dacb9d1aaa 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsGet300Headers.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsGet300Headers.cs
@@ -34,7 +34,7 @@ public HttpRedirectsGet300Headers(string location = default(string))
         }
 
         /// <summary>
-        /// The redirect location for this request
+        /// Gets or sets the redirect location for this request
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsGet301Headers.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsGet301Headers.cs
index 70432eae09b3e..2a543db3975b1 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsGet301Headers.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsGet301Headers.cs
@@ -34,7 +34,7 @@ public HttpRedirectsGet301Headers(string location = default(string))
         }
 
         /// <summary>
-        /// The redirect location for this request
+        /// Gets or sets the redirect location for this request
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsGet302Headers.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsGet302Headers.cs
index 22bc242974d1e..59b857904134b 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsGet302Headers.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsGet302Headers.cs
@@ -34,7 +34,7 @@ public HttpRedirectsGet302Headers(string location = default(string))
         }
 
         /// <summary>
-        /// The redirect location for this request
+        /// Gets or sets the redirect location for this request
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsGet307Headers.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsGet307Headers.cs
index 7eb98fab6bef3..73111e08f2591 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsGet307Headers.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsGet307Headers.cs
@@ -34,7 +34,7 @@ public HttpRedirectsGet307Headers(string location = default(string))
         }
 
         /// <summary>
-        /// The redirect location for this request
+        /// Gets or sets the redirect location for this request
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsHead300Headers.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsHead300Headers.cs
index 5f32659b21b54..3970436db87b0 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsHead300Headers.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsHead300Headers.cs
@@ -36,7 +36,7 @@ public HttpRedirectsHead300Headers(string location = default(string))
         }
 
         /// <summary>
-        /// The redirect location for this request
+        /// Gets or sets the redirect location for this request
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsHead301Headers.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsHead301Headers.cs
index af9b0310e5bc4..aed6cb6c515d5 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsHead301Headers.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsHead301Headers.cs
@@ -36,7 +36,7 @@ public HttpRedirectsHead301Headers(string location = default(string))
         }
 
         /// <summary>
-        /// The redirect location for this request
+        /// Gets or sets the redirect location for this request
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsHead302Headers.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsHead302Headers.cs
index 2f1ed670c469e..797193619a8de 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsHead302Headers.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsHead302Headers.cs
@@ -36,7 +36,7 @@ public HttpRedirectsHead302Headers(string location = default(string))
         }
 
         /// <summary>
-        /// The redirect location for this request
+        /// Gets or sets the redirect location for this request
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsHead307Headers.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsHead307Headers.cs
index b1ad99069c7cb..dd01aa2366771 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsHead307Headers.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsHead307Headers.cs
@@ -36,7 +36,7 @@ public HttpRedirectsHead307Headers(string location = default(string))
         }
 
         /// <summary>
-        /// The redirect location for this request
+        /// Gets or sets the redirect location for this request
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsPatch302Headers.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsPatch302Headers.cs
index 5dfe6e3e5290e..8178b6f377ec0 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsPatch302Headers.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsPatch302Headers.cs
@@ -36,7 +36,7 @@ public HttpRedirectsPatch302Headers(string location = default(string))
         }
 
         /// <summary>
-        /// The redirect location for this request
+        /// Gets or sets the redirect location for this request
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsPatch307Headers.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsPatch307Headers.cs
index 19973f88ef893..d94f9c8ac7785 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsPatch307Headers.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsPatch307Headers.cs
@@ -36,7 +36,7 @@ public HttpRedirectsPatch307Headers(string location = default(string))
         }
 
         /// <summary>
-        /// The redirect location for this request
+        /// Gets or sets the redirect location for this request
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsPost303Headers.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsPost303Headers.cs
index 8036c76d9716c..9f6ac7869584a 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsPost303Headers.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsPost303Headers.cs
@@ -36,7 +36,7 @@ public HttpRedirectsPost303Headers(string location = default(string))
         }
 
         /// <summary>
-        /// The redirect location for this request
+        /// Gets or sets the redirect location for this request
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsPost307Headers.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsPost307Headers.cs
index 59c68c116bea0..3f6ee41fd2e46 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsPost307Headers.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsPost307Headers.cs
@@ -36,7 +36,7 @@ public HttpRedirectsPost307Headers(string location = default(string))
         }
 
         /// <summary>
-        /// The redirect location for this request
+        /// Gets or sets the redirect location for this request
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsPut301Headers.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsPut301Headers.cs
index e48732af63bea..3eb3f2fe37f13 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsPut301Headers.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsPut301Headers.cs
@@ -34,7 +34,7 @@ public HttpRedirectsPut301Headers(string location = default(string))
         }
 
         /// <summary>
-        /// The redirect location for this request
+        /// Gets or sets the redirect location for this request
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsPut307Headers.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsPut307Headers.cs
index f3148bff9a057..a4cbbc843f10c 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsPut307Headers.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/HttpRedirectsPut307Headers.cs
@@ -34,7 +34,7 @@ public HttpRedirectsPut307Headers(string location = default(string))
         }
 
         /// <summary>
-        /// The redirect location for this request
+        /// Gets or sets the redirect location for this request
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/ModelFlattening/Models/BaseProduct.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/ModelFlattening/Models/BaseProduct.cs
index 40511ce7b4474..3615d58922019 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/ModelFlattening/Models/BaseProduct.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/ModelFlattening/Models/BaseProduct.cs
@@ -35,15 +35,16 @@ public BaseProduct(string productId, string description = default(string))
         }
 
         /// <summary>
-        /// Unique identifier representing a specific product for a given
-        /// latitude &amp; longitude. For example, uberX in San Francisco
-        /// will have a different product_id than uberX in Los Angeles.
+        /// Gets or sets unique identifier representing a specific product for
+        /// a given latitude &amp; longitude. For example, uberX in San
+        /// Francisco will have a different product_id than uberX in Los
+        /// Angeles.
         /// </summary>
         [JsonProperty(PropertyName = "base_product_id")]
         public string ProductId { get; set; }
 
         /// <summary>
-        /// Description of product.
+        /// Gets or sets description of product.
         /// </summary>
         [JsonProperty(PropertyName = "base_product_description")]
         public string Description { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/ModelFlattening/Models/FlattenParameterGroup.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/ModelFlattening/Models/FlattenParameterGroup.cs
index db9785813c55c..fac4cd5c66e3d 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/ModelFlattening/Models/FlattenParameterGroup.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/ModelFlattening/Models/FlattenParameterGroup.cs
@@ -40,39 +40,40 @@ public FlattenParameterGroup(string name, string productId, string maxProductDis
         }
 
         /// <summary>
-        /// Product name with value 'groupproduct'
+        /// Gets or sets product name with value 'groupproduct'
         /// </summary>
         [JsonProperty(PropertyName = "")]
         public string Name { get; set; }
 
         /// <summary>
-        /// Unique identifier representing a specific product for a given
-        /// latitude &amp; longitude. For example, uberX in San Francisco
-        /// will have a different product_id than uberX in Los Angeles.
+        /// Gets or sets unique identifier representing a specific product for
+        /// a given latitude &amp; longitude. For example, uberX in San
+        /// Francisco will have a different product_id than uberX in Los
+        /// Angeles.
         /// </summary>
         [JsonProperty(PropertyName = "")]
         public string ProductId { get; set; }
 
         /// <summary>
-        /// Description of product.
+        /// Gets or sets description of product.
         /// </summary>
         [JsonProperty(PropertyName = "")]
         public string Description { get; set; }
 
         /// <summary>
-        /// Display name of product.
+        /// Gets or sets display name of product.
         /// </summary>
         [JsonProperty(PropertyName = "")]
         public string MaxProductDisplayName { get; set; }
 
         /// <summary>
-        /// Generic URL value.
+        /// Gets or sets generic URL value.
         /// </summary>
         [JsonProperty(PropertyName = "")]
         public string GenericValue { get; set; }
 
         /// <summary>
-        /// URL value.
+        /// Gets or sets URL value.
         /// </summary>
         [JsonProperty(PropertyName = "")]
         public string Odatavalue { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/ModelFlattening/Models/FlattenedProduct.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/ModelFlattening/Models/FlattenedProduct.cs
index 9c7cb37c74d13..415f53a6e3dfd 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/ModelFlattening/Models/FlattenedProduct.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/ModelFlattening/Models/FlattenedProduct.cs
@@ -46,7 +46,7 @@ public FlattenedProduct(string id = default(string), string type = default(strin
         public string FlattenedProductType { get; set; }
 
         /// <summary>
-        /// Possible values include: 'Succeeded', 'Failed', 'canceled',
+        /// Gets possible values include: 'Succeeded', 'Failed', 'canceled',
         /// 'Accepted', 'Creating', 'Created', 'Updating', 'Updated',
         /// 'Deleting', 'Deleted', 'OK'
         /// </summary>
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/ModelFlattening/Models/GenericUrl.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/ModelFlattening/Models/GenericUrl.cs
index 309028eb12669..2022f0d0a073c 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/ModelFlattening/Models/GenericUrl.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/ModelFlattening/Models/GenericUrl.cs
@@ -34,7 +34,7 @@ public GenericUrl(string genericValue = default(string))
         }
 
         /// <summary>
-        /// Generic URL value.
+        /// Gets or sets generic URL value.
         /// </summary>
         [JsonProperty(PropertyName = "generic_value")]
         public string GenericValue { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/ModelFlattening/Models/Resource.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/ModelFlattening/Models/Resource.cs
index a43c4e5d5a21e..5679632fe9533 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/ModelFlattening/Models/Resource.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/ModelFlattening/Models/Resource.cs
@@ -35,13 +35,13 @@ public Resource(string id = default(string), string type = default(string), IDic
         }
 
         /// <summary>
-        /// Resource Id
+        /// Gets resource Id
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public string Id { get; private set; }
 
         /// <summary>
-        /// Resource Type
+        /// Gets resource Type
         /// </summary>
         [JsonProperty(PropertyName = "type")]
         public string Type { get; private set; }
@@ -52,13 +52,13 @@ public Resource(string id = default(string), string type = default(string), IDic
         public IDictionary<string, string> Tags { get; set; }
 
         /// <summary>
-        /// Resource Location
+        /// Gets or sets resource Location
         /// </summary>
         [JsonProperty(PropertyName = "location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Resource Name
+        /// Gets resource Name
         /// </summary>
         [JsonProperty(PropertyName = "name")]
         public string Name { get; private set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/ModelFlattening/Models/SimpleProduct.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/ModelFlattening/Models/SimpleProduct.cs
index 5ee2fa897a5ea..4ae8f66017f6c 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/ModelFlattening/Models/SimpleProduct.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/ModelFlattening/Models/SimpleProduct.cs
@@ -45,19 +45,19 @@ static SimpleProduct()
         }
 
         /// <summary>
-        /// Display name of product.
+        /// Gets or sets display name of product.
         /// </summary>
         [JsonProperty(PropertyName = "details.max_product_display_name")]
         public string MaxProductDisplayName { get; set; }
 
         /// <summary>
-        /// Generic URL value.
+        /// Gets or sets generic URL value.
         /// </summary>
         [JsonProperty(PropertyName = "details.max_product_image.generic_value")]
         public string GenericValue { get; set; }
 
         /// <summary>
-        /// URL value.
+        /// Gets or sets URL value.
         /// </summary>
         [JsonProperty(PropertyName = "details.max_product_image.@odata\\.value")]
         public string Odatavalue { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/RequiredOptional/ExplicitModel.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/RequiredOptional/ExplicitModel.cs
index f0e42c1bf7fc9..117742e60f654 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/RequiredOptional/ExplicitModel.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/RequiredOptional/ExplicitModel.cs
@@ -99,12 +99,9 @@ public async Task<HttpOperationResponse<Error>> PostRequiredIntegerParameterWith
 
             // Serialize Request
             string _requestContent = null;
-            if(bodyParameter != null)
-            {
-                _requestContent = SafeJsonConvert.SerializeObject(bodyParameter, this.Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
+            _requestContent = SafeJsonConvert.SerializeObject(bodyParameter, this.Client.SerializationSettings);
+            _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+            _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             // Send Request
             if (_shouldTrace)
             {
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Url/IPaths.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Url/IPaths.cs
index ce60b9a5c2f28..d8f9e2c761579 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Url/IPaths.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Url/IPaths.cs
@@ -305,5 +305,18 @@ public partial interface IPaths
         /// The cancellation token.
         /// </param>
         Task<HttpOperationResponse> ArrayCsvInPathWithHttpMessagesAsync(IList<string> arrayPath, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Get the date 2016-04-13 encoded value as '1460505600' (Unix time)
+        /// </summary>
+        /// <param name='unixTimeUrlPath'>
+        /// Unix time encoded value
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        Task<HttpOperationResponse> UnixTimeUrlWithHttpMessagesAsync(DateTime unixTimeUrlPath, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
     }
 }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Url/Paths.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Url/Paths.cs
index d880804521f0c..3892f728ba11b 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Url/Paths.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Url/Paths.cs
@@ -2692,5 +2692,111 @@ public async Task<HttpOperationResponse> ArrayCsvInPathWithHttpMessagesAsync(ILi
             return _result;
         }
 
+        /// <summary>
+        /// Get the date 2016-04-13 encoded value as '1460505600' (Unix time)
+        /// </summary>
+        /// <param name='unixTimeUrlPath'>
+        /// Unix time encoded value
+        /// </param>
+        /// <param name='customHeaders'>
+        /// Headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <return>
+        /// A response object containing the response body and response headers.
+        /// </return>
+        public async Task<HttpOperationResponse> UnixTimeUrlWithHttpMessagesAsync(DateTime unixTimeUrlPath, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            // Tracing
+            bool _shouldTrace = ServiceClientTracing.IsEnabled;
+            string _invocationId = null;
+            if (_shouldTrace)
+            {
+                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
+                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
+                tracingParameters.Add("unixTimeUrlPath", unixTimeUrlPath);
+                tracingParameters.Add("cancellationToken", cancellationToken);
+                ServiceClientTracing.Enter(_invocationId, this, "UnixTimeUrl", tracingParameters);
+            }
+            // Construct URL
+            var _baseUrl = this.Client.BaseUri.AbsoluteUri;
+            var _url = new Uri(new Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "paths/int/1460505600/{unixTimeUrlPath}").ToString();
+            _url = _url.Replace("{unixTimeUrlPath}", Uri.EscapeDataString(SafeJsonConvert.SerializeObject(unixTimeUrlPath, new UnixTimeJsonConverter()).Trim('"')));
+            // Create HTTP transport objects
+            HttpRequestMessage _httpRequest = new HttpRequestMessage();
+            HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.RequestUri = new Uri(_url);
+            // Set Headers
+            if (customHeaders != null)
+            {
+                foreach(var _header in customHeaders)
+                {
+                    if (_httpRequest.Headers.Contains(_header.Key))
+                    {
+                        _httpRequest.Headers.Remove(_header.Key);
+                    }
+                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
+                }
+            }
+
+            // Serialize Request
+            string _requestContent = null;
+            // Send Request
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
+            }
+            cancellationToken.ThrowIfCancellationRequested();
+            _httpResponse = await this.Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
+            }
+            HttpStatusCode _statusCode = _httpResponse.StatusCode;
+            cancellationToken.ThrowIfCancellationRequested();
+            string _responseContent = null;
+            if ((int)_statusCode != 200)
+            {
+                var ex = new ErrorException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    Error _errorBody = SafeJsonConvert.DeserializeObject<Error>(_responseContent, this.Client.DeserializationSettings);
+                    if (_errorBody != null)
+                    {
+                        ex.Body = _errorBody;
+                    }
+                }
+                catch (JsonException)
+                {
+                    // Ignore the exception
+                }
+                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
+                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
+                if (_shouldTrace)
+                {
+                    ServiceClientTracing.Error(_invocationId, ex);
+                }
+                _httpRequest.Dispose();
+                if (_httpResponse != null)
+                {
+                    _httpResponse.Dispose();
+                }
+                throw ex;
+            }
+            // Create Result
+            var _result = new HttpOperationResponse();
+            _result.Request = _httpRequest;
+            _result.Response = _httpResponse;
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.Exit(_invocationId, _result);
+            }
+            return _result;
+        }
+
     }
 }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Url/PathsExtensions.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Url/PathsExtensions.cs
index 65ea07ea61b8b..b4e8d2ce268e6 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Url/PathsExtensions.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Url/PathsExtensions.cs
@@ -712,5 +712,36 @@ public static async Task ArrayCsvInPathAsync(this IPaths operations, IList<strin
                 await operations.ArrayCsvInPathWithHttpMessagesAsync(arrayPath, null, cancellationToken).ConfigureAwait(false);
             }
 
+            /// <summary>
+            /// Get the date 2016-04-13 encoded value as '1460505600' (Unix time)
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='unixTimeUrlPath'>
+            /// Unix time encoded value
+            /// </param>
+            public static void UnixTimeUrl(this IPaths operations, DateTime unixTimeUrlPath)
+            {
+                Task.Factory.StartNew(s => ((IPaths)s).UnixTimeUrlAsync(unixTimeUrlPath), operations, CancellationToken.None, TaskCreationOptions.None, TaskScheduler.Default).Unwrap().GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Get the date 2016-04-13 encoded value as '1460505600' (Unix time)
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='unixTimeUrlPath'>
+            /// Unix time encoded value
+            /// </param>
+            /// <param name='cancellationToken'>
+            /// The cancellation token.
+            /// </param>
+            public static async Task UnixTimeUrlAsync(this IPaths operations, DateTime unixTimeUrlPath, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                await operations.UnixTimeUrlWithHttpMessagesAsync(unixTimeUrlPath, null, cancellationToken).ConfigureAwait(false);
+            }
+
     }
 }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Validation/Models/ChildProduct.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Validation/Models/ChildProduct.cs
index 07e06b7a22d11..be6803337118d 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Validation/Models/ChildProduct.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Validation/Models/ChildProduct.cs
@@ -41,7 +41,7 @@ static ChildProduct()
         }
 
         /// <summary>
-        /// Count
+        /// Gets or sets count
         /// </summary>
         [JsonProperty(PropertyName = "count")]
         public int? Count { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Validation/Models/Product.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Validation/Models/Product.cs
index 09addd8369ff8..e434110c5df7d 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Validation/Models/Product.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Validation/Models/Product.cs
@@ -51,19 +51,20 @@ static Product()
         }
 
         /// <summary>
-        /// Non required array of unique items from 0 to 6 elements.
+        /// Gets or sets non required array of unique items from 0 to 6
+        /// elements.
         /// </summary>
         [JsonProperty(PropertyName = "display_names")]
         public IList<string> DisplayNames { get; set; }
 
         /// <summary>
-        /// Non required int betwen 0 and 100 exclusive.
+        /// Gets or sets non required int betwen 0 and 100 exclusive.
         /// </summary>
         [JsonProperty(PropertyName = "capacity")]
         public int? Capacity { get; set; }
 
         /// <summary>
-        /// Image URL representing the product.
+        /// Gets or sets image URL representing the product.
         /// </summary>
         [JsonProperty(PropertyName = "image")]
         public string Image { get; set; }
@@ -74,7 +75,7 @@ static Product()
         public ChildProduct Child { get; set; }
 
         /// <summary>
-        /// Constant string as Enum. Possible values include:
+        /// Gets or sets constant string as Enum. Possible values include:
         /// 'constant_string_as_enum'
         /// </summary>
         [JsonProperty(PropertyName = "constStringAsEnum")]
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Polymorphic/Models/Animal.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Polymorphic/Models/Animal.cs
index f473ba11c0c73..ff20c9b53490f 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Polymorphic/Models/Animal.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Polymorphic/Models/Animal.cs
@@ -32,13 +32,13 @@ public Animal(string id = default(string), string description = default(string))
         }
 
         /// <summary>
-        /// Id.
+        /// Gets or sets id.
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public string Id { get; set; }
 
         /// <summary>
-        /// Description of a Animal.
+        /// Gets or sets description of a Animal.
         /// </summary>
         [JsonProperty(PropertyName = "description")]
         public string Description { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Polymorphic/Models/BaseCat.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Polymorphic/Models/BaseCat.cs
index d789e963ce3e7..1504a551144a8 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Polymorphic/Models/BaseCat.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Polymorphic/Models/BaseCat.cs
@@ -32,7 +32,7 @@ public BaseCat(string id = default(string), string description = default(string)
         }
 
         /// <summary>
-        /// cat color
+        /// Gets or sets cat color
         /// </summary>
         [JsonProperty(PropertyName = "color")]
         public string Color { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Polymorphic/Models/BurmeseCat.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Polymorphic/Models/BurmeseCat.cs
index 9afcdd57e4274..b815f2c67c76e 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Polymorphic/Models/BurmeseCat.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Polymorphic/Models/BurmeseCat.cs
@@ -32,7 +32,7 @@ public BurmeseCat(string id = default(string), string description = default(stri
         }
 
         /// <summary>
-        /// cat nick name
+        /// Gets or sets cat nick name
         /// </summary>
         [JsonProperty(PropertyName = "nickName")]
         public int? NickName { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Polymorphic/Models/Doggy.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Polymorphic/Models/Doggy.cs
index ef0ad5d1d7a75..0572ac24c447f 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Polymorphic/Models/Doggy.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Polymorphic/Models/Doggy.cs
@@ -32,7 +32,7 @@ public Doggy(string id = default(string), string description = default(string),
         }
 
         /// <summary>
-        /// dog name
+        /// Gets or sets dog name
         /// </summary>
         [JsonProperty(PropertyName = "name")]
         public string Name { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Polymorphic/Models/HimalayanCat.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Polymorphic/Models/HimalayanCat.cs
index d8f3b45767b92..5d175e80804a1 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Polymorphic/Models/HimalayanCat.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Polymorphic/Models/HimalayanCat.cs
@@ -32,7 +32,7 @@ public HimalayanCat(string id = default(string), string description = default(st
         }
 
         /// <summary>
-        /// cat hair length
+        /// Gets or sets cat hair length
         /// </summary>
         [JsonProperty(PropertyName = "hairLength")]
         public int? HairLength { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Polymorphic/Models/Horsey.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Polymorphic/Models/Horsey.cs
index 7bfdbd57709fc..144bf308611f6 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Polymorphic/Models/Horsey.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Polymorphic/Models/Horsey.cs
@@ -32,7 +32,7 @@ public Horsey(string id = default(string), string description = default(string),
         }
 
         /// <summary>
-        /// horse breed
+        /// Gets or sets horse breed
         /// </summary>
         [JsonProperty(PropertyName = "breed")]
         public string Breed { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Polymorphic/Models/PersianCat.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Polymorphic/Models/PersianCat.cs
index fc5c99d0eebb3..26ff193a73afc 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Polymorphic/Models/PersianCat.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Polymorphic/Models/PersianCat.cs
@@ -32,7 +32,7 @@ public PersianCat(string id = default(string), string description = default(stri
         }
 
         /// <summary>
-        /// cat size
+        /// Gets or sets cat size
         /// </summary>
         [JsonProperty(PropertyName = "size")]
         public int? Size { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Polymorphic/Models/SiameseCat.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Polymorphic/Models/SiameseCat.cs
index 17ba85a1781b1..fbaf9b7ecdaef 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Polymorphic/Models/SiameseCat.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Polymorphic/Models/SiameseCat.cs
@@ -32,7 +32,7 @@ public SiameseCat(string id = default(string), string description = default(stri
         }
 
         /// <summary>
-        /// cat length
+        /// Gets or sets cat length
         /// </summary>
         [JsonProperty(PropertyName = "length")]
         public int? Length { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Primitives/Models/Product.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Primitives/Models/Product.cs
index d2ea149e267a9..fcb542d7165ed 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Primitives/Models/Product.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Primitives/Models/Product.cs
@@ -108,7 +108,7 @@ public Product(int? integer = default(int?), int? intProperty = default(int?), l
         public Guid? Uuid { get; set; }
 
         /// <summary>
-        /// Possible values include: 'red', 'blue', 'green'
+        /// Gets or sets possible values include: 'red', 'blue', 'green'
         /// </summary>
         [JsonProperty(PropertyName = "enum")]
         public string EnumProperty { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.RecursiveTypes/Models/Product.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.RecursiveTypes/Models/Product.cs
index 3757ada79d8f7..5752acc51ef91 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.RecursiveTypes/Models/Product.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.RecursiveTypes/Models/Product.cs
@@ -33,9 +33,10 @@ public Product(string productId = default(string), Product parentProduct = defau
         }
 
         /// <summary>
-        /// Unique identifier representing a specific product for a given
-        /// latitude &amp; longitude. For example, uberX in San Francisco
-        /// will have a different product_id than uberX in Los Angeles.
+        /// Gets or sets unique identifier representing a specific product for
+        /// a given latitude &amp; longitude. For example, uberX in San
+        /// Francisco will have a different product_id than uberX in Los
+        /// Angeles.
         /// </summary>
         [JsonProperty(PropertyName = "product_id")]
         public string ProductId { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/PetstoreV2/Models/LoginUserHeaders.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/PetstoreV2/Models/LoginUserHeaders.cs
index 1402f6a440cc7..295f1137f2e98 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/PetstoreV2/Models/LoginUserHeaders.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/PetstoreV2/Models/LoginUserHeaders.cs
@@ -35,13 +35,13 @@ public LoginUserHeaders(int? xRateLimit = default(int?), DateTime? xExpiresAfter
         }
 
         /// <summary>
-        /// calls per hour allowed by the user
+        /// Gets or sets calls per hour allowed by the user
         /// </summary>
         [JsonProperty(PropertyName = "X-Rate-Limit")]
         public int? XRateLimit { get; set; }
 
         /// <summary>
-        /// date in UTC when toekn expires
+        /// Gets or sets date in UTC when toekn expires
         /// </summary>
         [JsonProperty(PropertyName = "X-Expires-After")]
         public DateTime? XExpiresAfter { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/PetstoreV2/Models/Order.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/PetstoreV2/Models/Order.cs
index c4823360b919f..fab6f61cc6cc3 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/PetstoreV2/Models/Order.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/PetstoreV2/Models/Order.cs
@@ -56,8 +56,8 @@ public Order(long? id = default(long?), long? petId = default(long?), int? quant
         public DateTime? ShipDate { get; set; }
 
         /// <summary>
-        /// Order Status. Possible values include: 'placed', 'approved',
-        /// 'delivered'
+        /// Gets or sets order Status. Possible values include: 'placed',
+        /// 'approved', 'delivered'
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/PetstoreV2/Models/Pet.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/PetstoreV2/Models/Pet.cs
index 5cf3bf826766e..176ac348f7598 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/PetstoreV2/Models/Pet.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/PetstoreV2/Models/Pet.cs
@@ -79,8 +79,8 @@ public Pet(string name, IList<string> photoUrls, long? id = default(long?), Cate
         public IDictionary<string, Category> Dictionary { get; set; }
 
         /// <summary>
-        /// pet status in the store. Possible values include: 'available',
-        /// 'pending', 'sold'
+        /// Gets or sets pet status in the store. Possible values include:
+        /// 'available', 'pending', 'sold'
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/PetstoreV2/Models/User.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/PetstoreV2/Models/User.cs
index 9e770d05cc329..26aa7a291ee10 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/PetstoreV2/Models/User.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/PetstoreV2/Models/User.cs
@@ -73,7 +73,7 @@ public User(long? id = default(long?), string username = default(string), string
         public string Phone { get; set; }
 
         /// <summary>
-        /// User Status
+        /// Gets or sets user Status
         /// </summary>
         [JsonProperty(PropertyName = "userStatus")]
         public int? UserStatus { get; set; }
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Properties/AssemblyInfo.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Properties/AssemblyInfo.cs
index 68d34505c6d76..61dbf33914dc9 100644
--- a/AutoRest/Generators/CSharp/CSharp.Tests/Properties/AssemblyInfo.cs
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/Properties/AssemblyInfo.cs
@@ -17,3 +17,4 @@
 
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyInformationalVersion("1.5.0.1")]
diff --git a/AutoRest/Generators/CSharp/CSharp/CSharpCodeNamer.cs b/AutoRest/Generators/CSharp/CSharp/CSharpCodeNamer.cs
index d9562cf4ca63c..3504b01cb57d2 100644
--- a/AutoRest/Generators/CSharp/CSharp/CSharpCodeNamer.cs
+++ b/AutoRest/Generators/CSharp/CSharp/CSharpCodeNamer.cs
@@ -297,6 +297,10 @@ protected virtual IType NormalizePrimaryType(PrimaryType primaryType)
             {
                 primaryType.Name = "ServiceClientCredentials";
             }
+            else if (primaryType.Type == KnownPrimaryType.UnixTime)
+            {
+                primaryType.Name = "DateTime";
+            }
             else if (primaryType.Type == KnownPrimaryType.Uuid)
             {
                 primaryType.Name = "Guid";
@@ -401,7 +405,8 @@ public override string EscapeDefaultValue(string defaultValue, IType type)
                             primaryType.Type == KnownPrimaryType.DateTimeRfc1123 ||
                             primaryType.Type == KnownPrimaryType.TimeSpan ||
                             primaryType.Type == KnownPrimaryType.ByteArray ||
-                            primaryType.Type == KnownPrimaryType.Base64Url)
+                            primaryType.Type == KnownPrimaryType.Base64Url ||
+                            primaryType.Type == KnownPrimaryType.UnixTime)
                         {
 
                             return "SafeJsonConvert.DeserializeObject<" + primaryType.Name.TrimEnd('?') +
diff --git a/AutoRest/Generators/CSharp/CSharp/ClientModelExtensions.cs b/AutoRest/Generators/CSharp/CSharp/ClientModelExtensions.cs
index ded2055e683be..028322670e583 100644
--- a/AutoRest/Generators/CSharp/CSharp/ClientModelExtensions.cs
+++ b/AutoRest/Generators/CSharp/CSharp/ClientModelExtensions.cs
@@ -131,6 +131,41 @@ private static bool ShouldValidate(this IType model)
             return false;
         }
 
+        /// <summary>
+        /// Format the documentation of a property properly with the correct getters and setters. Note that this validation will
+        /// checks for special cases such as acronyms and article words.
+        /// </summary>
+        /// <param name="property">The given property documentation to format</param>
+        /// <returns>A reference to the property documentation</returns>
+        public static string GetFormattedPropertyDocumentation(this Property property)
+        {
+            if (property == null)
+            {
+                throw new ArgumentNullException("property");
+            }
+
+            if (string.IsNullOrEmpty(property.Documentation))
+            {
+                return property.Documentation.EscapeXmlComment();
+            }
+
+            string documentation = property.IsReadOnly ? "Gets " : "Gets or sets ";
+
+            string firstWord = property.Documentation.TrimStart().Split(' ').First();
+            if (firstWord.Length <= 1)
+            {
+                documentation += char.ToLower(property.Documentation[0], CultureInfo.InvariantCulture) + property.Documentation.Substring(1);
+            }
+            else
+            {
+                documentation += firstWord.ToUpper(CultureInfo.InvariantCulture) == firstWord
+                    ? property.Documentation
+                    : char.ToLower(property.Documentation[0], CultureInfo.InvariantCulture) + property.Documentation.Substring(1);
+            }
+
+            return documentation.EscapeXmlComment();
+        }
+
         /// <summary>
         /// Format the value of a sequence given the modeled element format.  Note that only sequences of strings are supported
         /// </summary>
@@ -225,6 +260,10 @@ public static string ToString(this IType type, string clientReference, string re
                 {
                     serializationSettings = "new Base64UrlJsonConverter()";
                 }
+                else if (primaryType.Type == KnownPrimaryType.UnixTime)
+                {
+                    serializationSettings = "new UnixTimeJsonConverter()";
+                }
             }
 
             return string.Format(CultureInfo.InvariantCulture,
@@ -268,6 +307,7 @@ public static bool IsValueType(this IType type)
                 || primaryType.Type == KnownPrimaryType.Long 
                 || primaryType.Type == KnownPrimaryType.TimeSpan 
                 || primaryType.Type == KnownPrimaryType.DateTimeRfc1123
+                || primaryType.Type == KnownPrimaryType.UnixTime
                 || primaryType.Type == KnownPrimaryType.Uuid));
         }
 
diff --git a/AutoRest/Generators/CSharp/CSharp/TemplateModels/MethodTemplateModel.cs b/AutoRest/Generators/CSharp/CSharp/TemplateModels/MethodTemplateModel.cs
index cc44708181ecf..22d1ca54614d0 100644
--- a/AutoRest/Generators/CSharp/CSharp/TemplateModels/MethodTemplateModel.cs
+++ b/AutoRest/Generators/CSharp/CSharp/TemplateModels/MethodTemplateModel.cs
@@ -325,32 +325,22 @@ public string ClientReference
         /// <returns></returns>
         public string GetSerializationSettingsReference(IType serializationType)
         {
-            SequenceType sequenceType = serializationType as SequenceType;
-            DictionaryType dictionaryType = serializationType as DictionaryType;
-            if (serializationType.IsPrimaryType(KnownPrimaryType.Date) ||
-                (sequenceType != null && sequenceType.ElementType is PrimaryType 
-                    && ((PrimaryType)sequenceType.ElementType).Type == KnownPrimaryType.Date) ||
-                (dictionaryType != null && dictionaryType.ValueType is PrimaryType 
-                    && ((PrimaryType)dictionaryType.ValueType).Type == KnownPrimaryType.Date))
+            if (serializationType.IsOrContainsPrimaryType(KnownPrimaryType.Date))
             {
                 return "new DateJsonConverter()";
             }
-            else if (serializationType.IsPrimaryType(KnownPrimaryType.DateTimeRfc1123) ||
-                (sequenceType != null && sequenceType.ElementType is PrimaryType
-                    && ((PrimaryType)sequenceType.ElementType).Type == KnownPrimaryType.DateTimeRfc1123) ||
-                (dictionaryType != null && dictionaryType.ValueType is PrimaryType
-                    && ((PrimaryType)dictionaryType.ValueType).Type == KnownPrimaryType.DateTimeRfc1123))
+            else if (serializationType.IsOrContainsPrimaryType(KnownPrimaryType.DateTimeRfc1123))
             {
                 return "new DateTimeRfc1123JsonConverter()";
             }
-            else if (serializationType.IsPrimaryType(KnownPrimaryType.Base64Url) ||
-                (sequenceType != null && sequenceType.ElementType is PrimaryType
-                    && ((PrimaryType)sequenceType.ElementType).Type == KnownPrimaryType.Base64Url) ||
-                (dictionaryType != null && dictionaryType.ValueType is PrimaryType
-                    && ((PrimaryType)dictionaryType.ValueType).Type == KnownPrimaryType.Base64Url))
+            else if (serializationType.IsOrContainsPrimaryType(KnownPrimaryType.Base64Url))
             {
                 return "new Base64UrlJsonConverter()";
             }
+            else if (serializationType.IsOrContainsPrimaryType(KnownPrimaryType.UnixTime))
+            {
+                return "new UnixTimeJsonConverter()";
+            }
             return ClientReference + ".SerializationSettings";
         }
 
@@ -361,25 +351,18 @@ public string GetSerializationSettingsReference(IType serializationType)
         /// <returns></returns>
         public string GetDeserializationSettingsReference(IType deserializationType)
         {
-            SequenceType sequenceType = deserializationType as SequenceType;
-            DictionaryType dictionaryType = deserializationType as DictionaryType;
-            if (deserializationType.IsPrimaryType(KnownPrimaryType.Date) ||
-                (sequenceType != null && sequenceType.ElementType is PrimaryType
-                    && ((PrimaryType)sequenceType.ElementType).Type == KnownPrimaryType.Date) ||
-                (dictionaryType != null && dictionaryType.ValueType is PrimaryType
-                    && ((PrimaryType)dictionaryType.ValueType).Type == KnownPrimaryType.Date))
+            if (deserializationType.IsOrContainsPrimaryType(KnownPrimaryType.Date))
             {
                 return "new DateJsonConverter()";
             }
-            if (deserializationType.IsPrimaryType(KnownPrimaryType.Base64Url) ||
-                (sequenceType != null && sequenceType.ElementType is PrimaryType
-                    && ((PrimaryType)sequenceType.ElementType).Type == KnownPrimaryType.Base64Url) ||
-                (dictionaryType != null && dictionaryType.ValueType is PrimaryType
-                    && ((PrimaryType)dictionaryType.ValueType).Type == KnownPrimaryType.Base64Url))
+            else if (deserializationType.IsOrContainsPrimaryType(KnownPrimaryType.Base64Url))
             {
                 return "new Base64UrlJsonConverter()";
             }
-
+            else if (deserializationType.IsOrContainsPrimaryType(KnownPrimaryType.UnixTime))
+            {
+                return "new UnixTimeJsonConverter()";
+            }
             return ClientReference + ".DeserializationSettings";
         }
 
diff --git a/AutoRest/Generators/CSharp/CSharp/Templates/MethodTemplate.cshtml b/AutoRest/Generators/CSharp/CSharp/Templates/MethodTemplate.cshtml
index df038116b29cb..96077aaee3c81 100644
--- a/AutoRest/Generators/CSharp/CSharp/Templates/MethodTemplate.cshtml
+++ b/AutoRest/Generators/CSharp/CSharp/Templates/MethodTemplate.cshtml
@@ -161,12 +161,21 @@ else
         }
         else
         {
+            if (!Model.RequestBody.CanBeNull())
+            {
+    @:_requestContent = SafeJsonConvert.SerializeObject(@(Model.RequestBody.Name), @(Model.GetSerializationSettingsReference(Model.RequestBody.Type)));
+    @:_httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+    @:_httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("@(Model.RequestContentType)");
+            }
+            else
+            {
     @:if(@(Model.RequestBody.Name) != null)
     @:{
-        @:_requestContent = SafeJsonConvert.SerializeObject(@(Model.RequestBody.Name), @(Model.GetSerializationSettingsReference(Model.RequestBody.Type)));
-        @:_httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
-        @:_httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("@(Model.RequestContentType)");
+    @:    _requestContent = SafeJsonConvert.SerializeObject(@(Model.RequestBody.Name), @(Model.GetSerializationSettingsReference(Model.RequestBody.Type)));
+    @:    _httpRequest.Content = new StringContent(_requestContent, Encoding.UTF8);
+    @:    _httpRequest.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("@(Model.RequestContentType)");
     @:}
+            }
         }
     }
     else if (Model.LogicalParameters.Where(p => p.Location == ParameterLocation.FormData).Any())
diff --git a/AutoRest/Generators/CSharp/CSharp/Templates/ModelTemplate.cshtml b/AutoRest/Generators/CSharp/CSharp/Templates/ModelTemplate.cshtml
index 2bcf9676f0951..aeb27d92a4579 100644
--- a/AutoRest/Generators/CSharp/CSharp/Templates/ModelTemplate.cshtml
+++ b/AutoRest/Generators/CSharp/CSharp/Templates/ModelTemplate.cshtml
@@ -109,7 +109,7 @@ namespace @(Settings.Namespace).Models
         @foreach (var property in Model.PropertyTemplateModels.Where(p => !p.IsConstant))
         {
         @:/// <summary>
-        @:@WrapComment("/// ", property.Documentation.EscapeXmlComment())
+        @:@WrapComment("/// ", property.GetFormattedPropertyDocumentation())
         @:/// </summary>
             if (property.Type.IsPrimaryType(KnownPrimaryType.Date))
             {
@@ -123,6 +123,10 @@ namespace @(Settings.Namespace).Models
             {
         @:[JsonConverter(typeof(Base64UrlJsonConverter))]
             }
+            if (property.Type.IsPrimaryType(KnownPrimaryType.UnixTime))
+            {
+        @:[JsonConverter(typeof(UnixTimeJsonConverter))]
+            }
         @:[JsonProperty(PropertyName = "@property.SerializedName")]
         @:public @property.Type.Name @property.Name { get; @(property.IsReadOnly ? "private " : "")set; }
         @EmptyLine
@@ -145,6 +149,10 @@ namespace @(Settings.Namespace).Models
             {
         @:[JsonConverter(typeof(Base64UrlJsonConverter))]
             }
+            if (property.Type.IsPrimaryType(KnownPrimaryType.UnixTime))
+            {
+        @:[JsonConverter(typeof(UnixTimeJsonConverter))]
+            }
         @:[JsonProperty(PropertyName = "@property.SerializedName")]
         @:public static @property.Type.Name @property.Name { get; private set; }
         @EmptyLine
diff --git a/AutoRest/Generators/Extensions/Azure.Extensions/AzureExtensions.cs b/AutoRest/Generators/Extensions/Azure.Extensions/AzureExtensions.cs
index c38246fdccd61..d4863ccf8beb9 100644
--- a/AutoRest/Generators/Extensions/Azure.Extensions/AzureExtensions.cs
+++ b/AutoRest/Generators/Extensions/Azure.Extensions/AzureExtensions.cs
@@ -77,7 +77,7 @@ public static void NormalizeAzureClientModel(ServiceClient serviceClient, Settin
             ParseODataExtension(serviceClient);
             FlattenModels(serviceClient);
             FlattenMethodParameters(serviceClient, settings);
-            AddParameterGroups(serviceClient);
+            ParameterGroupExtensionHelper.AddParameterGroups(serviceClient);
             AddLongRunningOperations(serviceClient);
             AddAzureProperties(serviceClient);
             SetDefaultResponses(serviceClient);
diff --git a/AutoRest/Generators/Extensions/Extensions.Tests/MappingTests.cs b/AutoRest/Generators/Extensions/Extensions.Tests/MappingTests.cs
index 57151c0272701..3552847f2b1e6 100644
--- a/AutoRest/Generators/Extensions/Extensions.Tests/MappingTests.cs
+++ b/AutoRest/Generators/Extensions/Extensions.Tests/MappingTests.cs
@@ -11,7 +11,7 @@ namespace Microsoft.Rest.Generator.Tests
 {
     public class MappingExtensionsTests
     {
-        [Fact]
+        [Fact(Skip = "true")]
         public void TestInputMapping()
         {
             var settings = new Settings
diff --git a/AutoRest/Generators/Extensions/Extensions/AutoRest.Generator.Extensions.csproj b/AutoRest/Generators/Extensions/Extensions/AutoRest.Generator.Extensions.csproj
index b5ca288802491..baeb25e146303 100644
--- a/AutoRest/Generators/Extensions/Extensions/AutoRest.Generator.Extensions.csproj
+++ b/AutoRest/Generators/Extensions/Extensions/AutoRest.Generator.Extensions.csproj
@@ -27,6 +27,7 @@
     <Compile Include="ClientModelHelpers.cs" />
     <Compile Include="Extensions.cs" />
     <Compile Include="GlobalSuppressions.cs" />
+    <Compile Include="ParameterGroupExtensionHelper.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
diff --git a/AutoRest/Generators/Extensions/Extensions/Extensions.cs b/AutoRest/Generators/Extensions/Extensions/Extensions.cs
index e974d9563af25..2016e53f1fb60 100644
--- a/AutoRest/Generators/Extensions/Extensions/Extensions.cs
+++ b/AutoRest/Generators/Extensions/Extensions/Extensions.cs
@@ -12,6 +12,8 @@
 using Microsoft.Rest.Modeler.Swagger.Model;
 using Newtonsoft.Json.Linq;
 using Newtonsoft.Json;
+using System.Text.RegularExpressions;
+using Microsoft.Rest.Generator.Properties;
 
 namespace Microsoft.Rest.Generator
 {
@@ -27,6 +29,8 @@ public abstract class Extensions
         public const string FlattenOriginalTypeName = "x-ms-client-flatten-original-type-name";
         public const string ParameterGroupExtension = "x-ms-parameter-grouping";
         public const string ParameterizedHostExtension = "x-ms-parameterized-host";
+        public const string UseSchemePrefix = "useSchemePrefix";
+        public const string PositionInOperation = "positionInOperation";
 
         private static bool hostChecked = false;
 
@@ -40,7 +44,7 @@ public static void NormalizeClientModel(ServiceClient serviceClient, Settings se
         {
             FlattenModels(serviceClient);
             FlattenMethodParameters(serviceClient, settings);
-            AddParameterGroups(serviceClient);
+            ParameterGroupExtensionHelper.AddParameterGroups(serviceClient);
             ProcessParameterizedHost(serviceClient, settings);
         }
 
@@ -67,6 +71,28 @@ public static void ProcessParameterizedHost(ServiceClient serviceClient, Setting
                 {
                     var hostTemplate = (string)hostExtension["hostTemplate"];
                     var parametersJson = hostExtension["parameters"].ToString();
+                    var useSchemePrefix = true;
+                    if (hostExtension[UseSchemePrefix] != null)
+                    {
+                        useSchemePrefix = bool.Parse(hostExtension[UseSchemePrefix].ToString());
+                    }
+
+                    var position = "first";
+                    
+                    if (hostExtension[PositionInOperation] != null)
+                    {
+                        var pat = "^(fir|la)st$";
+                        Regex r = new Regex(pat, RegexOptions.IgnoreCase);
+                        var text = hostExtension[PositionInOperation].ToString();
+                        Match m = r.Match(text);
+                        if (!m.Success)
+                        {
+                            throw new InvalidOperationException(string.Format(CultureInfo.InvariantCulture, 
+                                Resources.InvalidExtensionProperty, text, PositionInOperation, ParameterizedHostExtension, "first, last"));
+                        }
+                        position = text;
+                    }
+
                     if (!string.IsNullOrEmpty(parametersJson))
                     {
                         var jsonSettings = new JsonSerializerSettings
@@ -76,7 +102,7 @@ public static void ProcessParameterizedHost(ServiceClient serviceClient, Setting
                         };
 
                         var swaggerParams = JsonConvert.DeserializeObject<List<SwaggerParameter>>(parametersJson, jsonSettings);
-                        
+                        List<Parameter> hostParamList = new List<Parameter>();
                         foreach (var swaggerParameter in swaggerParams)
                         {
                             // Build parameter
@@ -89,16 +115,33 @@ public static void ProcessParameterizedHost(ServiceClient serviceClient, Setting
                                 parameter.ClientProperty = serviceClient.Properties.Single(p => p.SerializedName.Equals(parameter.SerializedName));
                             }
                             parameter.Extensions["hostParameter"] = true;
+                            hostParamList.Add(parameter);
+                        }
 
-                            foreach (var method in serviceClient.Methods)
+                        foreach (var method in serviceClient.Methods)
+                        {
+                            if (position.Equals("first", StringComparison.OrdinalIgnoreCase))
                             {
-                                method.Parameters.Add(parameter);
+                                method.Parameters.InsertRange(0, hostParamList);
                             }
+                            else
+                            {
+                                method.Parameters.AddRange(hostParamList);
+                            }
+                            
                         }
-
-                        serviceClient.BaseUrl = string.Format(CultureInfo.InvariantCulture, "{0}://{1}{2}",
-                        modeler.ServiceDefinition.Schemes[0].ToString().ToLowerInvariant(),
-                        hostTemplate, modeler.ServiceDefinition.BasePath);
+                        if (useSchemePrefix)
+                        {
+                            serviceClient.BaseUrl = string.Format(CultureInfo.InvariantCulture, "{0}://{1}{2}",
+                                modeler.ServiceDefinition.Schemes[0].ToString().ToLowerInvariant(),
+                                hostTemplate, modeler.ServiceDefinition.BasePath);
+                        }
+                        else
+                        {
+                            serviceClient.BaseUrl = string.Format(CultureInfo.InvariantCulture, "{0}{1}",
+                                hostTemplate, modeler.ServiceDefinition.BasePath);
+                        }
+                        
                     }
                 }
             }
@@ -290,142 +333,6 @@ public static void RemoveUnreferencedTypes(ServiceClient serviceClient, HashSet<
             }
         }
 
-        /// <summary>
-        /// Adds the parameter groups to operation parameters.
-        /// </summary>
-        /// <param name="serviceClient"></param>
-        public static void AddParameterGroups(ServiceClient serviceClient)
-        {
-            if (serviceClient == null)
-            {
-                throw new ArgumentNullException("serviceClient");
-            }
-
-            HashSet<CompositeType> generatedParameterGroups = new HashSet<CompositeType>();
-
-            foreach (Method method in serviceClient.Methods)
-            {
-                //Copy out flattening transformations as they should be the last
-                List<ParameterTransformation> flatteningTransformations = method.InputParameterTransformation.ToList();
-                method.InputParameterTransformation.Clear();
-
-                //This group name is normalized by each languages code generator later, so it need not happen here.
-                Dictionary<string, Dictionary<Property, Parameter>> parameterGroups = new Dictionary<string, Dictionary<Property, Parameter>>();
-
-                foreach (Parameter parameter in method.Parameters)
-                {
-                    if (parameter.Extensions.ContainsKey(ParameterGroupExtension))
-                    {
-                        JContainer extensionObject = parameter.Extensions[ParameterGroupExtension] as JContainer;
-                        if (extensionObject != null)
-                        {
-                            string specifiedGroupName = extensionObject.Value<string>("name");
-                            string parameterGroupName;
-                            if (specifiedGroupName == null)
-                            {
-                                string postfix = extensionObject.Value<string>("postfix") ?? "Parameters";
-                                parameterGroupName = method.Group + "-" + method.Name + "-" + postfix;
-                            }
-                            else
-                            {
-                                parameterGroupName = specifiedGroupName;
-                            }
-
-                            if (!parameterGroups.ContainsKey(parameterGroupName))
-                            {
-                                parameterGroups.Add(parameterGroupName, new Dictionary<Property, Parameter>());
-                            }
-
-                            Property groupProperty = new Property()
-                            {
-                                IsReadOnly = false, //Since these properties are used as parameters they are never read only
-                                Name = parameter.Name,
-                                IsRequired = parameter.IsRequired,
-                                DefaultValue = parameter.DefaultValue,
-                                //Constraints = parameter.Constraints, Omit these since we don't want to perform parameter validation
-                                Documentation = parameter.Documentation,
-                                Type = parameter.Type,
-                                SerializedName = null //Parameter is never serialized directly
-                            };
-                            // Copy over extensions
-                            foreach (var key in parameter.Extensions.Keys)
-                            {
-                                groupProperty.Extensions[key] = parameter.Extensions[key];
-                            }
-
-                            parameterGroups[parameterGroupName].Add(groupProperty, parameter);
-                        }
-                    }
-                }
-
-                foreach (string parameterGroupName in parameterGroups.Keys)
-                {
-                    CompositeType parameterGroupType =
-                        generatedParameterGroups.FirstOrDefault(item => item.Name == parameterGroupName);
-                    if (parameterGroupType == null)
-                    {
-                        parameterGroupType = new CompositeType
-                        {
-                            Name = parameterGroupName,
-                            Documentation = "Additional parameters for the " + method.Name + " operation."
-                        };
-                        generatedParameterGroups.Add(parameterGroupType);
-
-                        //Add to the service client
-                        serviceClient.ModelTypes.Add(parameterGroupType);
-                    }
-
-                    foreach (Property property in parameterGroups[parameterGroupName].Keys)
-                    {
-                        Property matchingProperty = parameterGroupType.Properties.FirstOrDefault(
-                                item => item.Name == property.Name &&
-                                        item.IsReadOnly == property.IsReadOnly &&
-                                        item.DefaultValue == property.DefaultValue &&
-                                        item.SerializedName == property.SerializedName);
-                        if (matchingProperty == null)
-                        {
-                            parameterGroupType.Properties.Add(property);
-                        }
-                    }
-
-                    bool isGroupParameterRequired = parameterGroupType.Properties.Any(p => p.IsRequired);
-
-                    //Create the new parameter object based on the parameter group type
-                    Parameter parameterGroup = new Parameter()
-                    {
-                        Name = parameterGroupName,
-                        IsRequired = isGroupParameterRequired,
-                        Location = ClientModel.ParameterLocation.None,
-                        SerializedName = string.Empty,
-                        Type = parameterGroupType,
-                        Documentation = "Additional parameters for the operation"
-                    };
-
-                    method.Parameters.Add(parameterGroup);
-
-                    //Link the grouped parameters to their parent, and remove them from the method parameters
-                    foreach (Property property in parameterGroups[parameterGroupName].Keys)
-                    {
-                        Parameter p = parameterGroups[parameterGroupName][property];
-
-                        var parameterTransformation = new ParameterTransformation
-                        {
-                            OutputParameter = p
-                        };
-                        parameterTransformation.ParameterMappings.Add(new ParameterMapping
-                        {
-                            InputParameter = parameterGroup,
-                            InputParameterProperty = property.GetClientName()
-                        });
-                        method.InputParameterTransformation.Add(parameterTransformation);
-                        method.Parameters.Remove(p);
-                    }                    
-                }
-
-                // Copy back flattening transformations if any
-                flatteningTransformations.ForEach(t => method.InputParameterTransformation.Add(t));
-            }
-        }
 
         /// <summary>
         /// Flattens the request payload if the number of properties of the 
diff --git a/AutoRest/Generators/Extensions/Extensions/ParameterGroupExtensionHelper.cs b/AutoRest/Generators/Extensions/Extensions/ParameterGroupExtensionHelper.cs
new file mode 100644
index 0000000000000..5a97e2619f79f
--- /dev/null
+++ b/AutoRest/Generators/Extensions/Extensions/ParameterGroupExtensionHelper.cs
@@ -0,0 +1,229 @@
+namespace Microsoft.Rest.Generator
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Globalization;
+    using System.Linq;
+    using System.Text;
+    using System.Threading.Tasks;
+    using ClientModel;
+    using Newtonsoft.Json.Linq;
+
+    public static class ParameterGroupExtensionHelper
+    {
+        private class ParameterGroup
+        {
+            public string Name { get; }
+
+            public Dictionary<Property, Parameter> ParameterMapping { get; }
+
+            public ParameterGroup(string name, Dictionary<Property, Parameter> parameterMapping)
+            {
+                this.Name = name;
+                this.ParameterMapping = parameterMapping;
+            }
+        }
+
+        private static Property CreateParameterGroupProperty(Parameter parameter)
+        {
+            Property groupProperty = new Property()
+            {
+                IsReadOnly = false, //Since these properties are used as parameters they are never read only
+                Name = parameter.Name,
+                IsRequired = parameter.IsRequired,
+                DefaultValue = parameter.DefaultValue,
+                //Constraints = parameter.Constraints, Omit these since we don't want to perform parameter validation
+                Documentation = parameter.Documentation,
+                Type = parameter.Type,
+                SerializedName = null //Parameter is never serialized directly
+            };
+
+            // Copy over extensions
+            foreach (var key in parameter.Extensions.Keys)
+            {
+                groupProperty.Extensions[key] = parameter.Extensions[key];
+            }
+
+            return groupProperty;
+        }
+
+        private static ParameterGroup BuildParameterGroup(string parameterGroupName, Method method)
+        {
+            Dictionary<Property, Parameter> parameterMapping = method.Parameters.Where(
+                p => GetParameterGroupName(method.Group, method.Name, p) == parameterGroupName).ToDictionary(
+                    CreateParameterGroupProperty,
+                    p => p);
+
+            return new ParameterGroup(parameterGroupName, parameterMapping);
+        }
+
+        private static string GetParameterGroupName(string methodGroupName, string methodName, Parameter parameter)
+        {
+            if (parameter.Extensions.ContainsKey(Extensions.ParameterGroupExtension))
+            {
+                JContainer extensionObject = parameter.Extensions[Extensions.ParameterGroupExtension] as JContainer;
+                if (extensionObject != null)
+                {
+                    string specifiedGroupName = extensionObject.Value<string>("name");
+                    string parameterGroupName;
+                    if (specifiedGroupName == null)
+                    {
+                        string postfix = extensionObject.Value<string>("postfix") ?? "Parameters";
+                        parameterGroupName = methodGroupName + "-" + methodName + "-" + postfix;
+                    }
+                    else
+                    {
+                        parameterGroupName = specifiedGroupName;
+                    }
+                    return parameterGroupName;
+                }
+            }
+
+            return null;
+        }
+
+        private static IEnumerable<string> ExtractParameterGroupNames(Method method)
+        {
+            return method.Parameters.Select(p => GetParameterGroupName(method.Group, method.Name, p)).Where(name => !string.IsNullOrEmpty(name)).Distinct();
+        }
+
+        private static IEnumerable<ParameterGroup> ExtractParameterGroups(Method method)
+        {
+            IEnumerable<string> parameterGroupNames = ExtractParameterGroupNames(method);
+
+            return parameterGroupNames.Select(parameterGroupName => BuildParameterGroup(parameterGroupName, method));
+        }
+
+        private static IEnumerable<Method> GetMethodsUsingParameterGroup(IEnumerable<Method> methods, ParameterGroup parameterGroup)
+        {
+            return methods.Where(m => ExtractParameterGroupNames(m).Contains(parameterGroup.Name));
+        }
+
+        private static string GenerateParameterGroupModelText(IEnumerable<Method> methodsWhichUseGroup)
+        {
+            Func<string, string, string> createOperationDisplayString = (group, name) =>
+            {
+                return string.IsNullOrEmpty(group) ? name : string.Format(CultureInfo.InvariantCulture, "{0}_{1}", group, name);
+            };
+
+            List<Method> methodList = methodsWhichUseGroup.ToList();
+            if (methodList.Count == 1)
+            {
+                Method method = methodList.Single();
+                return string.Format(CultureInfo.InvariantCulture, "Additional parameters for the {0} operation.",
+                    createOperationDisplayString(method.Group, method.Name));
+            }
+            else if (methodList.Count <= 4)
+            {
+                string operationsString = string.Join(", ", methodList.Select(
+                    m => string.Format(CultureInfo.InvariantCulture, createOperationDisplayString(m.Group, m.Name))));
+
+                return string.Format(CultureInfo.InvariantCulture, "Additional parameters for a set of operations, such as: {0}.", operationsString);
+            }
+            else
+            {
+                return "Additional parameters for a set of operations.";
+            }
+        }
+
+        /// <summary>
+        /// Adds the parameter groups to operation parameters.
+        /// </summary>
+        /// <param name="serviceClient"></param>
+        public static void AddParameterGroups(ServiceClient serviceClient)
+        {
+            if (serviceClient == null)
+            {
+                throw new ArgumentNullException("serviceClient");
+            }
+
+            HashSet<CompositeType> generatedParameterGroups = new HashSet<CompositeType>();
+
+            foreach (Method method in serviceClient.Methods)
+            {
+                //Copy out flattening transformations as they should be the last
+                List<ParameterTransformation> flatteningTransformations = method.InputParameterTransformation.ToList();
+                method.InputParameterTransformation.Clear();
+
+                //This group name is normalized by each languages code generator later, so it need not happen here.
+                IEnumerable<ParameterGroup> parameterGroups = ExtractParameterGroups(method);
+
+                List<Parameter> parametersToAddToMethod = new List<Parameter>();
+                List<Parameter> parametersToRemoveFromMethod = new List<Parameter>();
+
+                foreach (ParameterGroup parameterGroup in parameterGroups)
+                {
+                    CompositeType parameterGroupType =
+                        generatedParameterGroups.FirstOrDefault(item => item.Name == parameterGroup.Name);
+
+                    if (parameterGroupType == null)
+                    {
+                        IEnumerable<Method> methodsWhichUseGroup = GetMethodsUsingParameterGroup(serviceClient.Methods, parameterGroup);
+
+                        parameterGroupType = new CompositeType
+                        {
+                            Name = parameterGroup.Name,
+                            Documentation = GenerateParameterGroupModelText(methodsWhichUseGroup)
+                        };
+                        generatedParameterGroups.Add(parameterGroupType);
+
+                        //Add to the service client
+                        serviceClient.ModelTypes.Add(parameterGroupType);
+                    }
+
+                    foreach (Property property in parameterGroup.ParameterMapping.Keys)
+                    {
+                        Property matchingProperty = parameterGroupType.Properties.FirstOrDefault(
+                                item => item.Name == property.Name &&
+                                        item.IsReadOnly == property.IsReadOnly &&
+                                        item.DefaultValue == property.DefaultValue &&
+                                        item.SerializedName == property.SerializedName);
+                        if (matchingProperty == null)
+                        {
+                            parameterGroupType.Properties.Add(property);
+                        }
+                    }
+
+                    bool isGroupParameterRequired = parameterGroupType.Properties.Any(p => p.IsRequired);
+
+                    //Create the new parameter object based on the parameter group type
+                    Parameter newParameter = new Parameter()
+                    {
+                        Name = parameterGroup.Name,
+                        IsRequired = isGroupParameterRequired,
+                        Location = ClientModel.ParameterLocation.None,
+                        SerializedName = string.Empty,
+                        Type = parameterGroupType,
+                        Documentation = "Additional parameters for the operation"
+                    };
+                    parametersToAddToMethod.Add(newParameter);
+
+                    //Link the grouped parameters to their parent, and remove them from the method parameters
+                    foreach (Property property in parameterGroup.ParameterMapping.Keys)
+                    {
+                        Parameter p = parameterGroup.ParameterMapping[property];
+
+                        var parameterTransformation = new ParameterTransformation
+                        {
+                            OutputParameter = p
+                        };
+
+                        parameterTransformation.ParameterMappings.Add(new ParameterMapping
+                        {
+                            InputParameter = newParameter,
+                            InputParameterProperty = property.GetClientName()
+                        });
+                        method.InputParameterTransformation.Add(parameterTransformation);
+                        parametersToRemoveFromMethod.Add(p);
+                    }
+                }
+
+                method.Parameters.RemoveAll(p => parametersToRemoveFromMethod.Contains(p));
+                method.Parameters.AddRange(parametersToAddToMethod);
+
+                // Copy back flattening transformations if any
+                flatteningTransformations.ForEach(t => method.InputParameterTransformation.Add(t));
+            }
+        }
+    }
+}
diff --git a/AutoRest/Generators/Extensions/Extensions/Properties/Resources.Designer.cs b/AutoRest/Generators/Extensions/Extensions/Properties/Resources.Designer.cs
index 689a601b826f3..f98e2ea0b022c 100644
--- a/AutoRest/Generators/Extensions/Extensions/Properties/Resources.Designer.cs
+++ b/AutoRest/Generators/Extensions/Extensions/Properties/Resources.Designer.cs
@@ -69,6 +69,15 @@ internal class Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to The value &apos;{0}&apos; provided for property &apos;{1}&apos; of extension &apos;{2} is invalid. Valid values are: &apos;{3}&apos;..
+        /// </summary>
+        internal static string InvalidExtensionProperty {
+            get {
+                return ResourceManager.GetString("InvalidExtensionProperty", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Azure resource {0} is missing required &apos;properties&apos; property..
         /// </summary>
diff --git a/AutoRest/Generators/Extensions/Extensions/Properties/Resources.resx b/AutoRest/Generators/Extensions/Extensions/Properties/Resources.resx
index d06a580a716fe..7df584f0a47aa 100644
--- a/AutoRest/Generators/Extensions/Extensions/Properties/Resources.resx
+++ b/AutoRest/Generators/Extensions/Extensions/Properties/Resources.resx
@@ -120,6 +120,9 @@
   <data name="HeadMethodInvalidResponses" xml:space="preserve">
     <value>Head method '{0}' should contain only 200 level responses, or 404.</value>
   </data>
+  <data name="InvalidExtensionProperty" xml:space="preserve">
+    <value>The value '{0}' provided for property '{1}' of extension '{2} is invalid. Valid values are: '{3}'.</value>
+  </data>
   <data name="MissingProperties" xml:space="preserve">
     <value>Azure resource {0} is missing required 'properties' property.</value>
   </data>
diff --git a/AutoRest/Generators/Java/Azure.Java.Tests/src/main/java/fixtures/azureparametergrouping/models/FirstParameterGroup.java b/AutoRest/Generators/Java/Azure.Java.Tests/src/main/java/fixtures/azureparametergrouping/models/FirstParameterGroup.java
index 714247eeb7969..bbe5038e8892e 100644
--- a/AutoRest/Generators/Java/Azure.Java.Tests/src/main/java/fixtures/azureparametergrouping/models/FirstParameterGroup.java
+++ b/AutoRest/Generators/Java/Azure.Java.Tests/src/main/java/fixtures/azureparametergrouping/models/FirstParameterGroup.java
@@ -13,7 +13,9 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
- * Additional parameters for the postMultiParamGroups operation.
+ * Additional parameters for a set of operations, such as:
+ * parameterGrouping_postMultiParamGroups,
+ * parameterGrouping_postSharedParameterGroupObject.
  */
 public class FirstParameterGroup {
     /**
diff --git a/AutoRest/Generators/Java/Azure.Java.Tests/src/main/java/fixtures/azureparametergrouping/models/ParameterGroupingPostMultiParamGroupsSecondParamGroup.java b/AutoRest/Generators/Java/Azure.Java.Tests/src/main/java/fixtures/azureparametergrouping/models/ParameterGroupingPostMultiParamGroupsSecondParamGroup.java
index c44445601ac69..e8c9db90cc753 100644
--- a/AutoRest/Generators/Java/Azure.Java.Tests/src/main/java/fixtures/azureparametergrouping/models/ParameterGroupingPostMultiParamGroupsSecondParamGroup.java
+++ b/AutoRest/Generators/Java/Azure.Java.Tests/src/main/java/fixtures/azureparametergrouping/models/ParameterGroupingPostMultiParamGroupsSecondParamGroup.java
@@ -13,7 +13,8 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
- * Additional parameters for the postMultiParamGroups operation.
+ * Additional parameters for the parameterGrouping_postMultiParamGroups
+ * operation.
  */
 public class ParameterGroupingPostMultiParamGroupsSecondParamGroup {
     /**
diff --git a/AutoRest/Generators/Java/Azure.Java.Tests/src/main/java/fixtures/azureparametergrouping/models/ParameterGroupingPostOptionalParameters.java b/AutoRest/Generators/Java/Azure.Java.Tests/src/main/java/fixtures/azureparametergrouping/models/ParameterGroupingPostOptionalParameters.java
index 641ac92c6ad07..8177eb2257697 100644
--- a/AutoRest/Generators/Java/Azure.Java.Tests/src/main/java/fixtures/azureparametergrouping/models/ParameterGroupingPostOptionalParameters.java
+++ b/AutoRest/Generators/Java/Azure.Java.Tests/src/main/java/fixtures/azureparametergrouping/models/ParameterGroupingPostOptionalParameters.java
@@ -13,7 +13,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
- * Additional parameters for the postOptional operation.
+ * Additional parameters for the parameterGrouping_postOptional operation.
  */
 public class ParameterGroupingPostOptionalParameters {
     /**
diff --git a/AutoRest/Generators/Java/Azure.Java.Tests/src/main/java/fixtures/azureparametergrouping/models/ParameterGroupingPostRequiredParameters.java b/AutoRest/Generators/Java/Azure.Java.Tests/src/main/java/fixtures/azureparametergrouping/models/ParameterGroupingPostRequiredParameters.java
index c038b22f59d50..98f0a230bc383 100644
--- a/AutoRest/Generators/Java/Azure.Java.Tests/src/main/java/fixtures/azureparametergrouping/models/ParameterGroupingPostRequiredParameters.java
+++ b/AutoRest/Generators/Java/Azure.Java.Tests/src/main/java/fixtures/azureparametergrouping/models/ParameterGroupingPostRequiredParameters.java
@@ -13,7 +13,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
- * Additional parameters for the postRequired operation.
+ * Additional parameters for the parameterGrouping_postRequired operation.
  */
 public class ParameterGroupingPostRequiredParameters {
     /**
diff --git a/AutoRest/Generators/Java/Azure.Java.Tests/src/main/java/fixtures/lro/LROSADsOperations.java b/AutoRest/Generators/Java/Azure.Java.Tests/src/main/java/fixtures/lro/LROSADsOperations.java
index 67695190d0b37..7fdc2cc170dd2 100644
--- a/AutoRest/Generators/Java/Azure.Java.Tests/src/main/java/fixtures/lro/LROSADsOperations.java
+++ b/AutoRest/Generators/Java/Azure.Java.Tests/src/main/java/fixtures/lro/LROSADsOperations.java
@@ -195,6 +195,82 @@ public interface LROSADsOperations {
      */
     ServiceCall beginPutNonRetry201Creating400Async(Product product, final ServiceCallback<Product> serviceCallback) throws IllegalArgumentException;
 
+    /**
+     * Long running put request, service returns a Product with 'ProvisioningState' = 'Creating' and 201 response code.
+     *
+     * @throws CloudException exception thrown from REST call
+     * @throws IOException exception thrown from serialization/deserialization
+     * @throws InterruptedException exception thrown when long running operation is interrupted
+     * @return the Product object wrapped in {@link ServiceResponse} if successful.
+     */
+    ServiceResponse<Product> putNonRetry201Creating400InvalidJson() throws CloudException, IOException, InterruptedException;
+
+    /**
+     * Long running put request, service returns a Product with 'ProvisioningState' = 'Creating' and 201 response code.
+     *
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if callback is null
+     * @return the {@link ServiceCall} object
+     */
+    ServiceCall putNonRetry201Creating400InvalidJsonAsync(final ServiceCallback<Product> serviceCallback) throws IllegalArgumentException;
+    /**
+     * Long running put request, service returns a Product with 'ProvisioningState' = 'Creating' and 201 response code.
+     *
+     * @param product Product to put
+     * @throws CloudException exception thrown from REST call
+     * @throws IOException exception thrown from serialization/deserialization
+     * @throws InterruptedException exception thrown when long running operation is interrupted
+     * @return the Product object wrapped in {@link ServiceResponse} if successful.
+     */
+    ServiceResponse<Product> putNonRetry201Creating400InvalidJson(Product product) throws CloudException, IOException, InterruptedException;
+
+    /**
+     * Long running put request, service returns a Product with 'ProvisioningState' = 'Creating' and 201 response code.
+     *
+     * @param product Product to put
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if callback is null
+     * @return the {@link ServiceCall} object
+     */
+    ServiceCall putNonRetry201Creating400InvalidJsonAsync(Product product, final ServiceCallback<Product> serviceCallback) throws IllegalArgumentException;
+
+    /**
+     * Long running put request, service returns a Product with 'ProvisioningState' = 'Creating' and 201 response code.
+     *
+     * @throws CloudException exception thrown from REST call
+     * @throws IOException exception thrown from serialization/deserialization
+     * @return the Product object wrapped in {@link ServiceResponse} if successful.
+     */
+    ServiceResponse<Product> beginPutNonRetry201Creating400InvalidJson() throws CloudException, IOException;
+
+    /**
+     * Long running put request, service returns a Product with 'ProvisioningState' = 'Creating' and 201 response code.
+     *
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if callback is null
+     * @return the {@link ServiceCall} object
+     */
+    ServiceCall beginPutNonRetry201Creating400InvalidJsonAsync(final ServiceCallback<Product> serviceCallback) throws IllegalArgumentException;
+    /**
+     * Long running put request, service returns a Product with 'ProvisioningState' = 'Creating' and 201 response code.
+     *
+     * @param product Product to put
+     * @throws CloudException exception thrown from REST call
+     * @throws IOException exception thrown from serialization/deserialization
+     * @return the Product object wrapped in {@link ServiceResponse} if successful.
+     */
+    ServiceResponse<Product> beginPutNonRetry201Creating400InvalidJson(Product product) throws CloudException, IOException;
+
+    /**
+     * Long running put request, service returns a Product with 'ProvisioningState' = 'Creating' and 201 response code.
+     *
+     * @param product Product to put
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if callback is null
+     * @return the {@link ServiceCall} object
+     */
+    ServiceCall beginPutNonRetry201Creating400InvalidJsonAsync(Product product, final ServiceCallback<Product> serviceCallback) throws IllegalArgumentException;
+
     /**
      * Long running put request, service returns a 200 with ProvisioningState=’Creating’. Poll the endpoint indicated in the Azure-AsyncOperation header for operation status.
      *
diff --git a/AutoRest/Generators/Java/Azure.Java.Tests/src/main/java/fixtures/lro/LROSADsOperationsImpl.java b/AutoRest/Generators/Java/Azure.Java.Tests/src/main/java/fixtures/lro/LROSADsOperationsImpl.java
index a00b4293ab132..2f3623d834f8d 100644
--- a/AutoRest/Generators/Java/Azure.Java.Tests/src/main/java/fixtures/lro/LROSADsOperationsImpl.java
+++ b/AutoRest/Generators/Java/Azure.Java.Tests/src/main/java/fixtures/lro/LROSADsOperationsImpl.java
@@ -95,6 +95,14 @@ interface LROSADsService {
         @PUT("lro/nonretryerror/put/201/creating/400")
         Call<ResponseBody> beginPutNonRetry201Creating400(@Body Product product, @Header("accept-language") String acceptLanguage);
 
+        @Headers("Content-Type: application/json; charset=utf-8")
+        @PUT("lro/nonretryerror/put/201/creating/400/invalidjson")
+        Call<ResponseBody> putNonRetry201Creating400InvalidJson(@Body Product product, @Header("accept-language") String acceptLanguage);
+
+        @Headers("Content-Type: application/json; charset=utf-8")
+        @PUT("lro/nonretryerror/put/201/creating/400/invalidjson")
+        Call<ResponseBody> beginPutNonRetry201Creating400InvalidJson(@Body Product product, @Header("accept-language") String acceptLanguage);
+
         @Headers("Content-Type: application/json; charset=utf-8")
         @PUT("lro/nonretryerror/putasync/retry/400")
         Call<ResponseBody> putAsyncRelativeRetry400(@Body Product product, @Header("accept-language") String acceptLanguage);
@@ -627,6 +635,179 @@ private ServiceResponse<Product> beginPutNonRetry201Creating400Delegate(Response
                 .build(response);
     }
 
+    /**
+     * Long running put request, service returns a Product with 'ProvisioningState' = 'Creating' and 201 response code.
+     *
+     * @throws CloudException exception thrown from REST call
+     * @throws IOException exception thrown from serialization/deserialization
+     * @throws InterruptedException exception thrown when long running operation is interrupted
+     * @return the Product object wrapped in ServiceResponse if successful.
+     */
+    public ServiceResponse<Product> putNonRetry201Creating400InvalidJson() throws CloudException, IOException, InterruptedException {
+        final Product product = null;
+        Response<ResponseBody> result = service.putNonRetry201Creating400InvalidJson(product, this.client.getAcceptLanguage()).execute();
+        return client.getAzureClient().getPutOrPatchResult(result, new TypeToken<Product>() { }.getType());
+    }
+
+    /**
+     * Long running put request, service returns a Product with 'ProvisioningState' = 'Creating' and 201 response code.
+     *
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if callback is null
+     * @return the {@link ServiceCall} object
+     */
+    public ServiceCall putNonRetry201Creating400InvalidJsonAsync(final ServiceCallback<Product> serviceCallback) throws IllegalArgumentException {
+        if (serviceCallback == null) {
+            throw new IllegalArgumentException("ServiceCallback is required for async calls.");
+        }
+        final Product product = null;
+        Call<ResponseBody> call = service.putNonRetry201Creating400InvalidJson(product, this.client.getAcceptLanguage());
+        final ServiceCall serviceCall = new ServiceCall(call);
+        call.enqueue(new Callback<ResponseBody>() {
+            @Override
+            public void onFailure(Call<ResponseBody> call, Throwable t) {
+                serviceCallback.failure(t);
+            }
+            @Override
+            public void onResponse(Call<ResponseBody> call, Response<ResponseBody> response) {
+                client.getAzureClient().getPutOrPatchResultAsync(response, new TypeToken<Product>() { }.getType(), serviceCall, serviceCallback);
+            }
+        });
+        return serviceCall;
+    }
+    /**
+     * Long running put request, service returns a Product with 'ProvisioningState' = 'Creating' and 201 response code.
+     *
+     * @param product Product to put
+     * @throws CloudException exception thrown from REST call
+     * @throws IOException exception thrown from serialization/deserialization
+     * @throws InterruptedException exception thrown when long running operation is interrupted
+     * @return the Product object wrapped in ServiceResponse if successful.
+     */
+    public ServiceResponse<Product> putNonRetry201Creating400InvalidJson(Product product) throws CloudException, IOException, InterruptedException {
+        Validator.validate(product);
+        Response<ResponseBody> result = service.putNonRetry201Creating400InvalidJson(product, this.client.getAcceptLanguage()).execute();
+        return client.getAzureClient().getPutOrPatchResult(result, new TypeToken<Product>() { }.getType());
+    }
+
+    /**
+     * Long running put request, service returns a Product with 'ProvisioningState' = 'Creating' and 201 response code.
+     *
+     * @param product Product to put
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if callback is null
+     * @return the {@link ServiceCall} object
+     */
+    public ServiceCall putNonRetry201Creating400InvalidJsonAsync(Product product, final ServiceCallback<Product> serviceCallback) throws IllegalArgumentException {
+        if (serviceCallback == null) {
+            throw new IllegalArgumentException("ServiceCallback is required for async calls.");
+        }
+        Validator.validate(product, serviceCallback);
+        Call<ResponseBody> call = service.putNonRetry201Creating400InvalidJson(product, this.client.getAcceptLanguage());
+        final ServiceCall serviceCall = new ServiceCall(call);
+        call.enqueue(new Callback<ResponseBody>() {
+            @Override
+            public void onFailure(Call<ResponseBody> call, Throwable t) {
+                serviceCallback.failure(t);
+            }
+            @Override
+            public void onResponse(Call<ResponseBody> call, Response<ResponseBody> response) {
+                client.getAzureClient().getPutOrPatchResultAsync(response, new TypeToken<Product>() { }.getType(), serviceCall, serviceCallback);
+            }
+        });
+        return serviceCall;
+    }
+
+    /**
+     * Long running put request, service returns a Product with 'ProvisioningState' = 'Creating' and 201 response code.
+     *
+     * @throws CloudException exception thrown from REST call
+     * @throws IOException exception thrown from serialization/deserialization
+     * @return the Product object wrapped in {@link ServiceResponse} if successful.
+     */
+    public ServiceResponse<Product> beginPutNonRetry201Creating400InvalidJson() throws CloudException, IOException {
+        final Product product = null;
+        Call<ResponseBody> call = service.beginPutNonRetry201Creating400InvalidJson(product, this.client.getAcceptLanguage());
+        return beginPutNonRetry201Creating400InvalidJsonDelegate(call.execute());
+    }
+
+    /**
+     * Long running put request, service returns a Product with 'ProvisioningState' = 'Creating' and 201 response code.
+     *
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if callback is null
+     * @return the {@link Call} object
+     */
+    public ServiceCall beginPutNonRetry201Creating400InvalidJsonAsync(final ServiceCallback<Product> serviceCallback) throws IllegalArgumentException {
+        if (serviceCallback == null) {
+            throw new IllegalArgumentException("ServiceCallback is required for async calls.");
+        }
+        final Product product = null;
+        Call<ResponseBody> call = service.beginPutNonRetry201Creating400InvalidJson(product, this.client.getAcceptLanguage());
+        final ServiceCall serviceCall = new ServiceCall(call);
+        call.enqueue(new ServiceResponseCallback<Product>(serviceCallback) {
+            @Override
+            public void onResponse(Call<ResponseBody> call, Response<ResponseBody> response) {
+                try {
+                    serviceCallback.success(beginPutNonRetry201Creating400InvalidJsonDelegate(response));
+                } catch (CloudException | IOException exception) {
+                    serviceCallback.failure(exception);
+                }
+            }
+        });
+        return serviceCall;
+    }
+
+    /**
+     * Long running put request, service returns a Product with 'ProvisioningState' = 'Creating' and 201 response code.
+     *
+     * @param product Product to put
+     * @throws CloudException exception thrown from REST call
+     * @throws IOException exception thrown from serialization/deserialization
+     * @return the Product object wrapped in {@link ServiceResponse} if successful.
+     */
+    public ServiceResponse<Product> beginPutNonRetry201Creating400InvalidJson(Product product) throws CloudException, IOException {
+        Validator.validate(product);
+        Call<ResponseBody> call = service.beginPutNonRetry201Creating400InvalidJson(product, this.client.getAcceptLanguage());
+        return beginPutNonRetry201Creating400InvalidJsonDelegate(call.execute());
+    }
+
+    /**
+     * Long running put request, service returns a Product with 'ProvisioningState' = 'Creating' and 201 response code.
+     *
+     * @param product Product to put
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if callback is null
+     * @return the {@link Call} object
+     */
+    public ServiceCall beginPutNonRetry201Creating400InvalidJsonAsync(Product product, final ServiceCallback<Product> serviceCallback) throws IllegalArgumentException {
+        if (serviceCallback == null) {
+            throw new IllegalArgumentException("ServiceCallback is required for async calls.");
+        }
+        Validator.validate(product, serviceCallback);
+        Call<ResponseBody> call = service.beginPutNonRetry201Creating400InvalidJson(product, this.client.getAcceptLanguage());
+        final ServiceCall serviceCall = new ServiceCall(call);
+        call.enqueue(new ServiceResponseCallback<Product>(serviceCallback) {
+            @Override
+            public void onResponse(Call<ResponseBody> call, Response<ResponseBody> response) {
+                try {
+                    serviceCallback.success(beginPutNonRetry201Creating400InvalidJsonDelegate(response));
+                } catch (CloudException | IOException exception) {
+                    serviceCallback.failure(exception);
+                }
+            }
+        });
+        return serviceCall;
+    }
+
+    private ServiceResponse<Product> beginPutNonRetry201Creating400InvalidJsonDelegate(Response<ResponseBody> response) throws CloudException, IOException {
+        return new AzureServiceResponseBuilder<Product, CloudException>(this.client.getMapperAdapter())
+                .register(200, new TypeToken<Product>() { }.getType())
+                .register(201, new TypeToken<Product>() { }.getType())
+                .registerError(CloudException.class)
+                .build(response);
+    }
+
     /**
      * Long running put request, service returns a 200 with ProvisioningState=’Creating’. Poll the endpoint indicated in the Azure-AsyncOperation header for operation status.
      *
diff --git a/AutoRest/Generators/Java/Azure.Java.Tests/src/main/java/fixtures/paging/models/PagingGetMultiplePagesOptions.java b/AutoRest/Generators/Java/Azure.Java.Tests/src/main/java/fixtures/paging/models/PagingGetMultiplePagesOptions.java
index 6f61d486bb090..0ce6b1680d2f3 100644
--- a/AutoRest/Generators/Java/Azure.Java.Tests/src/main/java/fixtures/paging/models/PagingGetMultiplePagesOptions.java
+++ b/AutoRest/Generators/Java/Azure.Java.Tests/src/main/java/fixtures/paging/models/PagingGetMultiplePagesOptions.java
@@ -13,7 +13,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
- * Additional parameters for the getMultiplePages operation.
+ * Additional parameters for the Paging_getMultiplePages operation.
  */
 public class PagingGetMultiplePagesOptions {
     /**
diff --git a/AutoRest/Generators/Java/Azure.Java.Tests/src/main/java/fixtures/paging/models/PagingGetMultiplePagesWithOffsetOptions.java b/AutoRest/Generators/Java/Azure.Java.Tests/src/main/java/fixtures/paging/models/PagingGetMultiplePagesWithOffsetOptions.java
index 5827dbdd2d3a4..1cff9918a4fee 100644
--- a/AutoRest/Generators/Java/Azure.Java.Tests/src/main/java/fixtures/paging/models/PagingGetMultiplePagesWithOffsetOptions.java
+++ b/AutoRest/Generators/Java/Azure.Java.Tests/src/main/java/fixtures/paging/models/PagingGetMultiplePagesWithOffsetOptions.java
@@ -13,7 +13,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
- * Additional parameters for the getMultiplePagesWithOffset operation.
+ * Additional parameters for the Paging_getMultiplePagesWithOffset operation.
  */
 public class PagingGetMultiplePagesWithOffsetOptions {
     /**
diff --git a/AutoRest/Generators/Java/Azure.Java/AzureJavaCodeGenerator.cs b/AutoRest/Generators/Java/Azure.Java/AzureJavaCodeGenerator.cs
index d17290e7a1b97..45e4651a69e84 100644
--- a/AutoRest/Generators/Java/Azure.Java/AzureJavaCodeGenerator.cs
+++ b/AutoRest/Generators/Java/Azure.Java/AzureJavaCodeGenerator.cs
@@ -18,7 +18,7 @@ public class AzureJavaCodeGenerator : JavaCodeGenerator
     {
         private readonly AzureJavaCodeNamer _namer;
 
-        private const string ClientRuntimePackage = "com.microsoft.rest:azure-client-runtime:0.0.1-SNAPSHOT";
+        private const string ClientRuntimePackage = "com.microsoft.rest:azure-client-runtime:1.0.0-SNAPSHOT from snapshot repo http://adxsnapshots.azurewebsites.net/";
         private const string _packageInfoFileName = "package-info.java";
 
         // page extensions class dictionary.
diff --git a/AutoRest/Generators/Java/Java.Tests/src/main/java/fixtures/bodyinteger/IntOperations.java b/AutoRest/Generators/Java/Java.Tests/src/main/java/fixtures/bodyinteger/IntOperations.java
index 2f705c55d8129..9710c80eabe31 100644
--- a/AutoRest/Generators/Java/Java.Tests/src/main/java/fixtures/bodyinteger/IntOperations.java
+++ b/AutoRest/Generators/Java/Java.Tests/src/main/java/fixtures/bodyinteger/IntOperations.java
@@ -209,4 +209,78 @@ public interface IntOperations {
      */
     ServiceCall putMin64Async(long intBody, final ServiceCallback<Void> serviceCallback) throws IllegalArgumentException;
 
+    /**
+     * Get datetime encoded as Unix time value.
+     *
+     * @throws ErrorException exception thrown from REST call
+     * @throws IOException exception thrown from serialization/deserialization
+     * @return the long object wrapped in {@link ServiceResponse} if successful.
+     */
+    ServiceResponse<Long> getUnixTime() throws ErrorException, IOException;
+
+    /**
+     * Get datetime encoded as Unix time value.
+     *
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if callback is null
+     * @return the {@link ServiceCall} object
+     */
+    ServiceCall getUnixTimeAsync(final ServiceCallback<Long> serviceCallback) throws IllegalArgumentException;
+
+    /**
+     * Put datetime encoded as Unix time.
+     *
+     * @param intBody the long value
+     * @throws ErrorException exception thrown from REST call
+     * @throws IOException exception thrown from serialization/deserialization
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    ServiceResponse<Void> putUnixTimeDate(long intBody) throws ErrorException, IOException;
+
+    /**
+     * Put datetime encoded as Unix time.
+     *
+     * @param intBody the long value
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if callback is null
+     * @return the {@link ServiceCall} object
+     */
+    ServiceCall putUnixTimeDateAsync(long intBody, final ServiceCallback<Void> serviceCallback) throws IllegalArgumentException;
+
+    /**
+     * Get invalid Unix time value.
+     *
+     * @throws ErrorException exception thrown from REST call
+     * @throws IOException exception thrown from serialization/deserialization
+     * @return the long object wrapped in {@link ServiceResponse} if successful.
+     */
+    ServiceResponse<Long> getInvalidUnixTime() throws ErrorException, IOException;
+
+    /**
+     * Get invalid Unix time value.
+     *
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if callback is null
+     * @return the {@link ServiceCall} object
+     */
+    ServiceCall getInvalidUnixTimeAsync(final ServiceCallback<Long> serviceCallback) throws IllegalArgumentException;
+
+    /**
+     * Get null Unix time value.
+     *
+     * @throws ErrorException exception thrown from REST call
+     * @throws IOException exception thrown from serialization/deserialization
+     * @return the long object wrapped in {@link ServiceResponse} if successful.
+     */
+    ServiceResponse<Long> getNullUnixTime() throws ErrorException, IOException;
+
+    /**
+     * Get null Unix time value.
+     *
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if callback is null
+     * @return the {@link ServiceCall} object
+     */
+    ServiceCall getNullUnixTimeAsync(final ServiceCallback<Long> serviceCallback) throws IllegalArgumentException;
+
 }
diff --git a/AutoRest/Generators/Java/Java.Tests/src/main/java/fixtures/bodyinteger/IntOperationsImpl.java b/AutoRest/Generators/Java/Java.Tests/src/main/java/fixtures/bodyinteger/IntOperationsImpl.java
index 8e9325c0caf42..134ce02e57ae8 100644
--- a/AutoRest/Generators/Java/Java.Tests/src/main/java/fixtures/bodyinteger/IntOperationsImpl.java
+++ b/AutoRest/Generators/Java/Java.Tests/src/main/java/fixtures/bodyinteger/IntOperationsImpl.java
@@ -93,6 +93,22 @@ interface IntService {
         @PUT("int/min/64")
         Call<ResponseBody> putMin64(@Body long intBody);
 
+        @Headers("Content-Type: application/json; charset=utf-8")
+        @GET("int/unixtime")
+        Call<ResponseBody> getUnixTime();
+
+        @Headers("Content-Type: application/json; charset=utf-8")
+        @PUT("int/unixtime")
+        Call<ResponseBody> putUnixTimeDate(@Body long intBody);
+
+        @Headers("Content-Type: application/json; charset=utf-8")
+        @GET("int/invalidunixtime")
+        Call<ResponseBody> getInvalidUnixTime();
+
+        @Headers("Content-Type: application/json; charset=utf-8")
+        @GET("int/nullunixtime")
+        Call<ResponseBody> getNullUnixTime();
+
     }
 
     /**
@@ -553,4 +569,186 @@ private ServiceResponse<Void> putMin64Delegate(Response<ResponseBody> response)
                 .build(response);
     }
 
+    /**
+     * Get datetime encoded as Unix time value.
+     *
+     * @throws ErrorException exception thrown from REST call
+     * @throws IOException exception thrown from serialization/deserialization
+     * @return the long object wrapped in {@link ServiceResponse} if successful.
+     */
+    public ServiceResponse<Long> getUnixTime() throws ErrorException, IOException {
+        Call<ResponseBody> call = service.getUnixTime();
+        return getUnixTimeDelegate(call.execute());
+    }
+
+    /**
+     * Get datetime encoded as Unix time value.
+     *
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if callback is null
+     * @return the {@link Call} object
+     */
+    public ServiceCall getUnixTimeAsync(final ServiceCallback<Long> serviceCallback) throws IllegalArgumentException {
+        if (serviceCallback == null) {
+            throw new IllegalArgumentException("ServiceCallback is required for async calls.");
+        }
+        Call<ResponseBody> call = service.getUnixTime();
+        final ServiceCall serviceCall = new ServiceCall(call);
+        call.enqueue(new ServiceResponseCallback<Long>(serviceCallback) {
+            @Override
+            public void onResponse(Call<ResponseBody> call, Response<ResponseBody> response) {
+                try {
+                    serviceCallback.success(getUnixTimeDelegate(response));
+                } catch (ErrorException | IOException exception) {
+                    serviceCallback.failure(exception);
+                }
+            }
+        });
+        return serviceCall;
+    }
+
+    private ServiceResponse<Long> getUnixTimeDelegate(Response<ResponseBody> response) throws ErrorException, IOException {
+        return new ServiceResponseBuilder<Long, ErrorException>(this.client.getMapperAdapter())
+                .register(200, new TypeToken<Long>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Put datetime encoded as Unix time.
+     *
+     * @param intBody the long value
+     * @throws ErrorException exception thrown from REST call
+     * @throws IOException exception thrown from serialization/deserialization
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public ServiceResponse<Void> putUnixTimeDate(long intBody) throws ErrorException, IOException {
+        Call<ResponseBody> call = service.putUnixTimeDate(intBody);
+        return putUnixTimeDateDelegate(call.execute());
+    }
+
+    /**
+     * Put datetime encoded as Unix time.
+     *
+     * @param intBody the long value
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if callback is null
+     * @return the {@link Call} object
+     */
+    public ServiceCall putUnixTimeDateAsync(long intBody, final ServiceCallback<Void> serviceCallback) throws IllegalArgumentException {
+        if (serviceCallback == null) {
+            throw new IllegalArgumentException("ServiceCallback is required for async calls.");
+        }
+        Call<ResponseBody> call = service.putUnixTimeDate(intBody);
+        final ServiceCall serviceCall = new ServiceCall(call);
+        call.enqueue(new ServiceResponseCallback<Void>(serviceCallback) {
+            @Override
+            public void onResponse(Call<ResponseBody> call, Response<ResponseBody> response) {
+                try {
+                    serviceCallback.success(putUnixTimeDateDelegate(response));
+                } catch (ErrorException | IOException exception) {
+                    serviceCallback.failure(exception);
+                }
+            }
+        });
+        return serviceCall;
+    }
+
+    private ServiceResponse<Void> putUnixTimeDateDelegate(Response<ResponseBody> response) throws ErrorException, IOException {
+        return new ServiceResponseBuilder<Void, ErrorException>(this.client.getMapperAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Get invalid Unix time value.
+     *
+     * @throws ErrorException exception thrown from REST call
+     * @throws IOException exception thrown from serialization/deserialization
+     * @return the long object wrapped in {@link ServiceResponse} if successful.
+     */
+    public ServiceResponse<Long> getInvalidUnixTime() throws ErrorException, IOException {
+        Call<ResponseBody> call = service.getInvalidUnixTime();
+        return getInvalidUnixTimeDelegate(call.execute());
+    }
+
+    /**
+     * Get invalid Unix time value.
+     *
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if callback is null
+     * @return the {@link Call} object
+     */
+    public ServiceCall getInvalidUnixTimeAsync(final ServiceCallback<Long> serviceCallback) throws IllegalArgumentException {
+        if (serviceCallback == null) {
+            throw new IllegalArgumentException("ServiceCallback is required for async calls.");
+        }
+        Call<ResponseBody> call = service.getInvalidUnixTime();
+        final ServiceCall serviceCall = new ServiceCall(call);
+        call.enqueue(new ServiceResponseCallback<Long>(serviceCallback) {
+            @Override
+            public void onResponse(Call<ResponseBody> call, Response<ResponseBody> response) {
+                try {
+                    serviceCallback.success(getInvalidUnixTimeDelegate(response));
+                } catch (ErrorException | IOException exception) {
+                    serviceCallback.failure(exception);
+                }
+            }
+        });
+        return serviceCall;
+    }
+
+    private ServiceResponse<Long> getInvalidUnixTimeDelegate(Response<ResponseBody> response) throws ErrorException, IOException {
+        return new ServiceResponseBuilder<Long, ErrorException>(this.client.getMapperAdapter())
+                .register(200, new TypeToken<Long>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+    /**
+     * Get null Unix time value.
+     *
+     * @throws ErrorException exception thrown from REST call
+     * @throws IOException exception thrown from serialization/deserialization
+     * @return the long object wrapped in {@link ServiceResponse} if successful.
+     */
+    public ServiceResponse<Long> getNullUnixTime() throws ErrorException, IOException {
+        Call<ResponseBody> call = service.getNullUnixTime();
+        return getNullUnixTimeDelegate(call.execute());
+    }
+
+    /**
+     * Get null Unix time value.
+     *
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if callback is null
+     * @return the {@link Call} object
+     */
+    public ServiceCall getNullUnixTimeAsync(final ServiceCallback<Long> serviceCallback) throws IllegalArgumentException {
+        if (serviceCallback == null) {
+            throw new IllegalArgumentException("ServiceCallback is required for async calls.");
+        }
+        Call<ResponseBody> call = service.getNullUnixTime();
+        final ServiceCall serviceCall = new ServiceCall(call);
+        call.enqueue(new ServiceResponseCallback<Long>(serviceCallback) {
+            @Override
+            public void onResponse(Call<ResponseBody> call, Response<ResponseBody> response) {
+                try {
+                    serviceCallback.success(getNullUnixTimeDelegate(response));
+                } catch (ErrorException | IOException exception) {
+                    serviceCallback.failure(exception);
+                }
+            }
+        });
+        return serviceCall;
+    }
+
+    private ServiceResponse<Long> getNullUnixTimeDelegate(Response<ResponseBody> response) throws ErrorException, IOException {
+        return new ServiceResponseBuilder<Long, ErrorException>(this.client.getMapperAdapter())
+                .register(200, new TypeToken<Long>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
 }
diff --git a/AutoRest/Generators/Java/Java.Tests/src/main/java/fixtures/custombaseurimoreoptions/AutoRestParameterizedCustomHostTestClient.java b/AutoRest/Generators/Java/Java.Tests/src/main/java/fixtures/custombaseurimoreoptions/AutoRestParameterizedCustomHostTestClient.java
new file mode 100644
index 0000000000000..7c5bb29be05d4
--- /dev/null
+++ b/AutoRest/Generators/Java/Java.Tests/src/main/java/fixtures/custombaseurimoreoptions/AutoRestParameterizedCustomHostTestClient.java
@@ -0,0 +1,86 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+ */
+
+package fixtures.custombaseurimoreoptions;
+
+import java.util.List;
+import okhttp3.Interceptor;
+import okhttp3.logging.HttpLoggingInterceptor.Level;
+import com.microsoft.rest.AutoRestBaseUrl;
+import com.microsoft.rest.serializer.JacksonMapperAdapter;
+
+/**
+ * The interface for AutoRestParameterizedCustomHostTestClient class.
+ */
+public interface AutoRestParameterizedCustomHostTestClient {
+    /**
+     * Gets the URL used as the base for all cloud service requests.
+     *
+     * @return the BaseUrl object.
+     */
+    AutoRestBaseUrl getBaseUrl();
+
+    /**
+     * Gets the list of interceptors the OkHttp client will execute.
+     *
+     * @return the list of interceptors.
+     */
+    List<Interceptor> getClientInterceptors();
+
+    /**
+     * Sets the logging level for OkHttp client.
+     *
+     * @param logLevel the logging level enum.
+     */
+    void setLogLevel(Level logLevel);
+
+    /**
+     * Gets the adapter for {@link com.fasterxml.jackson.databind.ObjectMapper} for serialization
+     * and deserialization operations..
+     *
+     * @return the adapter.
+     */
+    JacksonMapperAdapter getMapperAdapter();
+
+    /**
+     * Gets The subscription id with value 'test12'..
+     *
+     * @return the subscriptionId value.
+     */
+    String getSubscriptionId();
+
+    /**
+     * Sets The subscription id with value 'test12'..
+     *
+     * @param subscriptionId the subscriptionId value.
+     */
+    void setSubscriptionId(String subscriptionId);
+
+    /**
+     * Gets A string value that is used as a global part of the parameterized host. Default value 'host'..
+     *
+     * @return the dnsSuffix value.
+     */
+    String getDnsSuffix();
+
+    /**
+     * Sets A string value that is used as a global part of the parameterized host. Default value 'host'..
+     *
+     * @param dnsSuffix the dnsSuffix value.
+     */
+    void setDnsSuffix(String dnsSuffix);
+
+    /**
+     * Gets the PathsOperations object to access its operations.
+     * @return the PathsOperations object.
+     */
+    PathsOperations getPathsOperations();
+
+}
diff --git a/AutoRest/Generators/Java/Java.Tests/src/main/java/fixtures/custombaseurimoreoptions/AutoRestParameterizedCustomHostTestClientImpl.java b/AutoRest/Generators/Java/Java.Tests/src/main/java/fixtures/custombaseurimoreoptions/AutoRestParameterizedCustomHostTestClientImpl.java
new file mode 100644
index 0000000000000..ad9fe946dc423
--- /dev/null
+++ b/AutoRest/Generators/Java/Java.Tests/src/main/java/fixtures/custombaseurimoreoptions/AutoRestParameterizedCustomHostTestClientImpl.java
@@ -0,0 +1,121 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+ */
+
+package fixtures.custombaseurimoreoptions;
+
+import com.microsoft.rest.ServiceClient;
+import com.microsoft.rest.AutoRestBaseUrl;
+import okhttp3.OkHttpClient;
+import retrofit2.Retrofit;
+
+/**
+ * Initializes a new instance of the AutoRestParameterizedCustomHostTestClient class.
+ */
+public final class AutoRestParameterizedCustomHostTestClientImpl extends ServiceClient implements AutoRestParameterizedCustomHostTestClient {
+    /**
+     * The URL used as the base for all cloud service requests.
+     */
+    private final AutoRestBaseUrl baseUrl;
+
+    /**
+     * Gets the URL used as the base for all cloud service requests.
+     *
+     * @return The BaseUrl value.
+     */
+    public AutoRestBaseUrl getBaseUrl() {
+        return this.baseUrl;
+    }
+
+    /** The subscription id with value 'test12'. */
+    private String subscriptionId;
+
+    /**
+     * Gets The subscription id with value 'test12'.
+     *
+     * @return the subscriptionId value.
+     */
+    public String getSubscriptionId() {
+        return this.subscriptionId;
+    }
+
+    /**
+     * Sets The subscription id with value 'test12'.
+     *
+     * @param subscriptionId the subscriptionId value.
+     */
+    public void setSubscriptionId(String subscriptionId) {
+        this.subscriptionId = subscriptionId;
+    }
+
+    /** A string value that is used as a global part of the parameterized host. Default value 'host'. */
+    private String dnsSuffix;
+
+    /**
+     * Gets A string value that is used as a global part of the parameterized host. Default value 'host'.
+     *
+     * @return the dnsSuffix value.
+     */
+    public String getDnsSuffix() {
+        return this.dnsSuffix;
+    }
+
+    /**
+     * Sets A string value that is used as a global part of the parameterized host. Default value 'host'.
+     *
+     * @param dnsSuffix the dnsSuffix value.
+     */
+    public void setDnsSuffix(String dnsSuffix) {
+        this.dnsSuffix = dnsSuffix;
+    }
+
+    /**
+     * Gets the PathsOperations object to access its operations.
+     * @return the PathsOperations object.
+     */
+    public PathsOperations getPathsOperations() {
+        return new PathsOperationsImpl(this.retrofitBuilder.client(clientBuilder.build()).build(), this);
+    }
+
+    /**
+     * Initializes an instance of AutoRestParameterizedCustomHostTestClient client.
+     */
+    public AutoRestParameterizedCustomHostTestClientImpl() {
+        this("{vault}{secret}{dnsSuffix}");
+    }
+
+    /**
+     * Initializes an instance of AutoRestParameterizedCustomHostTestClient client.
+     *
+     * @param baseUrl the base URL of the host
+     */
+    private AutoRestParameterizedCustomHostTestClientImpl(String baseUrl) {
+        super();
+        this.baseUrl = new AutoRestBaseUrl(baseUrl);
+        initialize();
+    }
+
+    /**
+     * Initializes an instance of AutoRestParameterizedCustomHostTestClient client.
+     *
+     * @param clientBuilder the builder for building up an {@link OkHttpClient}
+     * @param retrofitBuilder the builder for building up a {@link Retrofit}
+     */
+    public AutoRestParameterizedCustomHostTestClientImpl(OkHttpClient.Builder clientBuilder, Retrofit.Builder retrofitBuilder) {
+        super(clientBuilder, retrofitBuilder);
+        this.baseUrl = new AutoRestBaseUrl("{vault}{secret}{dnsSuffix}");
+        initialize();
+    }
+
+    @Override
+    protected void initialize() {
+        super.initialize();
+        this.retrofitBuilder.baseUrl(baseUrl);
+    }
+}
diff --git a/AutoRest/Generators/Java/Java.Tests/src/main/java/fixtures/custombaseurimoreoptions/PathsOperations.java b/AutoRest/Generators/Java/Java.Tests/src/main/java/fixtures/custombaseurimoreoptions/PathsOperations.java
new file mode 100644
index 0000000000000..6273f3426d73c
--- /dev/null
+++ b/AutoRest/Generators/Java/Java.Tests/src/main/java/fixtures/custombaseurimoreoptions/PathsOperations.java
@@ -0,0 +1,75 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+ */
+
+package fixtures.custombaseurimoreoptions;
+
+import com.microsoft.rest.ServiceCall;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceResponse;
+import fixtures.custombaseurimoreoptions.models.ErrorException;
+import java.io.IOException;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in PathsOperations.
+ */
+public interface PathsOperations {
+    /**
+     * Get a 200 to test a valid base uri.
+     *
+     * @param vault The vault name, e.g. https://myvault
+     * @param secret Secret value.
+     * @param keyName The key name with value 'key1'.
+     * @throws ErrorException exception thrown from REST call
+     * @throws IOException exception thrown from serialization/deserialization
+     * @throws IllegalArgumentException exception thrown from invalid parameters
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    ServiceResponse<Void> getEmpty(String vault, String secret, String keyName) throws ErrorException, IOException, IllegalArgumentException;
+
+    /**
+     * Get a 200 to test a valid base uri.
+     *
+     * @param vault The vault name, e.g. https://myvault
+     * @param secret Secret value.
+     * @param keyName The key name with value 'key1'.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if callback is null
+     * @return the {@link ServiceCall} object
+     */
+    ServiceCall getEmptyAsync(String vault, String secret, String keyName, final ServiceCallback<Void> serviceCallback) throws IllegalArgumentException;
+    /**
+     * Get a 200 to test a valid base uri.
+     *
+     * @param vault The vault name, e.g. https://myvault
+     * @param secret Secret value.
+     * @param keyName The key name with value 'key1'.
+     * @param keyVersion The key version. Default value 'v1'.
+     * @throws ErrorException exception thrown from REST call
+     * @throws IOException exception thrown from serialization/deserialization
+     * @throws IllegalArgumentException exception thrown from invalid parameters
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    ServiceResponse<Void> getEmpty(String vault, String secret, String keyName, String keyVersion) throws ErrorException, IOException, IllegalArgumentException;
+
+    /**
+     * Get a 200 to test a valid base uri.
+     *
+     * @param vault The vault name, e.g. https://myvault
+     * @param secret Secret value.
+     * @param keyName The key name with value 'key1'.
+     * @param keyVersion The key version. Default value 'v1'.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if callback is null
+     * @return the {@link ServiceCall} object
+     */
+    ServiceCall getEmptyAsync(String vault, String secret, String keyName, String keyVersion, final ServiceCallback<Void> serviceCallback) throws IllegalArgumentException;
+
+}
diff --git a/AutoRest/Generators/Java/Java.Tests/src/main/java/fixtures/custombaseurimoreoptions/PathsOperationsImpl.java b/AutoRest/Generators/Java/Java.Tests/src/main/java/fixtures/custombaseurimoreoptions/PathsOperationsImpl.java
new file mode 100644
index 0000000000000..13994720257bd
--- /dev/null
+++ b/AutoRest/Generators/Java/Java.Tests/src/main/java/fixtures/custombaseurimoreoptions/PathsOperationsImpl.java
@@ -0,0 +1,245 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+ */
+
+package fixtures.custombaseurimoreoptions;
+
+import com.google.common.reflect.TypeToken;
+import com.microsoft.rest.ServiceCall;
+import com.microsoft.rest.ServiceCallback;
+import com.microsoft.rest.ServiceResponse;
+import com.microsoft.rest.ServiceResponseBuilder;
+import com.microsoft.rest.ServiceResponseCallback;
+import fixtures.custombaseurimoreoptions.models.ErrorException;
+import java.io.IOException;
+import okhttp3.ResponseBody;
+import retrofit2.Call;
+import retrofit2.http.GET;
+import retrofit2.http.Headers;
+import retrofit2.http.Path;
+import retrofit2.http.Query;
+import retrofit2.Response;
+import retrofit2.Retrofit;
+
+/**
+ * An instance of this class provides access to all the operations defined
+ * in PathsOperations.
+ */
+public final class PathsOperationsImpl implements PathsOperations {
+    /** The Retrofit service to perform REST calls. */
+    private PathsService service;
+    /** The service client containing this operation class. */
+    private AutoRestParameterizedCustomHostTestClient client;
+
+    /**
+     * Initializes an instance of PathsOperations.
+     *
+     * @param retrofit the Retrofit instance built from a Retrofit Builder.
+     * @param client the instance of the service client containing this operation class.
+     */
+    public PathsOperationsImpl(Retrofit retrofit, AutoRestParameterizedCustomHostTestClient client) {
+        this.service = retrofit.create(PathsService.class);
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for PathsOperations to be
+     * used by Retrofit to perform actually REST calls.
+     */
+    interface PathsService {
+        @Headers("Content-Type: application/json; charset=utf-8")
+        @GET("customuri/{subscriptionId}/{keyName}")
+        Call<ResponseBody> getEmpty(@Path("keyName") String keyName, @Path("subscriptionId") String subscriptionId, @Query("keyVersion") String keyVersion);
+
+    }
+
+    /**
+     * Get a 200 to test a valid base uri.
+     *
+     * @param vault The vault name, e.g. https://myvault
+     * @param secret Secret value.
+     * @param keyName The key name with value 'key1'.
+     * @throws ErrorException exception thrown from REST call
+     * @throws IOException exception thrown from serialization/deserialization
+     * @throws IllegalArgumentException exception thrown from invalid parameters
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public ServiceResponse<Void> getEmpty(String vault, String secret, String keyName) throws ErrorException, IOException, IllegalArgumentException {
+        if (vault == null) {
+            throw new IllegalArgumentException("Parameter vault is required and cannot be null.");
+        }
+        if (secret == null) {
+            throw new IllegalArgumentException("Parameter secret is required and cannot be null.");
+        }
+        if (this.client.getDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.getDnsSuffix() is required and cannot be null.");
+        }
+        if (keyName == null) {
+            throw new IllegalArgumentException("Parameter keyName is required and cannot be null.");
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.getSubscriptionId() is required and cannot be null.");
+        }
+        final String keyVersion = null;
+        this.client.getBaseUrl().set("{vault}", vault);
+        this.client.getBaseUrl().set("{secret}", secret);
+        this.client.getBaseUrl().set("{dnsSuffix}", this.client.getDnsSuffix());
+        Call<ResponseBody> call = service.getEmpty(keyName, this.client.getSubscriptionId(), keyVersion);
+        return getEmptyDelegate(call.execute());
+    }
+
+    /**
+     * Get a 200 to test a valid base uri.
+     *
+     * @param vault The vault name, e.g. https://myvault
+     * @param secret Secret value.
+     * @param keyName The key name with value 'key1'.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if callback is null
+     * @return the {@link Call} object
+     */
+    public ServiceCall getEmptyAsync(String vault, String secret, String keyName, final ServiceCallback<Void> serviceCallback) throws IllegalArgumentException {
+        if (serviceCallback == null) {
+            throw new IllegalArgumentException("ServiceCallback is required for async calls.");
+        }
+        if (vault == null) {
+            serviceCallback.failure(new IllegalArgumentException("Parameter vault is required and cannot be null."));
+            return null;
+        }
+        if (secret == null) {
+            serviceCallback.failure(new IllegalArgumentException("Parameter secret is required and cannot be null."));
+            return null;
+        }
+        if (this.client.getDnsSuffix() == null) {
+            serviceCallback.failure(new IllegalArgumentException("Parameter this.client.getDnsSuffix() is required and cannot be null."));
+            return null;
+        }
+        if (keyName == null) {
+            serviceCallback.failure(new IllegalArgumentException("Parameter keyName is required and cannot be null."));
+            return null;
+        }
+        if (this.client.getSubscriptionId() == null) {
+            serviceCallback.failure(new IllegalArgumentException("Parameter this.client.getSubscriptionId() is required and cannot be null."));
+            return null;
+        }
+        final String keyVersion = null;
+        this.client.getBaseUrl().set("{vault}", vault);
+        this.client.getBaseUrl().set("{secret}", secret);
+        this.client.getBaseUrl().set("{dnsSuffix}", this.client.getDnsSuffix());
+        Call<ResponseBody> call = service.getEmpty(keyName, this.client.getSubscriptionId(), keyVersion);
+        final ServiceCall serviceCall = new ServiceCall(call);
+        call.enqueue(new ServiceResponseCallback<Void>(serviceCallback) {
+            @Override
+            public void onResponse(Call<ResponseBody> call, Response<ResponseBody> response) {
+                try {
+                    serviceCallback.success(getEmptyDelegate(response));
+                } catch (ErrorException | IOException exception) {
+                    serviceCallback.failure(exception);
+                }
+            }
+        });
+        return serviceCall;
+    }
+
+    /**
+     * Get a 200 to test a valid base uri.
+     *
+     * @param vault The vault name, e.g. https://myvault
+     * @param secret Secret value.
+     * @param keyName The key name with value 'key1'.
+     * @param keyVersion The key version. Default value 'v1'.
+     * @throws ErrorException exception thrown from REST call
+     * @throws IOException exception thrown from serialization/deserialization
+     * @throws IllegalArgumentException exception thrown from invalid parameters
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public ServiceResponse<Void> getEmpty(String vault, String secret, String keyName, String keyVersion) throws ErrorException, IOException, IllegalArgumentException {
+        if (vault == null) {
+            throw new IllegalArgumentException("Parameter vault is required and cannot be null.");
+        }
+        if (secret == null) {
+            throw new IllegalArgumentException("Parameter secret is required and cannot be null.");
+        }
+        if (this.client.getDnsSuffix() == null) {
+            throw new IllegalArgumentException("Parameter this.client.getDnsSuffix() is required and cannot be null.");
+        }
+        if (keyName == null) {
+            throw new IllegalArgumentException("Parameter keyName is required and cannot be null.");
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw new IllegalArgumentException("Parameter this.client.getSubscriptionId() is required and cannot be null.");
+        }
+        this.client.getBaseUrl().set("{vault}", vault);
+        this.client.getBaseUrl().set("{secret}", secret);
+        this.client.getBaseUrl().set("{dnsSuffix}", this.client.getDnsSuffix());
+        Call<ResponseBody> call = service.getEmpty(keyName, this.client.getSubscriptionId(), keyVersion);
+        return getEmptyDelegate(call.execute());
+    }
+
+    /**
+     * Get a 200 to test a valid base uri.
+     *
+     * @param vault The vault name, e.g. https://myvault
+     * @param secret Secret value.
+     * @param keyName The key name with value 'key1'.
+     * @param keyVersion The key version. Default value 'v1'.
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if callback is null
+     * @return the {@link Call} object
+     */
+    public ServiceCall getEmptyAsync(String vault, String secret, String keyName, String keyVersion, final ServiceCallback<Void> serviceCallback) throws IllegalArgumentException {
+        if (serviceCallback == null) {
+            throw new IllegalArgumentException("ServiceCallback is required for async calls.");
+        }
+        if (vault == null) {
+            serviceCallback.failure(new IllegalArgumentException("Parameter vault is required and cannot be null."));
+            return null;
+        }
+        if (secret == null) {
+            serviceCallback.failure(new IllegalArgumentException("Parameter secret is required and cannot be null."));
+            return null;
+        }
+        if (this.client.getDnsSuffix() == null) {
+            serviceCallback.failure(new IllegalArgumentException("Parameter this.client.getDnsSuffix() is required and cannot be null."));
+            return null;
+        }
+        if (keyName == null) {
+            serviceCallback.failure(new IllegalArgumentException("Parameter keyName is required and cannot be null."));
+            return null;
+        }
+        if (this.client.getSubscriptionId() == null) {
+            serviceCallback.failure(new IllegalArgumentException("Parameter this.client.getSubscriptionId() is required and cannot be null."));
+            return null;
+        }
+        this.client.getBaseUrl().set("{vault}", vault);
+        this.client.getBaseUrl().set("{secret}", secret);
+        this.client.getBaseUrl().set("{dnsSuffix}", this.client.getDnsSuffix());
+        Call<ResponseBody> call = service.getEmpty(keyName, this.client.getSubscriptionId(), keyVersion);
+        final ServiceCall serviceCall = new ServiceCall(call);
+        call.enqueue(new ServiceResponseCallback<Void>(serviceCallback) {
+            @Override
+            public void onResponse(Call<ResponseBody> call, Response<ResponseBody> response) {
+                try {
+                    serviceCallback.success(getEmptyDelegate(response));
+                } catch (ErrorException | IOException exception) {
+                    serviceCallback.failure(exception);
+                }
+            }
+        });
+        return serviceCall;
+    }
+
+    private ServiceResponse<Void> getEmptyDelegate(Response<ResponseBody> response) throws ErrorException, IOException, IllegalArgumentException {
+        return new ServiceResponseBuilder<Void, ErrorException>(this.client.getMapperAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
+}
diff --git a/AutoRest/Generators/Java/Java.Tests/src/main/java/fixtures/custombaseurimoreoptions/models/Error.java b/AutoRest/Generators/Java/Java.Tests/src/main/java/fixtures/custombaseurimoreoptions/models/Error.java
new file mode 100644
index 0000000000000..73232cf4ed434
--- /dev/null
+++ b/AutoRest/Generators/Java/Java.Tests/src/main/java/fixtures/custombaseurimoreoptions/models/Error.java
@@ -0,0 +1,64 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+ */
+
+package fixtures.custombaseurimoreoptions.models;
+
+
+/**
+ * The Error model.
+ */
+public class Error {
+    /**
+     * The status property.
+     */
+    private Integer status;
+
+    /**
+     * The message property.
+     */
+    private String message;
+
+    /**
+     * Get the status value.
+     *
+     * @return the status value
+     */
+    public Integer getStatus() {
+        return this.status;
+    }
+
+    /**
+     * Set the status value.
+     *
+     * @param status the status value to set
+     */
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    /**
+     * Get the message value.
+     *
+     * @return the message value
+     */
+    public String getMessage() {
+        return this.message;
+    }
+
+    /**
+     * Set the message value.
+     *
+     * @param message the message value to set
+     */
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+}
diff --git a/AutoRest/Generators/Java/Java.Tests/src/main/java/fixtures/custombaseurimoreoptions/models/ErrorException.java b/AutoRest/Generators/Java/Java.Tests/src/main/java/fixtures/custombaseurimoreoptions/models/ErrorException.java
new file mode 100644
index 0000000000000..0c4458e200dac
--- /dev/null
+++ b/AutoRest/Generators/Java/Java.Tests/src/main/java/fixtures/custombaseurimoreoptions/models/ErrorException.java
@@ -0,0 +1,89 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+ */
+
+package fixtures.custombaseurimoreoptions.models;
+
+import com.microsoft.rest.AutoRestException;
+import retrofit2.Response;
+
+/**
+ * Exception thrown for an invalid response with Error information.
+ */
+public class ErrorException extends AutoRestException {
+    /**
+     * Information about the associated HTTP response.
+     */
+    private Response response;
+    /**
+     * The actual response body.
+     */
+    private Error body;
+    /**
+     * Initializes a new instance of the ErrorException class.
+     */
+    public ErrorException() { }
+    /**
+     * Initializes a new instance of the ErrorException class.
+     *
+     * @param message The exception message.
+     */
+    public ErrorException(final String message) {
+        super(message);
+    }
+    /**
+     * Initializes a new instance of the ErrorException class.
+     *
+     * @param message the exception message
+     * @param cause   exception that caused this exception to occur
+     */
+    public ErrorException(final String message, final Throwable cause) {
+        super(message, cause);
+    }
+    /**
+     * Initializes a new instance of the ErrorException class.
+     *
+     * @param cause exception that caused this exception to occur
+     */
+    public ErrorException(final Throwable cause) {
+        super(cause);
+    }
+    /**
+     * Gets information about the associated HTTP response.
+     *
+     * @return the HTTP response
+     */
+    public Response getResponse() {
+        return response;
+    }
+    /**
+     * Gets the HTTP response body.
+     *
+     * @return the response body
+     */
+    public Error getBody() {
+        return body;
+    }
+    /**
+     * Sets the HTTP response.
+     *
+     * @param response the HTTP response
+     */
+    public void setResponse(Response response) {
+        this.response = response;
+    }
+    /**
+     * Sets the HTTP response body.
+     *
+     * @param body the response body
+     */
+    public void setBody(Error body) {
+        this.body = body;
+    }
+}
diff --git a/AutoRest/Generators/Java/Java.Tests/src/main/java/fixtures/custombaseurimoreoptions/models/package-info.java b/AutoRest/Generators/Java/Java.Tests/src/main/java/fixtures/custombaseurimoreoptions/models/package-info.java
new file mode 100644
index 0000000000000..b5c9a91ec97d8
--- /dev/null
+++ b/AutoRest/Generators/Java/Java.Tests/src/main/java/fixtures/custombaseurimoreoptions/models/package-info.java
@@ -0,0 +1,13 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+
+/**
+ * This package contains the model classes for AutoRestParameterizedCustomHostTestClient.
+ * Test Infrastructure for AutoRest.
+ */
+package fixtures.custombaseurimoreoptions.models;
diff --git a/AutoRest/Generators/Java/Java.Tests/src/main/java/fixtures/custombaseurimoreoptions/package-info.java b/AutoRest/Generators/Java/Java.Tests/src/main/java/fixtures/custombaseurimoreoptions/package-info.java
new file mode 100644
index 0000000000000..a6434083eb1c5
--- /dev/null
+++ b/AutoRest/Generators/Java/Java.Tests/src/main/java/fixtures/custombaseurimoreoptions/package-info.java
@@ -0,0 +1,13 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+
+/**
+ * This package contains the classes for AutoRestParameterizedCustomHostTestClient.
+ * Test Infrastructure for AutoRest.
+ */
+package fixtures.custombaseurimoreoptions;
diff --git a/AutoRest/Generators/Java/Java.Tests/src/main/java/fixtures/url/PathsOperations.java b/AutoRest/Generators/Java/Java.Tests/src/main/java/fixtures/url/PathsOperations.java
index f7676a65a59a3..1ccd08f952b57 100644
--- a/AutoRest/Generators/Java/Java.Tests/src/main/java/fixtures/url/PathsOperations.java
+++ b/AutoRest/Generators/Java/Java.Tests/src/main/java/fixtures/url/PathsOperations.java
@@ -502,4 +502,24 @@ public interface PathsOperations {
      */
     ServiceCall arrayCsvInPathAsync(List<String> arrayPath, final ServiceCallback<Void> serviceCallback) throws IllegalArgumentException;
 
+    /**
+     * Get the date 2016-04-13 encoded value as '1460505600' (Unix time).
+     *
+     * @param unixTimeUrlPath Unix time encoded value
+     * @throws ErrorException exception thrown from REST call
+     * @throws IOException exception thrown from serialization/deserialization
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    ServiceResponse<Void> unixTimeUrl(long unixTimeUrlPath) throws ErrorException, IOException;
+
+    /**
+     * Get the date 2016-04-13 encoded value as '1460505600' (Unix time).
+     *
+     * @param unixTimeUrlPath Unix time encoded value
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if callback is null
+     * @return the {@link ServiceCall} object
+     */
+    ServiceCall unixTimeUrlAsync(long unixTimeUrlPath, final ServiceCallback<Void> serviceCallback) throws IllegalArgumentException;
+
 }
diff --git a/AutoRest/Generators/Java/Java.Tests/src/main/java/fixtures/url/PathsOperationsImpl.java b/AutoRest/Generators/Java/Java.Tests/src/main/java/fixtures/url/PathsOperationsImpl.java
index b32c2fcbd2471..31942e3ce28cb 100644
--- a/AutoRest/Generators/Java/Java.Tests/src/main/java/fixtures/url/PathsOperationsImpl.java
+++ b/AutoRest/Generators/Java/Java.Tests/src/main/java/fixtures/url/PathsOperationsImpl.java
@@ -159,6 +159,10 @@ interface PathsService {
         @GET("paths/array/ArrayPath1%2cbegin%21%2A%27%28%29%3B%3A%40%20%26%3D%2B%24%2C%2F%3F%23%5B%5Dend%2c%2c/{arrayPath:commaSeparated}")
         Call<ResponseBody> arrayCsvInPath(@Path("arrayPath") String arrayPath);
 
+        @Headers("Content-Type: application/json; charset=utf-8")
+        @GET("paths/int/1460505600/{unixTimeUrlPath}")
+        Call<ResponseBody> unixTimeUrl(@Path("unixTimeUrlPath") long unixTimeUrlPath);
+
     }
 
     /**
@@ -1418,4 +1422,51 @@ private ServiceResponse<Void> arrayCsvInPathDelegate(Response<ResponseBody> resp
                 .build(response);
     }
 
+    /**
+     * Get the date 2016-04-13 encoded value as '1460505600' (Unix time).
+     *
+     * @param unixTimeUrlPath Unix time encoded value
+     * @throws ErrorException exception thrown from REST call
+     * @throws IOException exception thrown from serialization/deserialization
+     * @return the {@link ServiceResponse} object if successful.
+     */
+    public ServiceResponse<Void> unixTimeUrl(long unixTimeUrlPath) throws ErrorException, IOException {
+        Call<ResponseBody> call = service.unixTimeUrl(unixTimeUrlPath);
+        return unixTimeUrlDelegate(call.execute());
+    }
+
+    /**
+     * Get the date 2016-04-13 encoded value as '1460505600' (Unix time).
+     *
+     * @param unixTimeUrlPath Unix time encoded value
+     * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+     * @throws IllegalArgumentException thrown if callback is null
+     * @return the {@link Call} object
+     */
+    public ServiceCall unixTimeUrlAsync(long unixTimeUrlPath, final ServiceCallback<Void> serviceCallback) throws IllegalArgumentException {
+        if (serviceCallback == null) {
+            throw new IllegalArgumentException("ServiceCallback is required for async calls.");
+        }
+        Call<ResponseBody> call = service.unixTimeUrl(unixTimeUrlPath);
+        final ServiceCall serviceCall = new ServiceCall(call);
+        call.enqueue(new ServiceResponseCallback<Void>(serviceCallback) {
+            @Override
+            public void onResponse(Call<ResponseBody> call, Response<ResponseBody> response) {
+                try {
+                    serviceCallback.success(unixTimeUrlDelegate(response));
+                } catch (ErrorException | IOException exception) {
+                    serviceCallback.failure(exception);
+                }
+            }
+        });
+        return serviceCall;
+    }
+
+    private ServiceResponse<Void> unixTimeUrlDelegate(Response<ResponseBody> response) throws ErrorException, IOException {
+        return new ServiceResponseBuilder<Void, ErrorException>(this.client.getMapperAdapter())
+                .register(200, new TypeToken<Void>() { }.getType())
+                .registerError(ErrorException.class)
+                .build(response);
+    }
+
 }
diff --git a/AutoRest/Generators/Java/Java/JavaCodeGenerator.cs b/AutoRest/Generators/Java/Java/JavaCodeGenerator.cs
index 275c4b16eb4e3..66621e2f0034c 100644
--- a/AutoRest/Generators/Java/Java/JavaCodeGenerator.cs
+++ b/AutoRest/Generators/Java/Java/JavaCodeGenerator.cs
@@ -14,7 +14,7 @@ namespace Microsoft.Rest.Generator.Java
 {
     public class JavaCodeGenerator : CodeGenerator
     {
-        private const string ClientRuntimePackage = "com.microsoft.rest:client-runtime:0.0.1-SNAPSHOT";
+        private const string ClientRuntimePackage = "com.microsoft.rest:client-runtime:1.0.0-SNAPSHOT from snapshot repo http://adxsnapshots.azurewebsites.net/";
         private const string _packageInfoFileName = "package-info.java";
 
         public JavaCodeNamer Namer { get; private set; }
diff --git a/AutoRest/Generators/Java/Java/JavaCodeNamer.cs b/AutoRest/Generators/Java/Java/JavaCodeNamer.cs
index c8d58b1031848..3c4921479f9e1 100644
--- a/AutoRest/Generators/Java/Java/JavaCodeNamer.cs
+++ b/AutoRest/Generators/Java/Java/JavaCodeNamer.cs
@@ -33,7 +33,7 @@ public JavaCodeNamer(string nameSpace)
         {
             // List retrieved from 
             // http://docs.oracle.com/javase/tutorial/java/nutsandbolts/_keywords.html
-            _package = nameSpace.ToLower(CultureInfo.InvariantCulture);
+            _package = nameSpace != null ? nameSpace.ToLower(CultureInfo.InvariantCulture) : string.Empty;
             new HashSet<string>
             {
                 "abstract", "assert",   "boolean",  "break",    "byte",
diff --git a/AutoRest/Generators/Java/Java/TemplateModels/MethodTemplateModel.cs b/AutoRest/Generators/Java/Java/TemplateModels/MethodTemplateModel.cs
index c9f8bc6faf9fa..7b9afbb821d68 100644
--- a/AutoRest/Generators/Java/Java/TemplateModels/MethodTemplateModel.cs
+++ b/AutoRest/Generators/Java/Java/TemplateModels/MethodTemplateModel.cs
@@ -363,6 +363,7 @@ public IEnumerable<ParameterModel> RequiredNullableParameters
                         !param.Type.IsPrimaryType(KnownPrimaryType.Double) &&
                         !param.Type.IsPrimaryType(KnownPrimaryType.Boolean) &&
                         !param.Type.IsPrimaryType(KnownPrimaryType.Long) &&
+                        !param.Type.IsPrimaryType(KnownPrimaryType.UnixTime) &&
                         !param.IsConstant && param.IsRequired)
                     {
                         yield return param;
diff --git a/AutoRest/Generators/Java/Java/TypeModels/PrimaryTypeModel.cs b/AutoRest/Generators/Java/Java/TypeModels/PrimaryTypeModel.cs
index 2d5a2fad78626..d6990c79ff680 100644
--- a/AutoRest/Generators/Java/Java/TypeModels/PrimaryTypeModel.cs
+++ b/AutoRest/Generators/Java/Java/TypeModels/PrimaryTypeModel.cs
@@ -202,6 +202,10 @@ private void Initialize(PrimaryType primaryType)
                 Name = "Period";
                 _imports.Add("org.joda.time.Period");
             }
+            else if (primaryType.Type == KnownPrimaryType.UnixTime)
+            {
+                Name = "long";
+            }
             else if (primaryType.Type == KnownPrimaryType.Uuid)
             {
                 Name = "UUID";
diff --git a/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/AzureParameterGrouping/models/firstParameterGroup.js b/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/AzureParameterGrouping/models/firstParameterGroup.js
index 0ee0d72686ad4..30da6b2ad3c63 100644
--- a/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/AzureParameterGrouping/models/firstParameterGroup.js
+++ b/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/AzureParameterGrouping/models/firstParameterGroup.js
@@ -14,7 +14,9 @@
  * @class
  * Initializes a new instance of the FirstParameterGroup class.
  * @constructor
- * Additional parameters for the postMultiParamGroups operation.
+ * Additional parameters for a set of operations, such as:
+ * parameterGrouping_postMultiParamGroups,
+ * parameterGrouping_postSharedParameterGroupObject.
  * @member {string} [headerOne]
  * 
  * @member {number} [queryOne] Query parameter with default. Default value: 30
diff --git a/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/AzureParameterGrouping/models/index.d.ts b/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/AzureParameterGrouping/models/index.d.ts
index b2155667f07a8..16a7ffc754ca4 100644
--- a/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/AzureParameterGrouping/models/index.d.ts
+++ b/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/AzureParameterGrouping/models/index.d.ts
@@ -28,7 +28,7 @@ export interface ErrorModel {
  * @class
  * Initializes a new instance of the ParameterGroupingPostRequiredParameters class.
  * @constructor
- * Additional parameters for the postRequired operation.
+ * Additional parameters for the parameterGrouping_postRequired operation.
  * @member {number} body
  * 
  * @member {string} [customHeader]
@@ -49,7 +49,7 @@ export interface ParameterGroupingPostRequiredParameters {
  * @class
  * Initializes a new instance of the ParameterGroupingPostOptionalParameters class.
  * @constructor
- * Additional parameters for the postOptional operation.
+ * Additional parameters for the parameterGrouping_postOptional operation.
  * @member {string} [customHeader]
  * 
  * @member {number} [query] Query parameter with default
@@ -64,7 +64,9 @@ export interface ParameterGroupingPostOptionalParameters {
  * @class
  * Initializes a new instance of the FirstParameterGroup class.
  * @constructor
- * Additional parameters for the postMultiParamGroups operation.
+ * Additional parameters for a set of operations, such as:
+ * parameterGrouping_postMultiParamGroups,
+ * parameterGrouping_postSharedParameterGroupObject.
  * @member {string} [headerOne]
  * 
  * @member {number} [queryOne] Query parameter with default
@@ -79,7 +81,8 @@ export interface FirstParameterGroup {
  * @class
  * Initializes a new instance of the ParameterGroupingPostMultiParamGroupsSecondParamGroup class.
  * @constructor
- * Additional parameters for the postMultiParamGroups operation.
+ * Additional parameters for the parameterGrouping_postMultiParamGroups
+ * operation.
  * @member {string} [headerTwo]
  * 
  * @member {number} [queryTwo] Query parameter with default
diff --git a/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/AzureParameterGrouping/models/parameterGroupingPostMultiParamGroupsSecondParamGroup.js b/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/AzureParameterGrouping/models/parameterGroupingPostMultiParamGroupsSecondParamGroup.js
index aa82d43c29053..430f4f669f12c 100644
--- a/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/AzureParameterGrouping/models/parameterGroupingPostMultiParamGroupsSecondParamGroup.js
+++ b/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/AzureParameterGrouping/models/parameterGroupingPostMultiParamGroupsSecondParamGroup.js
@@ -14,7 +14,8 @@
  * @class
  * Initializes a new instance of the ParameterGroupingPostMultiParamGroupsSecondParamGroup class.
  * @constructor
- * Additional parameters for the postMultiParamGroups operation.
+ * Additional parameters for the parameterGrouping_postMultiParamGroups
+ * operation.
  * @member {string} [headerTwo]
  * 
  * @member {number} [queryTwo] Query parameter with default. Default value: 30
diff --git a/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/AzureParameterGrouping/models/parameterGroupingPostOptionalParameters.js b/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/AzureParameterGrouping/models/parameterGroupingPostOptionalParameters.js
index 825d2f6436ab3..b100000a14aee 100644
--- a/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/AzureParameterGrouping/models/parameterGroupingPostOptionalParameters.js
+++ b/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/AzureParameterGrouping/models/parameterGroupingPostOptionalParameters.js
@@ -14,7 +14,7 @@
  * @class
  * Initializes a new instance of the ParameterGroupingPostOptionalParameters class.
  * @constructor
- * Additional parameters for the postOptional operation.
+ * Additional parameters for the parameterGrouping_postOptional operation.
  * @member {string} [customHeader]
  * 
  * @member {number} [query] Query parameter with default. Default value: 30 .
diff --git a/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/AzureParameterGrouping/models/parameterGroupingPostRequiredParameters.js b/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/AzureParameterGrouping/models/parameterGroupingPostRequiredParameters.js
index 561fa05da6a71..70dfd11124694 100644
--- a/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/AzureParameterGrouping/models/parameterGroupingPostRequiredParameters.js
+++ b/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/AzureParameterGrouping/models/parameterGroupingPostRequiredParameters.js
@@ -14,7 +14,7 @@
  * @class
  * Initializes a new instance of the ParameterGroupingPostRequiredParameters class.
  * @constructor
- * Additional parameters for the postRequired operation.
+ * Additional parameters for the parameterGrouping_postRequired operation.
  * @member {number} body
  * 
  * @member {string} [customHeader]
diff --git a/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Lro/operations/index.d.ts b/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Lro/operations/index.d.ts
index ec051455be3e0..01c453943187e 100644
--- a/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Lro/operations/index.d.ts
+++ b/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Lro/operations/index.d.ts
@@ -1908,6 +1908,52 @@ export interface LROSADs {
     beginPutNonRetry201Creating400(options: { product? : models.Product, customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<models.Product>): void;
     beginPutNonRetry201Creating400(callback: ServiceCallback<models.Product>): void;
 
+    /**
+     * Long running put request, service returns a Product with
+     * 'ProvisioningState' = 'Creating' and 201 response code
+     *
+     * @param {object} [options] Optional Parameters.
+     * 
+     * @param {object} [options.product] Product to put
+     * 
+     * @param {string} [options.product.provisioningState]
+     * 
+     * @param {object} [options.product.tags]
+     * 
+     * @param {string} [options.product.location] Resource Location
+     * 
+     * @param {object} [options.customHeaders] Headers that will be added to the
+     * request
+     * 
+     * @param {ServiceCallback} [callback] callback function; see ServiceCallback
+     * doc in ms-rest index.d.ts for details
+     */
+    putNonRetry201Creating400InvalidJson(options: { product? : models.Product, customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<models.Product>): void;
+    putNonRetry201Creating400InvalidJson(callback: ServiceCallback<models.Product>): void;
+
+    /**
+     * Long running put request, service returns a Product with
+     * 'ProvisioningState' = 'Creating' and 201 response code
+     *
+     * @param {object} [options] Optional Parameters.
+     * 
+     * @param {object} [options.product] Product to put
+     * 
+     * @param {string} [options.product.provisioningState]
+     * 
+     * @param {object} [options.product.tags]
+     * 
+     * @param {string} [options.product.location] Resource Location
+     * 
+     * @param {object} [options.customHeaders] Headers that will be added to the
+     * request
+     * 
+     * @param {ServiceCallback} [callback] callback function; see ServiceCallback
+     * doc in ms-rest index.d.ts for details
+     */
+    beginPutNonRetry201Creating400InvalidJson(options: { product? : models.Product, customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<models.Product>): void;
+    beginPutNonRetry201Creating400InvalidJson(callback: ServiceCallback<models.Product>): void;
+
     /**
      * Long running put request, service returns a 200 with
      * ProvisioningState=’Creating’. Poll the endpoint indicated in the
diff --git a/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Lro/operations/lRORetrys.js b/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Lro/operations/lRORetrys.js
index f3cb1fecfb34b..bacca9fd614ab 100644
--- a/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Lro/operations/lRORetrys.js
+++ b/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Lro/operations/lRORetrys.js
@@ -81,7 +81,7 @@ LRORetrys.prototype.put201CreatingSucceeded200 = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPutOrPatchOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -334,7 +334,7 @@ LRORetrys.prototype.putAsyncRelativeRetrySucceeded = function (options, callback
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPutOrPatchOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -562,7 +562,7 @@ LRORetrys.prototype.deleteProvisioning202Accepted200Succeeded = function (option
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPostOrDeleteOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -782,7 +782,7 @@ LRORetrys.prototype.delete202Retry200 = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPostOrDeleteOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -952,7 +952,7 @@ LRORetrys.prototype.deleteAsyncRelativeRetrySucceeded = function (options, callb
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPostOrDeleteOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -1130,7 +1130,7 @@ LRORetrys.prototype.post202Retry200 = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPostOrDeleteOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -1332,7 +1332,7 @@ LRORetrys.prototype.postAsyncRelativeRetrySucceeded = function (options, callbac
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPostOrDeleteOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
diff --git a/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Lro/operations/lROSADs.js b/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Lro/operations/lROSADs.js
index 33fff6078369c..240dd4e45fbd6 100644
--- a/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Lro/operations/lROSADs.js
+++ b/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Lro/operations/lROSADs.js
@@ -78,7 +78,7 @@ LROSADs.prototype.putNonRetry400 = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPutOrPatchOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -326,7 +326,7 @@ LROSADs.prototype.putNonRetry201Creating400 = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPutOrPatchOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -525,6 +525,255 @@ LROSADs.prototype.beginPutNonRetry201Creating400 = function (options, callback)
   });
 };
 
+/**
+ *
+ * Long running put request, service returns a Product with
+ * 'ProvisioningState' = 'Creating' and 201 response code
+ *
+ * @param {object} [options] Optional Parameters.
+ * 
+ * @param {object} [options.product] Product to put
+ * 
+ * @param {string} [options.product.provisioningState]
+ * 
+ * @param {object} [options.product.tags]
+ * 
+ * @param {string} [options.product.location] Resource Location
+ * 
+ * @param {object} [options.customHeaders] Headers that will be added to the
+ * request
+ * 
+ * @param {function} callback
+ *
+ * @returns {function} callback(err, result, request, response)
+ *
+ *                      {Error}  err        - The Error object if an error occurred, null otherwise.
+ *
+ *                      {object} [result]   - The deserialized result object.
+ *                      See {@link Product} for more information.
+ *
+ *                      {object} [request]  - The HTTP Request object if an error did not occur.
+ *
+ *                      {stream} [response] - The HTTP Response stream if an error did not occur.
+ */
+LROSADs.prototype.putNonRetry201Creating400InvalidJson = function (options, callback) {
+  var client = this.client;
+  if(!callback && typeof options === 'function') {
+    callback = options;
+    options = null;
+  }
+
+  if (!callback) {
+    throw new Error('callback cannot be null.');
+  }
+
+  // Send request
+  this.beginPutNonRetry201Creating400InvalidJson(options, function (err, parsedResult, httpRequest, response){
+    if (err) return callback(err);
+
+    var initialResult = new msRest.HttpOperationResponse();
+    initialResult.request = httpRequest;
+    initialResult.response = response;
+    initialResult.body = response.body;
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
+      if (err) return callback(err);
+
+      // Create Result
+      var result = null;
+      httpRequest = pollingResult.request;
+      response = pollingResult.response;
+      var responseBody = pollingResult.body;
+      if (responseBody === '') responseBody = null;
+
+      // Deserialize Response
+      var parsedResponse = null;
+      try {
+        parsedResponse = JSON.parse(responseBody);
+        result = JSON.parse(responseBody);
+        if (parsedResponse !== null && parsedResponse !== undefined) {
+          var resultMapper = new client.models['Product']().mapper();
+          result = client.deserialize(resultMapper, parsedResponse, 'result');
+        }
+      } catch (error) {
+        var deserializationError = new Error(util.format('Error "%s" occurred in deserializing the responseBody - "%s"', error, responseBody));
+        deserializationError.request = msRest.stripRequest(httpRequest);
+        deserializationError.response = msRest.stripResponse(response);
+        return callback(deserializationError);
+      }
+
+      return callback(null, result, httpRequest, response);
+    });
+  });
+};
+
+/**
+ * Long running put request, service returns a Product with
+ * 'ProvisioningState' = 'Creating' and 201 response code
+ *
+ * @param {object} [options] Optional Parameters.
+ * 
+ * @param {object} [options.product] Product to put
+ * 
+ * @param {string} [options.product.provisioningState]
+ * 
+ * @param {object} [options.product.tags]
+ * 
+ * @param {string} [options.product.location] Resource Location
+ * 
+ * @param {object} [options.customHeaders] Headers that will be added to the
+ * request
+ * 
+ * @param {function} callback
+ *
+ * @returns {function} callback(err, result, request, response)
+ *
+ *                      {Error}  err        - The Error object if an error occurred, null otherwise.
+ *
+ *                      {object} [result]   - The deserialized result object.
+ *                      See {@link Product} for more information.
+ *
+ *                      {object} [request]  - The HTTP Request object if an error did not occur.
+ *
+ *                      {stream} [response] - The HTTP Response stream if an error did not occur.
+ */
+LROSADs.prototype.beginPutNonRetry201Creating400InvalidJson = function (options, callback) {
+  var client = this.client;
+  if(!callback && typeof options === 'function') {
+    callback = options;
+    options = null;
+  }
+  if (!callback) {
+    throw new Error('callback cannot be null.');
+  }
+  var product = (options && options.product !== undefined) ? options.product : undefined;
+  // Validate
+  try {
+    if (this.client.acceptLanguage !== null && this.client.acceptLanguage !== undefined && typeof this.client.acceptLanguage.valueOf() !== 'string') {
+      throw new Error('this.client.acceptLanguage must be of type string.');
+    }
+  } catch (error) {
+    return callback(error);
+  }
+
+  // Construct URL
+  var requestUrl = this.client.baseUri +
+                   '//lro/nonretryerror/put/201/creating/400/invalidjson';
+  var queryParameters = [];
+  if (queryParameters.length > 0) {
+    requestUrl += '?' + queryParameters.join('&');
+  }
+  // trim all duplicate forward slashes in the url
+  var regex = /([^:]\/)\/+/gi;
+  requestUrl = requestUrl.replace(regex, '$1');
+
+  // Create HTTP transport objects
+  var httpRequest = new WebResource();
+  httpRequest.method = 'PUT';
+  httpRequest.headers = {};
+  httpRequest.url = requestUrl;
+  // Set Headers
+  if (this.client.generateClientRequestId) {
+      httpRequest.headers['x-ms-client-request-id'] = msRestAzure.generateUuid();
+  }
+  if (this.client.acceptLanguage !== undefined && this.client.acceptLanguage !== null) {
+    httpRequest.headers['accept-language'] = this.client.acceptLanguage;
+  }
+  if(options) {
+    for(var headerName in options['customHeaders']) {
+      if (options['customHeaders'].hasOwnProperty(headerName)) {
+        httpRequest.headers[headerName] = options['customHeaders'][headerName];
+      }
+    }
+  }
+  httpRequest.headers['Content-Type'] = 'application/json; charset=utf-8';
+  // Serialize Request
+  var requestContent = null;
+  var requestModel = null;
+  try {
+    if (product !== null && product !== undefined) {
+      var requestModelMapper = new client.models['Product']().mapper();
+      requestModel = client.serialize(requestModelMapper, product, 'product');
+      requestContent = JSON.stringify(requestModel);
+    }
+  } catch (error) {
+    var serializationError = new Error(util.format('Error "%s" occurred in serializing the ' + 
+        'payload - "%s"', error.message, util.inspect(product, {depth: null})));
+    return callback(serializationError);
+  }
+  httpRequest.body = requestContent;
+  // Send Request
+  return client.pipeline(httpRequest, function (err, response, responseBody) {
+    if (err) {
+      return callback(err);
+    }
+    var statusCode = response.statusCode;
+    if (statusCode !== 200 && statusCode !== 201) {
+      var error = new Error(responseBody);
+      error.statusCode = response.statusCode;
+      error.request = msRest.stripRequest(httpRequest);
+      error.response = msRest.stripResponse(response);
+      if (responseBody === '') responseBody = null;
+      var parsedErrorResponse;
+      try {
+        parsedErrorResponse = JSON.parse(responseBody);
+        if (parsedErrorResponse) {
+          if (parsedErrorResponse.error) parsedErrorResponse = parsedErrorResponse.error;
+          if (parsedErrorResponse.code) error.code = parsedErrorResponse.code;
+          if (parsedErrorResponse.message) error.message = parsedErrorResponse.message;
+        }
+        if (parsedErrorResponse !== null && parsedErrorResponse !== undefined) {
+          var resultMapper = new client.models['CloudError']().mapper();
+          error.body = client.deserialize(resultMapper, parsedErrorResponse, 'error.body');
+        }
+      } catch (defaultError) {
+        error.message = util.format('Error "%s" occurred in deserializing the responseBody ' + 
+                         '- "%s" for the default response.', defaultError.message, responseBody);
+        return callback(error);
+      }
+      return callback(error);
+    }
+    // Create Result
+    var result = null;
+    if (responseBody === '') responseBody = null;
+    // Deserialize Response
+    if (statusCode === 200) {
+      var parsedResponse = null;
+      try {
+        parsedResponse = JSON.parse(responseBody);
+        result = JSON.parse(responseBody);
+        if (parsedResponse !== null && parsedResponse !== undefined) {
+          var resultMapper = new client.models['Product']().mapper();
+          result = client.deserialize(resultMapper, parsedResponse, 'result');
+        }
+      } catch (error) {
+        var deserializationError = new Error(util.format('Error "%s" occurred in deserializing the responseBody - "%s"', error, responseBody));
+        deserializationError.request = msRest.stripRequest(httpRequest);
+        deserializationError.response = msRest.stripResponse(response);
+        return callback(deserializationError);
+      }
+    }
+    // Deserialize Response
+    if (statusCode === 201) {
+      var parsedResponse = null;
+      try {
+        parsedResponse = JSON.parse(responseBody);
+        result = JSON.parse(responseBody);
+        if (parsedResponse !== null && parsedResponse !== undefined) {
+          var resultMapper = new client.models['Product']().mapper();
+          result = client.deserialize(resultMapper, parsedResponse, 'result');
+        }
+      } catch (error) {
+        var deserializationError1 = new Error(util.format('Error "%s" occurred in deserializing the responseBody - "%s"', error, responseBody));
+        deserializationError1.request = msRest.stripRequest(httpRequest);
+        deserializationError1.response = msRest.stripResponse(response);
+        return callback(deserializationError1);
+      }
+    }
+
+    return callback(null, result, httpRequest, response);
+  });
+};
+
 /**
  *
  * Long running put request, service returns a 200 with
@@ -576,7 +825,7 @@ LROSADs.prototype.putAsyncRelativeRetry400 = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPutOrPatchOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -799,7 +1048,7 @@ LROSADs.prototype.deleteNonRetry400 = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPostOrDeleteOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -965,7 +1214,7 @@ LROSADs.prototype.delete202NonRetry400 = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPostOrDeleteOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -1133,7 +1382,7 @@ LROSADs.prototype.deleteAsyncRelativeRetry400 = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPostOrDeleteOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -1309,7 +1558,7 @@ LROSADs.prototype.postNonRetry400 = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPostOrDeleteOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -1506,7 +1755,7 @@ LROSADs.prototype.post202NonRetry400 = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPostOrDeleteOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -1705,7 +1954,7 @@ LROSADs.prototype.postAsyncRelativeRetry400 = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPostOrDeleteOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -1906,7 +2155,7 @@ LROSADs.prototype.putError201NoProvisioningStatePayload = function (options, cal
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPutOrPatchOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -2156,7 +2405,7 @@ LROSADs.prototype.putAsyncRelativeRetryNoStatus = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPutOrPatchOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -2390,7 +2639,7 @@ LROSADs.prototype.putAsyncRelativeRetryNoStatusPayload = function (options, call
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPutOrPatchOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -2614,7 +2863,7 @@ LROSADs.prototype.delete204Succeeded = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPostOrDeleteOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -2783,7 +3032,7 @@ LROSADs.prototype.deleteAsyncRelativeRetryNoStatus = function (options, callback
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPostOrDeleteOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -2960,7 +3209,7 @@ LROSADs.prototype.post202NoLocation = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPostOrDeleteOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -3160,7 +3409,7 @@ LROSADs.prototype.postAsyncRelativeRetryNoPayload = function (options, callback)
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPostOrDeleteOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -3361,7 +3610,7 @@ LROSADs.prototype.put200InvalidJson = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPutOrPatchOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -3594,7 +3843,7 @@ LROSADs.prototype.putAsyncRelativeRetryInvalidHeader = function (options, callba
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPutOrPatchOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -3828,7 +4077,7 @@ LROSADs.prototype.putAsyncRelativeRetryInvalidJsonPolling = function (options, c
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPutOrPatchOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -4052,7 +4301,7 @@ LROSADs.prototype.delete202RetryInvalidHeader = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPostOrDeleteOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -4220,7 +4469,7 @@ LROSADs.prototype.deleteAsyncRelativeRetryInvalidHeader = function (options, cal
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPostOrDeleteOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -4389,7 +4638,7 @@ LROSADs.prototype.deleteAsyncRelativeRetryInvalidJsonPolling = function (options
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPostOrDeleteOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -4566,7 +4815,7 @@ LROSADs.prototype.post202RetryInvalidHeader = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPostOrDeleteOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -4766,7 +5015,7 @@ LROSADs.prototype.postAsyncRelativeRetryInvalidHeader = function (options, callb
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPostOrDeleteOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -4967,7 +5216,7 @@ LROSADs.prototype.postAsyncRelativeRetryInvalidJsonPolling = function (options,
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPostOrDeleteOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
diff --git a/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Lro/operations/lROs.js b/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Lro/operations/lROs.js
index b0cc6a272fd58..f403121e6dfec 100644
--- a/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Lro/operations/lROs.js
+++ b/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Lro/operations/lROs.js
@@ -79,7 +79,7 @@ LROs.prototype.put200Succeeded = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPutOrPatchOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -311,7 +311,7 @@ LROs.prototype.put200SucceededNoState = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPutOrPatchOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -544,7 +544,7 @@ LROs.prototype.put202Retry200 = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPutOrPatchOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -779,7 +779,7 @@ LROs.prototype.put201CreatingSucceeded200 = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPutOrPatchOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -1032,7 +1032,7 @@ LROs.prototype.put200UpdatingSucceeded204 = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPutOrPatchOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -1268,7 +1268,7 @@ LROs.prototype.put201CreatingFailed200 = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPutOrPatchOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -1521,7 +1521,7 @@ LROs.prototype.put200Acceptedcanceled200 = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPutOrPatchOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -1756,7 +1756,7 @@ LROs.prototype.putNoHeaderInRetry = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPutOrPatchOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -1990,7 +1990,7 @@ LROs.prototype.putAsyncRetrySucceeded = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPutOrPatchOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -2224,7 +2224,7 @@ LROs.prototype.putAsyncNoRetrySucceeded = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPutOrPatchOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -2458,7 +2458,7 @@ LROs.prototype.putAsyncRetryFailed = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPutOrPatchOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -2692,7 +2692,7 @@ LROs.prototype.putAsyncNoRetrycanceled = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPutOrPatchOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -2926,7 +2926,7 @@ LROs.prototype.putAsyncNoHeaderInRetry = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPutOrPatchOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -3156,7 +3156,7 @@ LROs.prototype.putNonResource = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPutOrPatchOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -3382,7 +3382,7 @@ LROs.prototype.putAsyncNonResource = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPutOrPatchOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -3606,7 +3606,7 @@ LROs.prototype.putSubResource = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPutOrPatchOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -3828,7 +3828,7 @@ LROs.prototype.putAsyncSubResource = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPutOrPatchOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -4049,7 +4049,7 @@ LROs.prototype.deleteProvisioning202Accepted200Succeeded = function (options, ca
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPostOrDeleteOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -4271,7 +4271,7 @@ LROs.prototype.deleteProvisioning202DeletingFailed200 = function (options, callb
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPostOrDeleteOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -4493,7 +4493,7 @@ LROs.prototype.deleteProvisioning202Deletingcanceled200 = function (options, cal
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPostOrDeleteOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -4711,7 +4711,7 @@ LROs.prototype.delete204Succeeded = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPostOrDeleteOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -4880,7 +4880,7 @@ LROs.prototype.delete202Retry200 = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPostOrDeleteOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -5083,7 +5083,7 @@ LROs.prototype.delete202NoRetry204 = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPostOrDeleteOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -5285,7 +5285,7 @@ LROs.prototype.deleteNoHeaderInRetry = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPostOrDeleteOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -5455,7 +5455,7 @@ LROs.prototype.deleteAsyncNoHeaderInRetry = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPostOrDeleteOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -5625,7 +5625,7 @@ LROs.prototype.deleteAsyncRetrySucceeded = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPostOrDeleteOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -5795,7 +5795,7 @@ LROs.prototype.deleteAsyncNoRetrySucceeded = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPostOrDeleteOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -5965,7 +5965,7 @@ LROs.prototype.deleteAsyncRetryFailed = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPostOrDeleteOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -6135,7 +6135,7 @@ LROs.prototype.deleteAsyncRetrycanceled = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPostOrDeleteOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -6306,7 +6306,7 @@ LROs.prototype.post200WithPayload = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPostOrDeleteOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -6533,7 +6533,7 @@ LROs.prototype.post202Retry200 = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPostOrDeleteOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -6734,7 +6734,7 @@ LROs.prototype.post202NoRetry204 = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPostOrDeleteOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -6967,7 +6967,7 @@ LROs.prototype.postAsyncRetrySucceeded = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPostOrDeleteOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -7201,7 +7201,7 @@ LROs.prototype.postAsyncNoRetrySucceeded = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPostOrDeleteOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -7434,7 +7434,7 @@ LROs.prototype.postAsyncRetryFailed = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPostOrDeleteOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -7635,7 +7635,7 @@ LROs.prototype.postAsyncRetrycanceled = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPostOrDeleteOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
diff --git a/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Lro/operations/lROsCustomHeader.js b/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Lro/operations/lROsCustomHeader.js
index 9dc6656111ba1..3d4d296e68aaa 100644
--- a/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Lro/operations/lROsCustomHeader.js
+++ b/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Lro/operations/lROsCustomHeader.js
@@ -82,7 +82,7 @@ LROsCustomHeader.prototype.putAsyncRetrySucceeded = function (options, callback)
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPutOrPatchOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -320,7 +320,7 @@ LROsCustomHeader.prototype.put201CreatingSucceeded200 = function (options, callb
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPutOrPatchOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -573,7 +573,7 @@ LROsCustomHeader.prototype.post202Retry200 = function (options, callback) {
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPostOrDeleteOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
@@ -777,7 +777,7 @@ LROsCustomHeader.prototype.postAsyncRetrySucceeded = function (options, callback
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPostOrDeleteOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
diff --git a/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Paging/models/index.d.ts b/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Paging/models/index.d.ts
index b95c21cdbef8a..4df2fb2dc1100 100644
--- a/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Paging/models/index.d.ts
+++ b/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Paging/models/index.d.ts
@@ -56,7 +56,7 @@ export interface OperationResult {
  * @class
  * Initializes a new instance of the PagingGetMultiplePagesOptions class.
  * @constructor
- * Additional parameters for the getMultiplePages operation.
+ * Additional parameters for the Paging_getMultiplePages operation.
  * @member {number} [maxresults] Sets the maximum number of items to return in
  * the response.
  * 
@@ -73,7 +73,7 @@ export interface PagingGetMultiplePagesOptions {
  * @class
  * Initializes a new instance of the PagingGetMultiplePagesWithOffsetOptions class.
  * @constructor
- * Additional parameters for the getMultiplePagesWithOffset operation.
+ * Additional parameters for the Paging_getMultiplePagesWithOffset operation.
  * @member {number} [maxresults] Sets the maximum number of items to return in
  * the response.
  * 
diff --git a/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Paging/models/pagingGetMultiplePagesOptions.js b/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Paging/models/pagingGetMultiplePagesOptions.js
index 017fd4372b9ee..054ea7a991213 100644
--- a/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Paging/models/pagingGetMultiplePagesOptions.js
+++ b/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Paging/models/pagingGetMultiplePagesOptions.js
@@ -14,7 +14,7 @@
  * @class
  * Initializes a new instance of the PagingGetMultiplePagesOptions class.
  * @constructor
- * Additional parameters for the getMultiplePages operation.
+ * Additional parameters for the Paging_getMultiplePages operation.
  * @member {number} [maxresults] Sets the maximum number of items to return in
  * the response.
  * 
diff --git a/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Paging/models/pagingGetMultiplePagesWithOffsetOptions.js b/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Paging/models/pagingGetMultiplePagesWithOffsetOptions.js
index 42631d194f11b..03b9df22d91a4 100644
--- a/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Paging/models/pagingGetMultiplePagesWithOffsetOptions.js
+++ b/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Paging/models/pagingGetMultiplePagesWithOffsetOptions.js
@@ -14,7 +14,7 @@
  * @class
  * Initializes a new instance of the PagingGetMultiplePagesWithOffsetOptions class.
  * @constructor
- * Additional parameters for the getMultiplePagesWithOffset operation.
+ * Additional parameters for the Paging_getMultiplePagesWithOffset operation.
  * @member {number} [maxresults] Sets the maximum number of items to return in
  * the response.
  * 
diff --git a/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/StorageManagementClient/operations/storageAccounts.js b/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/StorageManagementClient/operations/storageAccounts.js
index 272319d4ccc39..bff7003860456 100644
--- a/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/StorageManagementClient/operations/storageAccounts.js
+++ b/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/StorageManagementClient/operations/storageAccounts.js
@@ -253,7 +253,7 @@ StorageAccounts.prototype.create = function (resourceGroupName, accountName, par
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPutOrPatchOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
diff --git a/AutoRest/Generators/NodeJS/Azure.NodeJS/AzureNodeJSCodeGenerator.cs b/AutoRest/Generators/NodeJS/Azure.NodeJS/AzureNodeJSCodeGenerator.cs
index ac8eea6fb028a..e68eb4727a6dc 100644
--- a/AutoRest/Generators/NodeJS/Azure.NodeJS/AzureNodeJSCodeGenerator.cs
+++ b/AutoRest/Generators/NodeJS/Azure.NodeJS/AzureNodeJSCodeGenerator.cs
@@ -18,7 +18,7 @@ namespace Microsoft.Rest.Generator.Azure.NodeJS
 {
     public class AzureNodeJSCodeGenerator : NodeJSCodeGenerator
     {
-        private const string ClientRuntimePackage = "ms-rest-azure version 1.12.0";
+        private const string ClientRuntimePackage = "ms-rest-azure version 1.13.1";
 
         // List of models with paging extensions.
         private IList<PageTemplateModel> pageModels;
diff --git a/AutoRest/Generators/NodeJS/Azure.NodeJS/TemplateModels/AzureMethodTemplateModel.cs b/AutoRest/Generators/NodeJS/Azure.NodeJS/TemplateModels/AzureMethodTemplateModel.cs
index 95a519d366c9d..a6fbcc9e356e9 100644
--- a/AutoRest/Generators/NodeJS/Azure.NodeJS/TemplateModels/AzureMethodTemplateModel.cs
+++ b/AutoRest/Generators/NodeJS/Azure.NodeJS/TemplateModels/AzureMethodTemplateModel.cs
@@ -86,14 +86,7 @@ public string LongRunningOperationMethodNameInRuntime
                 string result = null;
                 if (this.IsLongRunningOperation)
                 {
-                    if (HttpMethod == HttpMethod.Post || HttpMethod == HttpMethod.Delete)
-                    {
-                        result = "getPostOrDeleteOperationResult";
-                    }
-                    else if (HttpMethod == HttpMethod.Put || HttpMethod == HttpMethod.Patch)
-                    {
-                        result = "getPutOrPatchOperationResult";
-                    }
+                    result = "getLongRunningOperationResult";
                 }
                 return result;
             }
diff --git a/AutoRest/Generators/NodeJS/NodeJS.Tests/AcceptanceTests/acceptanceTests.ts b/AutoRest/Generators/NodeJS/NodeJS.Tests/AcceptanceTests/acceptanceTests.ts
index c7404da84e360..db5042f716ed3 100644
--- a/AutoRest/Generators/NodeJS/NodeJS.Tests/AcceptanceTests/acceptanceTests.ts
+++ b/AutoRest/Generators/NodeJS/NodeJS.Tests/AcceptanceTests/acceptanceTests.ts
@@ -32,7 +32,7 @@ import dictionaryModels = require('../Expected/AcceptanceTests/BodyDictionary/mo
 import httpClient = require('../Expected/AcceptanceTests/Http/autoRestHttpInfrastructureTestService');
 import formDataClient = require('../Expected/AcceptanceTests/BodyFormData/autoRestSwaggerBATFormDataService');
 import customBaseUriClient = require('../Expected/AcceptanceTests/CustomBaseUri/autoRestParameterizedHostTestClient');
-
+import customBaseUriClientMoreOptions = require('../Expected/AcceptanceTests/CustomBaseUriMoreOptions/autoRestParameterizedCustomHostTestClient');
 
 var dummyToken = 'dummy12321343423';
 var credentials = new msRest.TokenCredentials(dummyToken);
@@ -94,6 +94,19 @@ describe('nodejs', function () {
         });
       });
     });
+    describe('Custom BaseUri Client with more options', function () {
+      var customOptions = {
+        dnsSuffix: 'host:3000'
+      };
+      var testClient = new customBaseUriClientMoreOptions('test12', customOptions);
+      it('should return 200', function (done) {
+          testClient.paths.getEmpty('http://lo','cal', 'key1', function (error, result, request, response) {
+          should.not.exist(error);
+          response.statusCode.should.equal(200);
+          done();
+        });
+      });
+    });
     describe('Bool Client', function () {
       var testClient = new boolClient(baseUri, clientOptions);
       it('should get valid boolean values', function (done) {
@@ -186,6 +199,29 @@ describe('nodejs', function () {
           });
         });
       });
+
+      it('should put and get UnixTime date correctly', function (done) {
+        var d = new Date('2016-04-13T00:00:00.000Z');
+        testClient.intModel.putUnixTimeDate(d, function (error, result) {
+          should.not.exist(error);
+          testClient.intModel.getUnixTime(function (error, result) {
+            should.not.exist(error);
+            assert.deepEqual(result, d);
+            done();
+          });
+        });
+      });
+
+      it('should throw an error for invalid UnixTime date anf get null value for UnixTime', function (done) {
+        testClient.intModel.getInvalidUnixTime(function (error, result) {
+          should.exist(error);
+          testClient.intModel.getNullUnixTime(function (error, result) {
+            should.not.exist(error);
+            should.not.exist(result);
+            done();
+          });
+        });
+      });
     });
 
     describe('CompositeBoolInt Client', function () {
@@ -1878,6 +1914,13 @@ describe('nodejs', function () {
         });
       });
 
+      it('should work when path has a paramaeter in UnixTime format', function (done) {
+        testClient.paths.unixTimeUrl(new Date('2016-04-13T00:00:00.000Z'), function (error, result) {
+          should.not.exist(error);
+          done();
+        });
+      });
+
       it('should work when path has datetime', function (done) {
         testClient.paths.dateTimeValid(new Date('2012-01-01T01:01:01Z'), function (error, result) {
           should.not.exist(error);
diff --git a/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/BodyInteger/operations/index.d.ts b/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/BodyInteger/operations/index.d.ts
index 26ce14eb339ea..6fddcb9d06757 100644
--- a/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/BodyInteger/operations/index.d.ts
+++ b/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/BodyInteger/operations/index.d.ts
@@ -167,4 +167,62 @@ export interface IntModel {
      */
     putMin64(intBody: number, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<void>): void;
     putMin64(intBody: number, callback: ServiceCallback<void>): void;
+
+    /**
+     * Get datetime encoded as Unix time value
+     *
+     * @param {object} [options] Optional Parameters.
+     * 
+     * @param {object} [options.customHeaders] Headers that will be added to the
+     * request
+     * 
+     * @param {ServiceCallback} [callback] callback function; see ServiceCallback
+     * doc in ms-rest index.d.ts for details
+     */
+    getUnixTime(options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<Date>): void;
+    getUnixTime(callback: ServiceCallback<Date>): void;
+
+    /**
+     * Put datetime encoded as Unix time
+     *
+     * @param {date} intBody
+     * 
+     * @param {object} [options] Optional Parameters.
+     * 
+     * @param {object} [options.customHeaders] Headers that will be added to the
+     * request
+     * 
+     * @param {ServiceCallback} [callback] callback function; see ServiceCallback
+     * doc in ms-rest index.d.ts for details
+     */
+    putUnixTimeDate(intBody: Date, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<void>): void;
+    putUnixTimeDate(intBody: Date, callback: ServiceCallback<void>): void;
+
+    /**
+     * Get invalid Unix time value
+     *
+     * @param {object} [options] Optional Parameters.
+     * 
+     * @param {object} [options.customHeaders] Headers that will be added to the
+     * request
+     * 
+     * @param {ServiceCallback} [callback] callback function; see ServiceCallback
+     * doc in ms-rest index.d.ts for details
+     */
+    getInvalidUnixTime(options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<Date>): void;
+    getInvalidUnixTime(callback: ServiceCallback<Date>): void;
+
+    /**
+     * Get null Unix time value
+     *
+     * @param {object} [options] Optional Parameters.
+     * 
+     * @param {object} [options.customHeaders] Headers that will be added to the
+     * request
+     * 
+     * @param {ServiceCallback} [callback] callback function; see ServiceCallback
+     * doc in ms-rest index.d.ts for details
+     */
+    getNullUnixTime(options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<Date>): void;
+    getNullUnixTime(callback: ServiceCallback<Date>): void;
 }
diff --git a/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/BodyInteger/operations/intModel.js b/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/BodyInteger/operations/intModel.js
index 81595128f8a57..290a93e9b35ef 100644
--- a/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/BodyInteger/operations/intModel.js
+++ b/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/BodyInteger/operations/intModel.js
@@ -1196,5 +1196,469 @@ IntModel.prototype.putMin64 = function (intBody, options, callback) {
   });
 };
 
+/**
+ * Get datetime encoded as Unix time value
+ *
+ * @param {object} [options] Optional Parameters.
+ * 
+ * @param {object} [options.customHeaders] Headers that will be added to the
+ * request
+ * 
+ * @param {function} callback
+ *
+ * @returns {function} callback(err, result, request, response)
+ *
+ *                      {Error}  err        - The Error object if an error occurred, null otherwise.
+ *
+ *                      {date} [result]   - The deserialized result object.
+ *
+ *                      {object} [request]  - The HTTP Request object if an error did not occur.
+ *
+ *                      {stream} [response] - The HTTP Response stream if an error did not occur.
+ */
+IntModel.prototype.getUnixTime = function (options, callback) {
+  var client = this.client;
+  if(!callback && typeof options === 'function') {
+    callback = options;
+    options = null;
+  }
+  if (!callback) {
+    throw new Error('callback cannot be null.');
+  }
+
+  // Construct URL
+  var requestUrl = this.client.baseUri +
+                   '//int/unixtime';
+  // trim all duplicate forward slashes in the url
+  var regex = /([^:]\/)\/+/gi;
+  requestUrl = requestUrl.replace(regex, '$1');
+
+  // Create HTTP transport objects
+  var httpRequest = new WebResource();
+  httpRequest.method = 'GET';
+  httpRequest.headers = {};
+  httpRequest.url = requestUrl;
+  // Set Headers
+  if(options) {
+    for(var headerName in options['customHeaders']) {
+      if (options['customHeaders'].hasOwnProperty(headerName)) {
+        httpRequest.headers[headerName] = options['customHeaders'][headerName];
+      }
+    }
+  }
+  httpRequest.headers['Content-Type'] = 'application/json; charset=utf-8';
+  httpRequest.body = null;
+  // Send Request
+  return client.pipeline(httpRequest, function (err, response, responseBody) {
+    if (err) {
+      return callback(err);
+    }
+    var statusCode = response.statusCode;
+    if (statusCode !== 200) {
+      var error = new Error(responseBody);
+      error.statusCode = response.statusCode;
+      error.request = msRest.stripRequest(httpRequest);
+      error.response = msRest.stripResponse(response);
+      if (responseBody === '') responseBody = null;
+      var parsedErrorResponse;
+      try {
+        parsedErrorResponse = JSON.parse(responseBody);
+        if (parsedErrorResponse) {
+          if (parsedErrorResponse.error) parsedErrorResponse = parsedErrorResponse.error;
+          if (parsedErrorResponse.code) error.code = parsedErrorResponse.code;
+          if (parsedErrorResponse.message) error.message = parsedErrorResponse.message;
+        }
+        if (parsedErrorResponse !== null && parsedErrorResponse !== undefined) {
+          var resultMapper = new client.models['ErrorModel']().mapper();
+          error.body = client.deserialize(resultMapper, parsedErrorResponse, 'error.body');
+        }
+      } catch (defaultError) {
+        error.message = util.format('Error "%s" occurred in deserializing the responseBody ' + 
+                         '- "%s" for the default response.', defaultError.message, responseBody);
+        return callback(error);
+      }
+      return callback(error);
+    }
+    // Create Result
+    var result = null;
+    if (responseBody === '') responseBody = null;
+    // Deserialize Response
+    if (statusCode === 200) {
+      var parsedResponse = null;
+      try {
+        parsedResponse = JSON.parse(responseBody);
+        result = JSON.parse(responseBody);
+        if (parsedResponse !== null && parsedResponse !== undefined) {
+          var resultMapper = {
+            required: false,
+            serializedName: 'parsedResponse',
+            type: {
+              name: 'UnixTime'
+            }
+          };
+          result = client.deserialize(resultMapper, parsedResponse, 'result');
+        }
+      } catch (error) {
+        var deserializationError = new Error(util.format('Error "%s" occurred in deserializing the responseBody - "%s"', error, responseBody));
+        deserializationError.request = msRest.stripRequest(httpRequest);
+        deserializationError.response = msRest.stripResponse(response);
+        return callback(deserializationError);
+      }
+    }
+
+    return callback(null, result, httpRequest, response);
+  });
+};
+
+/**
+ * Put datetime encoded as Unix time
+ *
+ * @param {date} intBody
+ * 
+ * @param {object} [options] Optional Parameters.
+ * 
+ * @param {object} [options.customHeaders] Headers that will be added to the
+ * request
+ * 
+ * @param {function} callback
+ *
+ * @returns {function} callback(err, result, request, response)
+ *
+ *                      {Error}  err        - The Error object if an error occurred, null otherwise.
+ *
+ *                      {null} [result]   - The deserialized result object.
+ *
+ *                      {object} [request]  - The HTTP Request object if an error did not occur.
+ *
+ *                      {stream} [response] - The HTTP Response stream if an error did not occur.
+ */
+IntModel.prototype.putUnixTimeDate = function (intBody, options, callback) {
+  var client = this.client;
+  if(!callback && typeof options === 'function') {
+    callback = options;
+    options = null;
+  }
+  if (!callback) {
+    throw new Error('callback cannot be null.');
+  }
+  // Validate
+  try {
+    if(!intBody || !(intBody instanceof Date || 
+        (typeof intBody.valueOf() === 'string' && !isNaN(Date.parse(intBody))))) {
+          throw new Error('intBody cannot be null or undefined and it must be of type date.');
+        }
+  } catch (error) {
+    return callback(error);
+  }
+
+  // Construct URL
+  var requestUrl = this.client.baseUri +
+                   '//int/unixtime';
+  // trim all duplicate forward slashes in the url
+  var regex = /([^:]\/)\/+/gi;
+  requestUrl = requestUrl.replace(regex, '$1');
+
+  // Create HTTP transport objects
+  var httpRequest = new WebResource();
+  httpRequest.method = 'PUT';
+  httpRequest.headers = {};
+  httpRequest.url = requestUrl;
+  // Set Headers
+  if(options) {
+    for(var headerName in options['customHeaders']) {
+      if (options['customHeaders'].hasOwnProperty(headerName)) {
+        httpRequest.headers[headerName] = options['customHeaders'][headerName];
+      }
+    }
+  }
+  httpRequest.headers['Content-Type'] = 'application/json; charset=utf-8';
+  // Serialize Request
+  var requestContent = null;
+  var requestModel = null;
+  try {
+    if (intBody !== null && intBody !== undefined) {
+      var requestModelMapper = {
+        required: true,
+        serializedName: 'intBody',
+        type: {
+          name: 'UnixTime'
+        }
+      };
+      requestModel = client.serialize(requestModelMapper, intBody, 'intBody');
+      requestContent = JSON.stringify(requestModel);
+    }
+  } catch (error) {
+    var serializationError = new Error(util.format('Error "%s" occurred in serializing the ' + 
+        'payload - "%s"', error.message, util.inspect(intBody, {depth: null})));
+    return callback(serializationError);
+  }
+  httpRequest.body = requestContent;
+  // Send Request
+  return client.pipeline(httpRequest, function (err, response, responseBody) {
+    if (err) {
+      return callback(err);
+    }
+    var statusCode = response.statusCode;
+    if (statusCode !== 200) {
+      var error = new Error(responseBody);
+      error.statusCode = response.statusCode;
+      error.request = msRest.stripRequest(httpRequest);
+      error.response = msRest.stripResponse(response);
+      if (responseBody === '') responseBody = null;
+      var parsedErrorResponse;
+      try {
+        parsedErrorResponse = JSON.parse(responseBody);
+        if (parsedErrorResponse) {
+          if (parsedErrorResponse.error) parsedErrorResponse = parsedErrorResponse.error;
+          if (parsedErrorResponse.code) error.code = parsedErrorResponse.code;
+          if (parsedErrorResponse.message) error.message = parsedErrorResponse.message;
+        }
+        if (parsedErrorResponse !== null && parsedErrorResponse !== undefined) {
+          var resultMapper = new client.models['ErrorModel']().mapper();
+          error.body = client.deserialize(resultMapper, parsedErrorResponse, 'error.body');
+        }
+      } catch (defaultError) {
+        error.message = util.format('Error "%s" occurred in deserializing the responseBody ' + 
+                         '- "%s" for the default response.', defaultError.message, responseBody);
+        return callback(error);
+      }
+      return callback(error);
+    }
+    // Create Result
+    var result = null;
+    if (responseBody === '') responseBody = null;
+
+    return callback(null, result, httpRequest, response);
+  });
+};
+
+/**
+ * Get invalid Unix time value
+ *
+ * @param {object} [options] Optional Parameters.
+ * 
+ * @param {object} [options.customHeaders] Headers that will be added to the
+ * request
+ * 
+ * @param {function} callback
+ *
+ * @returns {function} callback(err, result, request, response)
+ *
+ *                      {Error}  err        - The Error object if an error occurred, null otherwise.
+ *
+ *                      {date} [result]   - The deserialized result object.
+ *
+ *                      {object} [request]  - The HTTP Request object if an error did not occur.
+ *
+ *                      {stream} [response] - The HTTP Response stream if an error did not occur.
+ */
+IntModel.prototype.getInvalidUnixTime = function (options, callback) {
+  var client = this.client;
+  if(!callback && typeof options === 'function') {
+    callback = options;
+    options = null;
+  }
+  if (!callback) {
+    throw new Error('callback cannot be null.');
+  }
+
+  // Construct URL
+  var requestUrl = this.client.baseUri +
+                   '//int/invalidunixtime';
+  // trim all duplicate forward slashes in the url
+  var regex = /([^:]\/)\/+/gi;
+  requestUrl = requestUrl.replace(regex, '$1');
+
+  // Create HTTP transport objects
+  var httpRequest = new WebResource();
+  httpRequest.method = 'GET';
+  httpRequest.headers = {};
+  httpRequest.url = requestUrl;
+  // Set Headers
+  if(options) {
+    for(var headerName in options['customHeaders']) {
+      if (options['customHeaders'].hasOwnProperty(headerName)) {
+        httpRequest.headers[headerName] = options['customHeaders'][headerName];
+      }
+    }
+  }
+  httpRequest.headers['Content-Type'] = 'application/json; charset=utf-8';
+  httpRequest.body = null;
+  // Send Request
+  return client.pipeline(httpRequest, function (err, response, responseBody) {
+    if (err) {
+      return callback(err);
+    }
+    var statusCode = response.statusCode;
+    if (statusCode !== 200) {
+      var error = new Error(responseBody);
+      error.statusCode = response.statusCode;
+      error.request = msRest.stripRequest(httpRequest);
+      error.response = msRest.stripResponse(response);
+      if (responseBody === '') responseBody = null;
+      var parsedErrorResponse;
+      try {
+        parsedErrorResponse = JSON.parse(responseBody);
+        if (parsedErrorResponse) {
+          if (parsedErrorResponse.error) parsedErrorResponse = parsedErrorResponse.error;
+          if (parsedErrorResponse.code) error.code = parsedErrorResponse.code;
+          if (parsedErrorResponse.message) error.message = parsedErrorResponse.message;
+        }
+        if (parsedErrorResponse !== null && parsedErrorResponse !== undefined) {
+          var resultMapper = new client.models['ErrorModel']().mapper();
+          error.body = client.deserialize(resultMapper, parsedErrorResponse, 'error.body');
+        }
+      } catch (defaultError) {
+        error.message = util.format('Error "%s" occurred in deserializing the responseBody ' + 
+                         '- "%s" for the default response.', defaultError.message, responseBody);
+        return callback(error);
+      }
+      return callback(error);
+    }
+    // Create Result
+    var result = null;
+    if (responseBody === '') responseBody = null;
+    // Deserialize Response
+    if (statusCode === 200) {
+      var parsedResponse = null;
+      try {
+        parsedResponse = JSON.parse(responseBody);
+        result = JSON.parse(responseBody);
+        if (parsedResponse !== null && parsedResponse !== undefined) {
+          var resultMapper = {
+            required: false,
+            serializedName: 'parsedResponse',
+            type: {
+              name: 'UnixTime'
+            }
+          };
+          result = client.deserialize(resultMapper, parsedResponse, 'result');
+        }
+      } catch (error) {
+        var deserializationError = new Error(util.format('Error "%s" occurred in deserializing the responseBody - "%s"', error, responseBody));
+        deserializationError.request = msRest.stripRequest(httpRequest);
+        deserializationError.response = msRest.stripResponse(response);
+        return callback(deserializationError);
+      }
+    }
+
+    return callback(null, result, httpRequest, response);
+  });
+};
+
+/**
+ * Get null Unix time value
+ *
+ * @param {object} [options] Optional Parameters.
+ * 
+ * @param {object} [options.customHeaders] Headers that will be added to the
+ * request
+ * 
+ * @param {function} callback
+ *
+ * @returns {function} callback(err, result, request, response)
+ *
+ *                      {Error}  err        - The Error object if an error occurred, null otherwise.
+ *
+ *                      {date} [result]   - The deserialized result object.
+ *
+ *                      {object} [request]  - The HTTP Request object if an error did not occur.
+ *
+ *                      {stream} [response] - The HTTP Response stream if an error did not occur.
+ */
+IntModel.prototype.getNullUnixTime = function (options, callback) {
+  var client = this.client;
+  if(!callback && typeof options === 'function') {
+    callback = options;
+    options = null;
+  }
+  if (!callback) {
+    throw new Error('callback cannot be null.');
+  }
+
+  // Construct URL
+  var requestUrl = this.client.baseUri +
+                   '//int/nullunixtime';
+  // trim all duplicate forward slashes in the url
+  var regex = /([^:]\/)\/+/gi;
+  requestUrl = requestUrl.replace(regex, '$1');
+
+  // Create HTTP transport objects
+  var httpRequest = new WebResource();
+  httpRequest.method = 'GET';
+  httpRequest.headers = {};
+  httpRequest.url = requestUrl;
+  // Set Headers
+  if(options) {
+    for(var headerName in options['customHeaders']) {
+      if (options['customHeaders'].hasOwnProperty(headerName)) {
+        httpRequest.headers[headerName] = options['customHeaders'][headerName];
+      }
+    }
+  }
+  httpRequest.headers['Content-Type'] = 'application/json; charset=utf-8';
+  httpRequest.body = null;
+  // Send Request
+  return client.pipeline(httpRequest, function (err, response, responseBody) {
+    if (err) {
+      return callback(err);
+    }
+    var statusCode = response.statusCode;
+    if (statusCode !== 200) {
+      var error = new Error(responseBody);
+      error.statusCode = response.statusCode;
+      error.request = msRest.stripRequest(httpRequest);
+      error.response = msRest.stripResponse(response);
+      if (responseBody === '') responseBody = null;
+      var parsedErrorResponse;
+      try {
+        parsedErrorResponse = JSON.parse(responseBody);
+        if (parsedErrorResponse) {
+          if (parsedErrorResponse.error) parsedErrorResponse = parsedErrorResponse.error;
+          if (parsedErrorResponse.code) error.code = parsedErrorResponse.code;
+          if (parsedErrorResponse.message) error.message = parsedErrorResponse.message;
+        }
+        if (parsedErrorResponse !== null && parsedErrorResponse !== undefined) {
+          var resultMapper = new client.models['ErrorModel']().mapper();
+          error.body = client.deserialize(resultMapper, parsedErrorResponse, 'error.body');
+        }
+      } catch (defaultError) {
+        error.message = util.format('Error "%s" occurred in deserializing the responseBody ' + 
+                         '- "%s" for the default response.', defaultError.message, responseBody);
+        return callback(error);
+      }
+      return callback(error);
+    }
+    // Create Result
+    var result = null;
+    if (responseBody === '') responseBody = null;
+    // Deserialize Response
+    if (statusCode === 200) {
+      var parsedResponse = null;
+      try {
+        parsedResponse = JSON.parse(responseBody);
+        result = JSON.parse(responseBody);
+        if (parsedResponse !== null && parsedResponse !== undefined) {
+          var resultMapper = {
+            required: false,
+            serializedName: 'parsedResponse',
+            type: {
+              name: 'UnixTime'
+            }
+          };
+          result = client.deserialize(resultMapper, parsedResponse, 'result');
+        }
+      } catch (error) {
+        var deserializationError = new Error(util.format('Error "%s" occurred in deserializing the responseBody - "%s"', error, responseBody));
+        deserializationError.request = msRest.stripRequest(httpRequest);
+        deserializationError.response = msRest.stripResponse(response);
+        return callback(deserializationError);
+      }
+    }
+
+    return callback(null, result, httpRequest, response);
+  });
+};
+
 
 module.exports = IntModel;
diff --git a/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/CompositeBoolIntClient/operations/index.d.ts b/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/CompositeBoolIntClient/operations/index.d.ts
index 8238ac41b5170..507488a58f3f6 100644
--- a/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/CompositeBoolIntClient/operations/index.d.ts
+++ b/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/CompositeBoolIntClient/operations/index.d.ts
@@ -264,4 +264,62 @@ export interface IntModel {
      */
     putMin64(intBody: number, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<void>): void;
     putMin64(intBody: number, callback: ServiceCallback<void>): void;
+
+    /**
+     * Get datetime encoded as Unix time value
+     *
+     * @param {object} [options] Optional Parameters.
+     * 
+     * @param {object} [options.customHeaders] Headers that will be added to the
+     * request
+     * 
+     * @param {ServiceCallback} [callback] callback function; see ServiceCallback
+     * doc in ms-rest index.d.ts for details
+     */
+    getUnixTime(options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<Date>): void;
+    getUnixTime(callback: ServiceCallback<Date>): void;
+
+    /**
+     * Put datetime encoded as Unix time
+     *
+     * @param {date} intBody
+     * 
+     * @param {object} [options] Optional Parameters.
+     * 
+     * @param {object} [options.customHeaders] Headers that will be added to the
+     * request
+     * 
+     * @param {ServiceCallback} [callback] callback function; see ServiceCallback
+     * doc in ms-rest index.d.ts for details
+     */
+    putUnixTimeDate(intBody: Date, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<void>): void;
+    putUnixTimeDate(intBody: Date, callback: ServiceCallback<void>): void;
+
+    /**
+     * Get invalid Unix time value
+     *
+     * @param {object} [options] Optional Parameters.
+     * 
+     * @param {object} [options.customHeaders] Headers that will be added to the
+     * request
+     * 
+     * @param {ServiceCallback} [callback] callback function; see ServiceCallback
+     * doc in ms-rest index.d.ts for details
+     */
+    getInvalidUnixTime(options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<Date>): void;
+    getInvalidUnixTime(callback: ServiceCallback<Date>): void;
+
+    /**
+     * Get null Unix time value
+     *
+     * @param {object} [options] Optional Parameters.
+     * 
+     * @param {object} [options.customHeaders] Headers that will be added to the
+     * request
+     * 
+     * @param {ServiceCallback} [callback] callback function; see ServiceCallback
+     * doc in ms-rest index.d.ts for details
+     */
+    getNullUnixTime(options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<Date>): void;
+    getNullUnixTime(callback: ServiceCallback<Date>): void;
 }
diff --git a/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/CompositeBoolIntClient/operations/intModel.js b/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/CompositeBoolIntClient/operations/intModel.js
index e7c05cfad0073..d00f8cb625a0c 100644
--- a/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/CompositeBoolIntClient/operations/intModel.js
+++ b/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/CompositeBoolIntClient/operations/intModel.js
@@ -1196,5 +1196,469 @@ IntModel.prototype.putMin64 = function (intBody, options, callback) {
   });
 };
 
+/**
+ * Get datetime encoded as Unix time value
+ *
+ * @param {object} [options] Optional Parameters.
+ * 
+ * @param {object} [options.customHeaders] Headers that will be added to the
+ * request
+ * 
+ * @param {function} callback
+ *
+ * @returns {function} callback(err, result, request, response)
+ *
+ *                      {Error}  err        - The Error object if an error occurred, null otherwise.
+ *
+ *                      {date} [result]   - The deserialized result object.
+ *
+ *                      {object} [request]  - The HTTP Request object if an error did not occur.
+ *
+ *                      {stream} [response] - The HTTP Response stream if an error did not occur.
+ */
+IntModel.prototype.getUnixTime = function (options, callback) {
+  var client = this.client;
+  if(!callback && typeof options === 'function') {
+    callback = options;
+    options = null;
+  }
+  if (!callback) {
+    throw new Error('callback cannot be null.');
+  }
+
+  // Construct URL
+  var requestUrl = this.client.baseUri +
+                   '//int/unixtime';
+  // trim all duplicate forward slashes in the url
+  var regex = /([^:]\/)\/+/gi;
+  requestUrl = requestUrl.replace(regex, '$1');
+
+  // Create HTTP transport objects
+  var httpRequest = new WebResource();
+  httpRequest.method = 'GET';
+  httpRequest.headers = {};
+  httpRequest.url = requestUrl;
+  // Set Headers
+  if(options) {
+    for(var headerName in options['customHeaders']) {
+      if (options['customHeaders'].hasOwnProperty(headerName)) {
+        httpRequest.headers[headerName] = options['customHeaders'][headerName];
+      }
+    }
+  }
+  httpRequest.headers['Content-Type'] = 'application/json; charset=utf-8';
+  httpRequest.body = null;
+  // Send Request
+  return client.pipeline(httpRequest, function (err, response, responseBody) {
+    if (err) {
+      return callback(err);
+    }
+    var statusCode = response.statusCode;
+    if (statusCode !== 200) {
+      var error = new Error(responseBody);
+      error.statusCode = response.statusCode;
+      error.request = msRest.stripRequest(httpRequest);
+      error.response = msRest.stripResponse(response);
+      if (responseBody === '') responseBody = null;
+      var parsedErrorResponse;
+      try {
+        parsedErrorResponse = JSON.parse(responseBody);
+        if (parsedErrorResponse) {
+          if (parsedErrorResponse.error) parsedErrorResponse = parsedErrorResponse.error;
+          if (parsedErrorResponse.code) error.code = parsedErrorResponse.code;
+          if (parsedErrorResponse.message) error.message = parsedErrorResponse.message;
+        }
+        if (parsedErrorResponse !== null && parsedErrorResponse !== undefined) {
+          var resultMapper = new client.models['ErrorModel']().mapper();
+          error.body = client.deserialize(resultMapper, parsedErrorResponse, 'error.body');
+        }
+      } catch (defaultError) {
+        error.message = util.format('Error "%s" occurred in deserializing the responseBody ' + 
+                         '- "%s" for the default response.', defaultError.message, responseBody);
+        return callback(error);
+      }
+      return callback(error);
+    }
+    // Create Result
+    var result = null;
+    if (responseBody === '') responseBody = null;
+    // Deserialize Response
+    if (statusCode === 200) {
+      var parsedResponse = null;
+      try {
+        parsedResponse = JSON.parse(responseBody);
+        result = JSON.parse(responseBody);
+        if (parsedResponse !== null && parsedResponse !== undefined) {
+          var resultMapper = {
+            required: false,
+            serializedName: 'parsedResponse',
+            type: {
+              name: 'UnixTime'
+            }
+          };
+          result = client.deserialize(resultMapper, parsedResponse, 'result');
+        }
+      } catch (error) {
+        var deserializationError = new Error(util.format('Error "%s" occurred in deserializing the responseBody - "%s"', error, responseBody));
+        deserializationError.request = msRest.stripRequest(httpRequest);
+        deserializationError.response = msRest.stripResponse(response);
+        return callback(deserializationError);
+      }
+    }
+
+    return callback(null, result, httpRequest, response);
+  });
+};
+
+/**
+ * Put datetime encoded as Unix time
+ *
+ * @param {date} intBody
+ * 
+ * @param {object} [options] Optional Parameters.
+ * 
+ * @param {object} [options.customHeaders] Headers that will be added to the
+ * request
+ * 
+ * @param {function} callback
+ *
+ * @returns {function} callback(err, result, request, response)
+ *
+ *                      {Error}  err        - The Error object if an error occurred, null otherwise.
+ *
+ *                      {null} [result]   - The deserialized result object.
+ *
+ *                      {object} [request]  - The HTTP Request object if an error did not occur.
+ *
+ *                      {stream} [response] - The HTTP Response stream if an error did not occur.
+ */
+IntModel.prototype.putUnixTimeDate = function (intBody, options, callback) {
+  var client = this.client;
+  if(!callback && typeof options === 'function') {
+    callback = options;
+    options = null;
+  }
+  if (!callback) {
+    throw new Error('callback cannot be null.');
+  }
+  // Validate
+  try {
+    if(!intBody || !(intBody instanceof Date || 
+        (typeof intBody.valueOf() === 'string' && !isNaN(Date.parse(intBody))))) {
+          throw new Error('intBody cannot be null or undefined and it must be of type date.');
+        }
+  } catch (error) {
+    return callback(error);
+  }
+
+  // Construct URL
+  var requestUrl = this.client.baseUri +
+                   '//int/unixtime';
+  // trim all duplicate forward slashes in the url
+  var regex = /([^:]\/)\/+/gi;
+  requestUrl = requestUrl.replace(regex, '$1');
+
+  // Create HTTP transport objects
+  var httpRequest = new WebResource();
+  httpRequest.method = 'PUT';
+  httpRequest.headers = {};
+  httpRequest.url = requestUrl;
+  // Set Headers
+  if(options) {
+    for(var headerName in options['customHeaders']) {
+      if (options['customHeaders'].hasOwnProperty(headerName)) {
+        httpRequest.headers[headerName] = options['customHeaders'][headerName];
+      }
+    }
+  }
+  httpRequest.headers['Content-Type'] = 'application/json; charset=utf-8';
+  // Serialize Request
+  var requestContent = null;
+  var requestModel = null;
+  try {
+    if (intBody !== null && intBody !== undefined) {
+      var requestModelMapper = {
+        required: true,
+        serializedName: 'intBody',
+        type: {
+          name: 'UnixTime'
+        }
+      };
+      requestModel = client.serialize(requestModelMapper, intBody, 'intBody');
+      requestContent = JSON.stringify(requestModel);
+    }
+  } catch (error) {
+    var serializationError = new Error(util.format('Error "%s" occurred in serializing the ' + 
+        'payload - "%s"', error.message, util.inspect(intBody, {depth: null})));
+    return callback(serializationError);
+  }
+  httpRequest.body = requestContent;
+  // Send Request
+  return client.pipeline(httpRequest, function (err, response, responseBody) {
+    if (err) {
+      return callback(err);
+    }
+    var statusCode = response.statusCode;
+    if (statusCode !== 200) {
+      var error = new Error(responseBody);
+      error.statusCode = response.statusCode;
+      error.request = msRest.stripRequest(httpRequest);
+      error.response = msRest.stripResponse(response);
+      if (responseBody === '') responseBody = null;
+      var parsedErrorResponse;
+      try {
+        parsedErrorResponse = JSON.parse(responseBody);
+        if (parsedErrorResponse) {
+          if (parsedErrorResponse.error) parsedErrorResponse = parsedErrorResponse.error;
+          if (parsedErrorResponse.code) error.code = parsedErrorResponse.code;
+          if (parsedErrorResponse.message) error.message = parsedErrorResponse.message;
+        }
+        if (parsedErrorResponse !== null && parsedErrorResponse !== undefined) {
+          var resultMapper = new client.models['ErrorModel']().mapper();
+          error.body = client.deserialize(resultMapper, parsedErrorResponse, 'error.body');
+        }
+      } catch (defaultError) {
+        error.message = util.format('Error "%s" occurred in deserializing the responseBody ' + 
+                         '- "%s" for the default response.', defaultError.message, responseBody);
+        return callback(error);
+      }
+      return callback(error);
+    }
+    // Create Result
+    var result = null;
+    if (responseBody === '') responseBody = null;
+
+    return callback(null, result, httpRequest, response);
+  });
+};
+
+/**
+ * Get invalid Unix time value
+ *
+ * @param {object} [options] Optional Parameters.
+ * 
+ * @param {object} [options.customHeaders] Headers that will be added to the
+ * request
+ * 
+ * @param {function} callback
+ *
+ * @returns {function} callback(err, result, request, response)
+ *
+ *                      {Error}  err        - The Error object if an error occurred, null otherwise.
+ *
+ *                      {date} [result]   - The deserialized result object.
+ *
+ *                      {object} [request]  - The HTTP Request object if an error did not occur.
+ *
+ *                      {stream} [response] - The HTTP Response stream if an error did not occur.
+ */
+IntModel.prototype.getInvalidUnixTime = function (options, callback) {
+  var client = this.client;
+  if(!callback && typeof options === 'function') {
+    callback = options;
+    options = null;
+  }
+  if (!callback) {
+    throw new Error('callback cannot be null.');
+  }
+
+  // Construct URL
+  var requestUrl = this.client.baseUri +
+                   '//int/invalidunixtime';
+  // trim all duplicate forward slashes in the url
+  var regex = /([^:]\/)\/+/gi;
+  requestUrl = requestUrl.replace(regex, '$1');
+
+  // Create HTTP transport objects
+  var httpRequest = new WebResource();
+  httpRequest.method = 'GET';
+  httpRequest.headers = {};
+  httpRequest.url = requestUrl;
+  // Set Headers
+  if(options) {
+    for(var headerName in options['customHeaders']) {
+      if (options['customHeaders'].hasOwnProperty(headerName)) {
+        httpRequest.headers[headerName] = options['customHeaders'][headerName];
+      }
+    }
+  }
+  httpRequest.headers['Content-Type'] = 'application/json; charset=utf-8';
+  httpRequest.body = null;
+  // Send Request
+  return client.pipeline(httpRequest, function (err, response, responseBody) {
+    if (err) {
+      return callback(err);
+    }
+    var statusCode = response.statusCode;
+    if (statusCode !== 200) {
+      var error = new Error(responseBody);
+      error.statusCode = response.statusCode;
+      error.request = msRest.stripRequest(httpRequest);
+      error.response = msRest.stripResponse(response);
+      if (responseBody === '') responseBody = null;
+      var parsedErrorResponse;
+      try {
+        parsedErrorResponse = JSON.parse(responseBody);
+        if (parsedErrorResponse) {
+          if (parsedErrorResponse.error) parsedErrorResponse = parsedErrorResponse.error;
+          if (parsedErrorResponse.code) error.code = parsedErrorResponse.code;
+          if (parsedErrorResponse.message) error.message = parsedErrorResponse.message;
+        }
+        if (parsedErrorResponse !== null && parsedErrorResponse !== undefined) {
+          var resultMapper = new client.models['ErrorModel']().mapper();
+          error.body = client.deserialize(resultMapper, parsedErrorResponse, 'error.body');
+        }
+      } catch (defaultError) {
+        error.message = util.format('Error "%s" occurred in deserializing the responseBody ' + 
+                         '- "%s" for the default response.', defaultError.message, responseBody);
+        return callback(error);
+      }
+      return callback(error);
+    }
+    // Create Result
+    var result = null;
+    if (responseBody === '') responseBody = null;
+    // Deserialize Response
+    if (statusCode === 200) {
+      var parsedResponse = null;
+      try {
+        parsedResponse = JSON.parse(responseBody);
+        result = JSON.parse(responseBody);
+        if (parsedResponse !== null && parsedResponse !== undefined) {
+          var resultMapper = {
+            required: false,
+            serializedName: 'parsedResponse',
+            type: {
+              name: 'UnixTime'
+            }
+          };
+          result = client.deserialize(resultMapper, parsedResponse, 'result');
+        }
+      } catch (error) {
+        var deserializationError = new Error(util.format('Error "%s" occurred in deserializing the responseBody - "%s"', error, responseBody));
+        deserializationError.request = msRest.stripRequest(httpRequest);
+        deserializationError.response = msRest.stripResponse(response);
+        return callback(deserializationError);
+      }
+    }
+
+    return callback(null, result, httpRequest, response);
+  });
+};
+
+/**
+ * Get null Unix time value
+ *
+ * @param {object} [options] Optional Parameters.
+ * 
+ * @param {object} [options.customHeaders] Headers that will be added to the
+ * request
+ * 
+ * @param {function} callback
+ *
+ * @returns {function} callback(err, result, request, response)
+ *
+ *                      {Error}  err        - The Error object if an error occurred, null otherwise.
+ *
+ *                      {date} [result]   - The deserialized result object.
+ *
+ *                      {object} [request]  - The HTTP Request object if an error did not occur.
+ *
+ *                      {stream} [response] - The HTTP Response stream if an error did not occur.
+ */
+IntModel.prototype.getNullUnixTime = function (options, callback) {
+  var client = this.client;
+  if(!callback && typeof options === 'function') {
+    callback = options;
+    options = null;
+  }
+  if (!callback) {
+    throw new Error('callback cannot be null.');
+  }
+
+  // Construct URL
+  var requestUrl = this.client.baseUri +
+                   '//int/nullunixtime';
+  // trim all duplicate forward slashes in the url
+  var regex = /([^:]\/)\/+/gi;
+  requestUrl = requestUrl.replace(regex, '$1');
+
+  // Create HTTP transport objects
+  var httpRequest = new WebResource();
+  httpRequest.method = 'GET';
+  httpRequest.headers = {};
+  httpRequest.url = requestUrl;
+  // Set Headers
+  if(options) {
+    for(var headerName in options['customHeaders']) {
+      if (options['customHeaders'].hasOwnProperty(headerName)) {
+        httpRequest.headers[headerName] = options['customHeaders'][headerName];
+      }
+    }
+  }
+  httpRequest.headers['Content-Type'] = 'application/json; charset=utf-8';
+  httpRequest.body = null;
+  // Send Request
+  return client.pipeline(httpRequest, function (err, response, responseBody) {
+    if (err) {
+      return callback(err);
+    }
+    var statusCode = response.statusCode;
+    if (statusCode !== 200) {
+      var error = new Error(responseBody);
+      error.statusCode = response.statusCode;
+      error.request = msRest.stripRequest(httpRequest);
+      error.response = msRest.stripResponse(response);
+      if (responseBody === '') responseBody = null;
+      var parsedErrorResponse;
+      try {
+        parsedErrorResponse = JSON.parse(responseBody);
+        if (parsedErrorResponse) {
+          if (parsedErrorResponse.error) parsedErrorResponse = parsedErrorResponse.error;
+          if (parsedErrorResponse.code) error.code = parsedErrorResponse.code;
+          if (parsedErrorResponse.message) error.message = parsedErrorResponse.message;
+        }
+        if (parsedErrorResponse !== null && parsedErrorResponse !== undefined) {
+          var resultMapper = new client.models['ErrorModel']().mapper();
+          error.body = client.deserialize(resultMapper, parsedErrorResponse, 'error.body');
+        }
+      } catch (defaultError) {
+        error.message = util.format('Error "%s" occurred in deserializing the responseBody ' + 
+                         '- "%s" for the default response.', defaultError.message, responseBody);
+        return callback(error);
+      }
+      return callback(error);
+    }
+    // Create Result
+    var result = null;
+    if (responseBody === '') responseBody = null;
+    // Deserialize Response
+    if (statusCode === 200) {
+      var parsedResponse = null;
+      try {
+        parsedResponse = JSON.parse(responseBody);
+        result = JSON.parse(responseBody);
+        if (parsedResponse !== null && parsedResponse !== undefined) {
+          var resultMapper = {
+            required: false,
+            serializedName: 'parsedResponse',
+            type: {
+              name: 'UnixTime'
+            }
+          };
+          result = client.deserialize(resultMapper, parsedResponse, 'result');
+        }
+      } catch (error) {
+        var deserializationError = new Error(util.format('Error "%s" occurred in deserializing the responseBody - "%s"', error, responseBody));
+        deserializationError.request = msRest.stripRequest(httpRequest);
+        deserializationError.response = msRest.stripResponse(response);
+        return callback(deserializationError);
+      }
+    }
+
+    return callback(null, result, httpRequest, response);
+  });
+};
+
 
 module.exports = IntModel;
diff --git a/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/autoRestParameterizedCustomHostTestClient.d.ts b/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/autoRestParameterizedCustomHostTestClient.d.ts
new file mode 100644
index 0000000000000..98c22ab85f4de
--- /dev/null
+++ b/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/autoRestParameterizedCustomHostTestClient.d.ts
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ * 
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+ */
+
+import { ServiceClientOptions, RequestOptions, ServiceCallback } from 'ms-rest';
+import * as operations from "./operations";
+
+declare class AutoRestParameterizedCustomHostTestClient {
+    /**
+     * @class
+     * Initializes a new instance of the AutoRestParameterizedCustomHostTestClient class.
+     * @constructor
+     *
+     * @param {string} subscriptionId - The subscription id with value 'test12'.
+     *
+     * @param {object} [options] - The parameter options
+     *
+     * @param {Array} [options.filters] - Filters to be added to the request pipeline
+     *
+     * @param {object} [options.requestOptions] - Options for the underlying request object
+     * {@link https://github.com/request/request#requestoptions-callback Options doc}
+     *
+     * @param {boolean} [options.noRetryPolicy] - If set to true, turn off default retry policy
+     *
+     * @param {string} [options.dnsSuffix] - A string value that is used as a global part of the parameterized host. Default value 'host'.
+     *
+     */
+    constructor(subscriptionId: string, options: ServiceClientOptions);
+
+    subscriptionId: string;
+
+    dnsSuffix: string;
+
+    // Operation groups
+    paths: operations.Paths;
+    }
+
+export = AutoRestParameterizedCustomHostTestClient;
diff --git a/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/autoRestParameterizedCustomHostTestClient.js b/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/autoRestParameterizedCustomHostTestClient.js
new file mode 100644
index 0000000000000..391f7b50deb38
--- /dev/null
+++ b/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/autoRestParameterizedCustomHostTestClient.js
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ * 
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+ */
+
+/* jshint latedef:false */
+/* jshint forin:false */
+/* jshint noempty:false */
+
+'use strict';
+
+var util = require('util');
+var msRest = require('ms-rest');
+var ServiceClient = msRest.ServiceClient;
+
+var models = require('./models');
+var operations = require('./operations');
+
+/**
+ * @class
+ * Initializes a new instance of the AutoRestParameterizedCustomHostTestClient class.
+ * @constructor
+ *
+ * @param {string} subscriptionId - The subscription id with value 'test12'.
+ *
+ * @param {object} [options] - The parameter options
+ *
+ * @param {Array} [options.filters] - Filters to be added to the request pipeline
+ *
+ * @param {object} [options.requestOptions] - Options for the underlying request object
+ * {@link https://github.com/request/request#requestoptions-callback Options doc}
+ *
+ * @param {boolean} [options.noRetryPolicy] - If set to true, turn off default retry policy
+ *
+ * @param {string} [options.dnsSuffix] - A string value that is used as a global part of the parameterized host. Default value 'host'.
+ *
+ */
+function AutoRestParameterizedCustomHostTestClient(subscriptionId, options) {
+  this.dnsSuffix = 'host';
+  if (subscriptionId === null || subscriptionId === undefined) {
+    throw new Error('\'subscriptionId\' cannot be null.');
+  }
+
+  if (!options) options = {};
+
+  AutoRestParameterizedCustomHostTestClient['super_'].call(this, null, options);
+  this.baseUri = '{vault}{secret}{dnsSuffix}';
+  this.subscriptionId = subscriptionId;
+
+  if(options.dnsSuffix !== null && options.dnsSuffix !== undefined) { 
+    this.dnsSuffix = options.dnsSuffix;
+  }
+  this.paths = new operations.Paths(this);
+  this.models = models;
+  msRest.addSerializationMixin(this);
+}
+
+util.inherits(AutoRestParameterizedCustomHostTestClient, ServiceClient);
+
+module.exports = AutoRestParameterizedCustomHostTestClient;
diff --git a/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/models/errorModel.js b/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/models/errorModel.js
new file mode 100644
index 0000000000000..663be0f4aaa8c
--- /dev/null
+++ b/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/models/errorModel.js
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ * 
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+ */
+
+'use strict';
+
+/**
+ * @class
+ * Initializes a new instance of the ErrorModel class.
+ * @constructor
+ * @member {number} [status]
+ * 
+ * @member {string} [message]
+ * 
+ */
+function ErrorModel() {
+}
+
+/**
+ * Defines the metadata of ErrorModel
+ *
+ * @returns {object} metadata of ErrorModel
+ *
+ */
+ErrorModel.prototype.mapper = function () {
+  return {
+    required: false,
+    serializedName: 'Error',
+    type: {
+      name: 'Composite',
+      className: 'ErrorModel',
+      modelProperties: {
+        status: {
+          required: false,
+          serializedName: 'status',
+          type: {
+            name: 'Number'
+          }
+        },
+        message: {
+          required: false,
+          serializedName: 'message',
+          type: {
+            name: 'String'
+          }
+        }
+      }
+    }
+  };
+};
+
+module.exports = ErrorModel;
diff --git a/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/models/index.d.ts b/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/models/index.d.ts
new file mode 100644
index 0000000000000..5405a199a0755
--- /dev/null
+++ b/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/models/index.d.ts
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ * 
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+ */
+
+
+/**
+ * @class
+ * Initializes a new instance of the ErrorModel class.
+ * @constructor
+ * @member {number} [status]
+ * 
+ * @member {string} [message]
+ * 
+ */
+export interface ErrorModel {
+    status?: number;
+    message?: string;
+}
diff --git a/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/models/index.js b/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/models/index.js
new file mode 100644
index 0000000000000..3430295d8bd86
--- /dev/null
+++ b/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/models/index.js
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ * 
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+ */
+
+/* jshint latedef:false */
+/* jshint forin:false */
+/* jshint noempty:false */
+
+'use strict';
+
+exports.ErrorModel = require('./errorModel');
diff --git a/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/operations/index.d.ts b/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/operations/index.d.ts
new file mode 100644
index 0000000000000..3fa4ea5d9bf14
--- /dev/null
+++ b/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/operations/index.d.ts
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ * 
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+*/
+
+import { ServiceClientOptions, RequestOptions, ServiceCallback } from 'ms-rest';
+import * as models from '../models';
+
+
+/**
+ * @class
+ * Paths
+ * __NOTE__: An instance of this class is automatically created for an
+ * instance of the AutoRestParameterizedCustomHostTestClient.
+ */
+export interface Paths {
+
+    /**
+     * Get a 200 to test a valid base uri
+     *
+     * @param {string} vault The vault name, e.g. https://myvault
+     * 
+     * @param {string} secret Secret value.
+     * 
+     * @param {string} keyName The key name with value 'key1'.
+     * 
+     * @param {object} [options] Optional Parameters.
+     * 
+     * @param {string} [options.keyVersion] The key version. Default value 'v1'.
+     * 
+     * @param {object} [options.customHeaders] Headers that will be added to the
+     * request
+     * 
+     * @param {ServiceCallback} [callback] callback function; see ServiceCallback
+     * doc in ms-rest index.d.ts for details
+     */
+    getEmpty(vault: string, secret: string, keyName: string, options: { keyVersion? : string, customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<void>): void;
+    getEmpty(vault: string, secret: string, keyName: string, callback: ServiceCallback<void>): void;
+}
diff --git a/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/operations/index.js b/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/operations/index.js
new file mode 100644
index 0000000000000..412d88e67668a
--- /dev/null
+++ b/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/operations/index.js
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ * 
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+ */
+
+/* jshint latedef:false */
+/* jshint forin:false */
+/* jshint noempty:false */
+
+'use strict';
+
+exports.Paths = require('./paths');
diff --git a/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/operations/paths.js b/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/operations/paths.js
new file mode 100644
index 0000000000000..dc2c66f05c60e
--- /dev/null
+++ b/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/operations/paths.js
@@ -0,0 +1,167 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ * 
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+ */
+
+'use strict';
+
+var util = require('util');
+var msRest = require('ms-rest');
+var WebResource = msRest.WebResource;
+
+/**
+ * @class
+ * Paths
+ * __NOTE__: An instance of this class is automatically created for an
+ * instance of the AutoRestParameterizedCustomHostTestClient.
+ * Initializes a new instance of the Paths class.
+ * @constructor
+ *
+ * @param {AutoRestParameterizedCustomHostTestClient} client Reference to the service client.
+ */
+function Paths(client) {
+  this.client = client;
+}
+
+/**
+ * Get a 200 to test a valid base uri
+ *
+ * @param {string} vault The vault name, e.g. https://myvault
+ * 
+ * @param {string} secret Secret value.
+ * 
+ * @param {string} keyName The key name with value 'key1'.
+ * 
+ * @param {object} [options] Optional Parameters.
+ * 
+ * @param {string} [options.keyVersion] The key version. Default value 'v1'.
+ * 
+ * @param {object} [options.customHeaders] Headers that will be added to the
+ * request
+ * 
+ * @param {function} callback
+ *
+ * @returns {function} callback(err, result, request, response)
+ *
+ *                      {Error}  err        - The Error object if an error occurred, null otherwise.
+ *
+ *                      {null} [result]   - The deserialized result object.
+ *
+ *                      {object} [request]  - The HTTP Request object if an error did not occur.
+ *
+ *                      {stream} [response] - The HTTP Response stream if an error did not occur.
+ */
+Paths.prototype.getEmpty = function (vault, secret, keyName, options, callback) {
+  var client = this.client;
+  if(!callback && typeof options === 'function') {
+    callback = options;
+    options = null;
+  }
+  if (!callback) {
+    throw new Error('callback cannot be null.');
+  }
+  var keyVersion = (options && options.keyVersion !== undefined) ? options.keyVersion : 'v1';
+  // Validate
+  try {
+    if (vault === null || vault === undefined || typeof vault.valueOf() !== 'string') {
+      throw new Error('vault cannot be null or undefined and it must be of type string.');
+    }
+    if (secret === null || secret === undefined || typeof secret.valueOf() !== 'string') {
+      throw new Error('secret cannot be null or undefined and it must be of type string.');
+    }
+    if (this.client.dnsSuffix === null || this.client.dnsSuffix === undefined || typeof this.client.dnsSuffix.valueOf() !== 'string') {
+      throw new Error('this.client.dnsSuffix cannot be null or undefined and it must be of type string.');
+    }
+    if (keyName === null || keyName === undefined || typeof keyName.valueOf() !== 'string') {
+      throw new Error('keyName cannot be null or undefined and it must be of type string.');
+    }
+    if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') {
+      throw new Error('this.client.subscriptionId cannot be null or undefined and it must be of type string.');
+    }
+    if (keyVersion !== null && keyVersion !== undefined && typeof keyVersion.valueOf() !== 'string') {
+      throw new Error('keyVersion must be of type string.');
+    }
+  } catch (error) {
+    return callback(error);
+  }
+
+  // Construct URL
+  var requestUrl = this.client.baseUri +
+                   '//customuri/{subscriptionId}/{keyName}';
+  requestUrl = requestUrl.replace('{vault}', vault);
+  requestUrl = requestUrl.replace('{secret}', secret);
+  requestUrl = requestUrl.replace('{dnsSuffix}', this.client.dnsSuffix);
+  requestUrl = requestUrl.replace('{keyName}', encodeURIComponent(keyName));
+  requestUrl = requestUrl.replace('{subscriptionId}', encodeURIComponent(this.client.subscriptionId));
+  var queryParameters = [];
+  if (keyVersion !== null && keyVersion !== undefined) {
+    queryParameters.push('keyVersion=' + encodeURIComponent(keyVersion));
+  }
+  if (queryParameters.length > 0) {
+    requestUrl += '?' + queryParameters.join('&');
+  }
+  // trim all duplicate forward slashes in the url
+  var regex = /([^:]\/)\/+/gi;
+  requestUrl = requestUrl.replace(regex, '$1');
+
+  // Create HTTP transport objects
+  var httpRequest = new WebResource();
+  httpRequest.method = 'GET';
+  httpRequest.headers = {};
+  httpRequest.url = requestUrl;
+  // Set Headers
+  if(options) {
+    for(var headerName in options['customHeaders']) {
+      if (options['customHeaders'].hasOwnProperty(headerName)) {
+        httpRequest.headers[headerName] = options['customHeaders'][headerName];
+      }
+    }
+  }
+  httpRequest.headers['Content-Type'] = 'application/json; charset=utf-8';
+  httpRequest.body = null;
+  // Send Request
+  return client.pipeline(httpRequest, function (err, response, responseBody) {
+    if (err) {
+      return callback(err);
+    }
+    var statusCode = response.statusCode;
+    if (statusCode !== 200) {
+      var error = new Error(responseBody);
+      error.statusCode = response.statusCode;
+      error.request = msRest.stripRequest(httpRequest);
+      error.response = msRest.stripResponse(response);
+      if (responseBody === '') responseBody = null;
+      var parsedErrorResponse;
+      try {
+        parsedErrorResponse = JSON.parse(responseBody);
+        if (parsedErrorResponse) {
+          if (parsedErrorResponse.error) parsedErrorResponse = parsedErrorResponse.error;
+          if (parsedErrorResponse.code) error.code = parsedErrorResponse.code;
+          if (parsedErrorResponse.message) error.message = parsedErrorResponse.message;
+        }
+        if (parsedErrorResponse !== null && parsedErrorResponse !== undefined) {
+          var resultMapper = new client.models['ErrorModel']().mapper();
+          error.body = client.deserialize(resultMapper, parsedErrorResponse, 'error.body');
+        }
+      } catch (defaultError) {
+        error.message = util.format('Error "%s" occurred in deserializing the responseBody ' + 
+                         '- "%s" for the default response.', defaultError.message, responseBody);
+        return callback(error);
+      }
+      return callback(error);
+    }
+    // Create Result
+    var result = null;
+    if (responseBody === '') responseBody = null;
+
+    return callback(null, result, httpRequest, response);
+  });
+};
+
+
+module.exports = Paths;
diff --git a/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/ModelFlattening/models/simpleProduct.js b/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/ModelFlattening/models/simpleProduct.js
index 3e66a747ff5a0..cca28edbd8eda 100644
--- a/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/ModelFlattening/models/simpleProduct.js
+++ b/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/ModelFlattening/models/simpleProduct.js
@@ -42,7 +42,6 @@ SimpleProduct.prototype.mapper = function () {
   return {
     required: false,
     serializedName: 'SimpleProduct',
-    defaultValue: {},
     type: {
       name: 'Composite',
       className: 'SimpleProduct',
diff --git a/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/Url/operations/index.d.ts b/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/Url/operations/index.d.ts
index 3d9f5f55e7f91..36fd5ba34f312 100644
--- a/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/Url/operations/index.d.ts
+++ b/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/Url/operations/index.d.ts
@@ -394,6 +394,22 @@ export interface Paths {
      */
     arrayCsvInPath(arrayPath: string[], options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<void>): void;
     arrayCsvInPath(arrayPath: string[], callback: ServiceCallback<void>): void;
+
+    /**
+     * Get the date 2016-04-13 encoded value as '1460505600' (Unix time)
+     *
+     * @param {date} unixTimeUrlPath Unix time encoded value
+     * 
+     * @param {object} [options] Optional Parameters.
+     * 
+     * @param {object} [options.customHeaders] Headers that will be added to the
+     * request
+     * 
+     * @param {ServiceCallback} [callback] callback function; see ServiceCallback
+     * doc in ms-rest index.d.ts for details
+     */
+    unixTimeUrl(unixTimeUrlPath: Date, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback<void>): void;
+    unixTimeUrl(unixTimeUrlPath: Date, callback: ServiceCallback<void>): void;
 }
 
 /**
diff --git a/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/Url/operations/paths.js b/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/Url/operations/paths.js
index ac14e44e195cb..2b5ff16d6bf66 100644
--- a/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/Url/operations/paths.js
+++ b/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/Url/operations/paths.js
@@ -2458,5 +2458,108 @@ Paths.prototype.arrayCsvInPath = function (arrayPath, options, callback) {
   });
 };
 
+/**
+ * Get the date 2016-04-13 encoded value as '1460505600' (Unix time)
+ *
+ * @param {date} unixTimeUrlPath Unix time encoded value
+ * 
+ * @param {object} [options] Optional Parameters.
+ * 
+ * @param {object} [options.customHeaders] Headers that will be added to the
+ * request
+ * 
+ * @param {function} callback
+ *
+ * @returns {function} callback(err, result, request, response)
+ *
+ *                      {Error}  err        - The Error object if an error occurred, null otherwise.
+ *
+ *                      {null} [result]   - The deserialized result object.
+ *
+ *                      {object} [request]  - The HTTP Request object if an error did not occur.
+ *
+ *                      {stream} [response] - The HTTP Response stream if an error did not occur.
+ */
+Paths.prototype.unixTimeUrl = function (unixTimeUrlPath, options, callback) {
+  var client = this.client;
+  if(!callback && typeof options === 'function') {
+    callback = options;
+    options = null;
+  }
+  if (!callback) {
+    throw new Error('callback cannot be null.');
+  }
+  // Validate
+  try {
+    if(!unixTimeUrlPath || !(unixTimeUrlPath instanceof Date || 
+        (typeof unixTimeUrlPath.valueOf() === 'string' && !isNaN(Date.parse(unixTimeUrlPath))))) {
+          throw new Error('unixTimeUrlPath cannot be null or undefined and it must be of type date.');
+        }
+  } catch (error) {
+    return callback(error);
+  }
+
+  // Construct URL
+  var requestUrl = this.client.baseUri +
+                   '//paths/int/1460505600/{unixTimeUrlPath}';
+  requestUrl = requestUrl.replace('{unixTimeUrlPath}', encodeURIComponent(client.serialize({required: true, serializedName: 'unixTimeUrlPath', type: {name: 'UnixTime'}}, unixTimeUrlPath, 'unixTimeUrlPath')));
+  // trim all duplicate forward slashes in the url
+  var regex = /([^:]\/)\/+/gi;
+  requestUrl = requestUrl.replace(regex, '$1');
+
+  // Create HTTP transport objects
+  var httpRequest = new WebResource();
+  httpRequest.method = 'GET';
+  httpRequest.headers = {};
+  httpRequest.url = requestUrl;
+  // Set Headers
+  if(options) {
+    for(var headerName in options['customHeaders']) {
+      if (options['customHeaders'].hasOwnProperty(headerName)) {
+        httpRequest.headers[headerName] = options['customHeaders'][headerName];
+      }
+    }
+  }
+  httpRequest.headers['Content-Type'] = 'application/json; charset=utf-8';
+  httpRequest.body = null;
+  // Send Request
+  return client.pipeline(httpRequest, function (err, response, responseBody) {
+    if (err) {
+      return callback(err);
+    }
+    var statusCode = response.statusCode;
+    if (statusCode !== 200) {
+      var error = new Error(responseBody);
+      error.statusCode = response.statusCode;
+      error.request = msRest.stripRequest(httpRequest);
+      error.response = msRest.stripResponse(response);
+      if (responseBody === '') responseBody = null;
+      var parsedErrorResponse;
+      try {
+        parsedErrorResponse = JSON.parse(responseBody);
+        if (parsedErrorResponse) {
+          if (parsedErrorResponse.error) parsedErrorResponse = parsedErrorResponse.error;
+          if (parsedErrorResponse.code) error.code = parsedErrorResponse.code;
+          if (parsedErrorResponse.message) error.message = parsedErrorResponse.message;
+        }
+        if (parsedErrorResponse !== null && parsedErrorResponse !== undefined) {
+          var resultMapper = new client.models['ErrorModel']().mapper();
+          error.body = client.deserialize(resultMapper, parsedErrorResponse, 'error.body');
+        }
+      } catch (defaultError) {
+        error.message = util.format('Error "%s" occurred in deserializing the responseBody ' + 
+                         '- "%s" for the default response.', defaultError.message, responseBody);
+        return callback(error);
+      }
+      return callback(error);
+    }
+    // Create Result
+    var result = null;
+    if (responseBody === '') responseBody = null;
+
+    return callback(null, result, httpRequest, response);
+  });
+};
+
 
 module.exports = Paths;
diff --git a/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/Validation/models/childProduct.js b/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/Validation/models/childProduct.js
index 212a2c646ec44..14cb8cf926118 100644
--- a/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/Validation/models/childProduct.js
+++ b/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/Validation/models/childProduct.js
@@ -31,7 +31,6 @@ ChildProduct.prototype.mapper = function () {
   return {
     required: false,
     serializedName: 'ChildProduct',
-    defaultValue: {},
     type: {
       name: 'Composite',
       className: 'ChildProduct',
diff --git a/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/Validation/models/constantProduct.js b/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/Validation/models/constantProduct.js
index e79e409278475..cd97a2c9285e5 100644
--- a/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/Validation/models/constantProduct.js
+++ b/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/Validation/models/constantProduct.js
@@ -29,7 +29,6 @@ ConstantProduct.prototype.mapper = function () {
   return {
     required: false,
     serializedName: 'ConstantProduct',
-    defaultValue: {},
     type: {
       name: 'Composite',
       className: 'ConstantProduct',
diff --git a/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/Validation/models/product.js b/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/Validation/models/product.js
index 6af3595ad51bb..ee09ede6f6cac 100644
--- a/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/Validation/models/product.js
+++ b/AutoRest/Generators/NodeJS/NodeJS.Tests/Expected/AcceptanceTests/Validation/models/product.js
@@ -47,7 +47,6 @@ Product.prototype.mapper = function () {
   return {
     required: false,
     serializedName: 'Product',
-    defaultValue: {},
     type: {
       name: 'Composite',
       className: 'Product',
diff --git a/AutoRest/Generators/NodeJS/NodeJS/ClientModelExtensions.cs b/AutoRest/Generators/NodeJS/NodeJS/ClientModelExtensions.cs
index c842b28b3280b..ba3a24c17bf8f 100644
--- a/AutoRest/Generators/NodeJS/NodeJS/ClientModelExtensions.cs
+++ b/AutoRest/Generators/NodeJS/NodeJS/ClientModelExtensions.cs
@@ -131,6 +131,12 @@ public static string ToString(this IType type, string reference)
                     return string.Format(CultureInfo.InvariantCulture,
                         "client.serialize({{required: true, serializedName: '{0}', type: {{name: 'Base64Url'}}}}, {0}, '{0}')", reference);
                 }
+
+                if (known.Type == KnownPrimaryType.UnixTime)
+                {
+                    return string.Format(CultureInfo.InvariantCulture,
+                        "client.serialize({{required: true, serializedName: '{0}', type: {{name: 'UnixTime'}}}}, {0}, '{0}')", reference);
+                }
             }
 
             return string.Format(CultureInfo.InvariantCulture, "{0}.toString()", reference);
@@ -253,7 +259,8 @@ private static string ValidatePrimaryType(this PrimaryType primary, IScopeProvid
                 builder.AppendLine("if ({0} && !Buffer.isBuffer({0})) {{", valueReference, lowercaseTypeName);
                 return ConstructValidationCheck(builder, typeErrorMessage, valueReference, primary.Name).ToString();
             }
-            else if (primary.Type == KnownPrimaryType.DateTime || primary.Type == KnownPrimaryType.Date || primary.Type == KnownPrimaryType.DateTimeRfc1123)
+            else if (primary.Type == KnownPrimaryType.DateTime || primary.Type == KnownPrimaryType.Date || 
+                primary.Type == KnownPrimaryType.DateTimeRfc1123 || primary.Type == KnownPrimaryType.UnixTime)
             {
                 if (isRequired)
                 {
@@ -302,11 +309,13 @@ private static string PrimaryTSType(this PrimaryType primary)
 
             if (primary.Type == KnownPrimaryType.Boolean)
                 return "boolean";
-            else if (primary.Type == KnownPrimaryType.Double || primary.Type == KnownPrimaryType.Decimal || primary.Type == KnownPrimaryType.Int || primary.Type == KnownPrimaryType.Long)
+            else if (primary.Type == KnownPrimaryType.Double || primary.Type == KnownPrimaryType.Decimal || 
+                primary.Type == KnownPrimaryType.Int || primary.Type == KnownPrimaryType.Long)
                 return "number";
             else if (primary.Type == KnownPrimaryType.String || primary.Type == KnownPrimaryType.Uuid)
                 return "string";
-            else if (primary.Type == KnownPrimaryType.Date || primary.Type == KnownPrimaryType.DateTime || primary.Type == KnownPrimaryType.DateTimeRfc1123)
+            else if (primary.Type == KnownPrimaryType.Date || primary.Type == KnownPrimaryType.DateTime || 
+                primary.Type == KnownPrimaryType.DateTimeRfc1123 || primary.Type == KnownPrimaryType.UnixTime)
                 return "Date";
             else if (primary.Type == KnownPrimaryType.Object)
                 return "any";   // TODO: test this
@@ -666,9 +675,9 @@ public static string ValidateType(this IType type, IScopeProvider scope, string
         public static string ConstructMapper(this IType type, string serializedName, IParameter parameter, bool isPageable, bool expandComposite)
         {
             var builder = new IndentedStringBuilder("  ");
-			string defaultValue = null;
-			bool isRequired = false;
-			bool isConstant = false;
+            string defaultValue = null;
+            bool isRequired = false;
+            bool isConstant = false;
             bool isReadOnly = false;
             Dictionary<Constraint, string> constraints = null;
             var property = parameter as Property;
@@ -684,7 +693,7 @@ public static string ConstructMapper(this IType type, string serializedName, IPa
                 isReadOnly = property.IsReadOnly;
             }
             CompositeType composite = type as CompositeType;
-            if (composite != null && composite.ContainsConstantProperties)
+            if (composite != null && composite.ContainsConstantProperties && (parameter != null && parameter.IsRequired))
             {
                 defaultValue = "{}";
             }
@@ -746,7 +755,8 @@ public static string ConstructMapper(this IType type, string serializedName, IPa
                 {
                     builder.AppendLine("type: {").Indent().AppendLine("name: 'Boolean'").Outdent().AppendLine("}");
                 }
-                else if(primary.Type == KnownPrimaryType.Int || primary.Type == KnownPrimaryType.Long || primary.Type == KnownPrimaryType.Decimal || primary.Type == KnownPrimaryType.Double)
+                else if (primary.Type == KnownPrimaryType.Int || primary.Type == KnownPrimaryType.Long ||
+                    primary.Type == KnownPrimaryType.Decimal || primary.Type == KnownPrimaryType.Double)
                 {
                     builder.AppendLine("type: {").Indent().AppendLine("name: 'Number'").Outdent().AppendLine("}");
                 }
@@ -782,6 +792,10 @@ public static string ConstructMapper(this IType type, string serializedName, IPa
                 {
                     builder.AppendLine("type: {").Indent().AppendLine("name: 'TimeSpan'").Outdent().AppendLine("}");
                 }
+                else if (primary.Type == KnownPrimaryType.UnixTime)
+                {
+                    builder.AppendLine("type: {").Indent().AppendLine("name: 'UnixTime'").Outdent().AppendLine("}");
+                }
                 else if (primary.Type == KnownPrimaryType.Object)
                 {
                     builder.AppendLine("type: {").Indent().AppendLine("name: 'Object'").Outdent().AppendLine("}");
diff --git a/AutoRest/Generators/NodeJS/NodeJS/GlobalSuppressions.cs b/AutoRest/Generators/NodeJS/NodeJS/GlobalSuppressions.cs
index dd0050ebae502..9fecaab118c8e 100644
--- a/AutoRest/Generators/NodeJS/NodeJS/GlobalSuppressions.cs
+++ b/AutoRest/Generators/NodeJS/NodeJS/GlobalSuppressions.cs
@@ -191,4 +191,7 @@
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity", Scope = "member", Target = "Microsoft.Rest.Generator.NodeJS.TemplateModels.ClientModelExtensions.#ConstructMapper(Microsoft.Rest.Generator.ClientModel.IType,System.String,Microsoft.Rest.Generator.ClientModel.IParameter,System.Boolean,System.Boolean)")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase", Scope = "member", Target = "Microsoft.Rest.Generator.NodeJS.NodeJsCodeNamer.#EscapeDefaultValue(System.String,Microsoft.Rest.Generator.ClientModel.IType)")]
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "readOnly", Scope = "member", Target = "Microsoft.Rest.Generator.NodeJS.TemplateModels.ClientModelExtensions.#ConstructMapper(Microsoft.Rest.Generator.ClientModel.IType,System.String,Microsoft.Rest.Generator.ClientModel.IParameter,System.Boolean,System.Boolean)")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity", Scope = "member", Target = "Microsoft.Rest.Generator.NodeJS.TemplateModels.ClientModelExtensions.#ValidatePrimaryType(Microsoft.Rest.Generator.ClientModel.PrimaryType,Microsoft.Rest.Generator.Utilities.IScopeProvider,System.String,System.Boolean)")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Maintainability", "CA1505:AvoidUnmaintainableCode", Scope = "member", Target = "Microsoft.Rest.Generator.NodeJS.TemplateModels.ClientModelExtensions.#ConstructMapper(Microsoft.Rest.Generator.ClientModel.IType,System.String,Microsoft.Rest.Generator.ClientModel.IParameter,System.Boolean,System.Boolean)")]
+[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "UnixTime", Scope = "member", Target = "Microsoft.Rest.Generator.NodeJS.TemplateModels.ClientModelExtensions.#ConstructMapper(Microsoft.Rest.Generator.ClientModel.IType,System.String,Microsoft.Rest.Generator.ClientModel.IParameter,System.Boolean,System.Boolean)")]
 
diff --git a/AutoRest/Generators/NodeJS/NodeJS/NodeJSCodeGenerator.cs b/AutoRest/Generators/NodeJS/NodeJS/NodeJSCodeGenerator.cs
index 04bacdaeb59b0..2e59314d876df 100644
--- a/AutoRest/Generators/NodeJS/NodeJS/NodeJSCodeGenerator.cs
+++ b/AutoRest/Generators/NodeJS/NodeJS/NodeJSCodeGenerator.cs
@@ -16,7 +16,7 @@ namespace Microsoft.Rest.Generator.NodeJS
 {
     public class NodeJSCodeGenerator : CodeGenerator
     {
-        private const string ClientRuntimePackage = "ms-rest version 1.12.0";
+        private const string ClientRuntimePackage = "ms-rest version 1.13.1";
 
         public NodeJsCodeNamer Namer { get; private set; }
 
diff --git a/AutoRest/Generators/NodeJS/NodeJS/NodeJsCodeNamer.cs b/AutoRest/Generators/NodeJS/NodeJS/NodeJsCodeNamer.cs
index 53ac858681ef1..2dc7c2f0edd6a 100644
--- a/AutoRest/Generators/NodeJS/NodeJS/NodeJsCodeNamer.cs
+++ b/AutoRest/Generators/NodeJS/NodeJS/NodeJsCodeNamer.cs
@@ -365,6 +365,10 @@ private static IType NormalizePrimaryType(PrimaryType primaryType)
             {
                 primaryType.Name = "Date";
             }
+            else if (primaryType.Type == KnownPrimaryType.UnixTime)
+            {
+                primaryType.Name = "Date";
+            }
             else if (primaryType.Type == KnownPrimaryType.Double)
             {
                 primaryType.Name = "Number";
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureBodyDuration/autorestdurationtestservice/auto_rest_duration_test_service.py b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureBodyDuration/autorestdurationtestservice/auto_rest_duration_test_service.py
index bceee986fdda8..668b135381e1f 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureBodyDuration/autorestdurationtestservice/auto_rest_duration_test_service.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureBodyDuration/autorestdurationtestservice/auto_rest_duration_test_service.py
@@ -43,7 +43,9 @@ def __init__(
             self, credentials, accept_language='en-US', long_running_operation_retry_timeout=30, generate_client_request_id=True, base_url=None, filepath=None):
 
         if credentials is None:
-            raise ValueError('credentials must not be None.')
+            raise ValueError("Parameter 'credentials' must not be None.")
+        if accept_language is not None and not isinstance(accept_language, str):
+            raise TypeError("Optional parameter 'accept_language' must be str.")
         if not base_url:
             base_url = 'https://localhost'
 
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureBodyDuration/setup.py b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureBodyDuration/setup.py
index 251a4cda74c35..97aa1ecfa3dd1 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureBodyDuration/setup.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureBodyDuration/setup.py
@@ -22,7 +22,7 @@
 # prerequisite: setuptools
 # http://pypi.python.org/pypi/setuptools
 
-REQUIRES = ["msrest>=0.2.0", "msrestazure>=0.2.1"]
+REQUIRES = ["msrest>=0.3.0", "msrestazure>=0.3.0"]
 
 setup(
     name=NAME,
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureParameterGrouping/autorestparametergroupingtestservice/auto_rest_parameter_grouping_test_service.py b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureParameterGrouping/autorestparametergroupingtestservice/auto_rest_parameter_grouping_test_service.py
index b8bae0b1b5228..13e63f9569c81 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureParameterGrouping/autorestparametergroupingtestservice/auto_rest_parameter_grouping_test_service.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureParameterGrouping/autorestparametergroupingtestservice/auto_rest_parameter_grouping_test_service.py
@@ -43,7 +43,9 @@ def __init__(
             self, credentials, accept_language='en-US', long_running_operation_retry_timeout=30, generate_client_request_id=True, base_url=None, filepath=None):
 
         if credentials is None:
-            raise ValueError('credentials must not be None.')
+            raise ValueError("Parameter 'credentials' must not be None.")
+        if accept_language is not None and not isinstance(accept_language, str):
+            raise TypeError("Optional parameter 'accept_language' must be str.")
         if not base_url:
             base_url = 'https://localhost'
 
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureParameterGrouping/autorestparametergroupingtestservice/models/first_parameter_group.py b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureParameterGrouping/autorestparametergroupingtestservice/models/first_parameter_group.py
index 0a3174e49ea52..172a4349ff36c 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureParameterGrouping/autorestparametergroupingtestservice/models/first_parameter_group.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureParameterGrouping/autorestparametergroupingtestservice/models/first_parameter_group.py
@@ -14,7 +14,9 @@
 
 class FirstParameterGroup(Model):
     """
-    Additional parameters for the postMultiParamGroups operation.
+    Additional parameters for a set of operations, such as:
+    parameterGrouping_postMultiParamGroups,
+    parameterGrouping_postSharedParameterGroupObject.
 
     :param header_one:
     :type header_one: str
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureParameterGrouping/autorestparametergroupingtestservice/models/parameter_grouping_post_multi_param_groups_second_param_group.py b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureParameterGrouping/autorestparametergroupingtestservice/models/parameter_grouping_post_multi_param_groups_second_param_group.py
index d178c7470903e..bccdfab25480f 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureParameterGrouping/autorestparametergroupingtestservice/models/parameter_grouping_post_multi_param_groups_second_param_group.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureParameterGrouping/autorestparametergroupingtestservice/models/parameter_grouping_post_multi_param_groups_second_param_group.py
@@ -14,7 +14,8 @@
 
 class ParameterGroupingPostMultiParamGroupsSecondParamGroup(Model):
     """
-    Additional parameters for the postMultiParamGroups operation.
+    Additional parameters for the parameterGrouping_postMultiParamGroups
+    operation.
 
     :param header_two:
     :type header_two: str
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureParameterGrouping/autorestparametergroupingtestservice/models/parameter_grouping_post_optional_parameters.py b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureParameterGrouping/autorestparametergroupingtestservice/models/parameter_grouping_post_optional_parameters.py
index 7368af7d84956..a62313adf9a27 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureParameterGrouping/autorestparametergroupingtestservice/models/parameter_grouping_post_optional_parameters.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureParameterGrouping/autorestparametergroupingtestservice/models/parameter_grouping_post_optional_parameters.py
@@ -14,7 +14,7 @@
 
 class ParameterGroupingPostOptionalParameters(Model):
     """
-    Additional parameters for the postOptional operation.
+    Additional parameters for the parameterGrouping_postOptional operation.
 
     :param custom_header:
     :type custom_header: str
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureParameterGrouping/autorestparametergroupingtestservice/models/parameter_grouping_post_required_parameters.py b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureParameterGrouping/autorestparametergroupingtestservice/models/parameter_grouping_post_required_parameters.py
index 33627d834bdad..409f4ffcdcf26 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureParameterGrouping/autorestparametergroupingtestservice/models/parameter_grouping_post_required_parameters.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureParameterGrouping/autorestparametergroupingtestservice/models/parameter_grouping_post_required_parameters.py
@@ -14,7 +14,7 @@
 
 class ParameterGroupingPostRequiredParameters(Model):
     """
-    Additional parameters for the postRequired operation.
+    Additional parameters for the parameterGrouping_postRequired operation.
 
     :param body:
     :type body: int
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureParameterGrouping/setup.py b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureParameterGrouping/setup.py
index 2e0910c9bcdeb..4e3dc67a4f96a 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureParameterGrouping/setup.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureParameterGrouping/setup.py
@@ -22,7 +22,7 @@
 # prerequisite: setuptools
 # http://pypi.python.org/pypi/setuptools
 
-REQUIRES = ["msrest>=0.2.0", "msrestazure>=0.2.1"]
+REQUIRES = ["msrest>=0.3.0", "msrestazure>=0.3.0"]
 
 setup(
     name=NAME,
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureReport/autorestreportserviceforazure/auto_rest_report_service_for_azure.py b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureReport/autorestreportserviceforazure/auto_rest_report_service_for_azure.py
index b37530e7d7985..c02088e43b1a4 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureReport/autorestreportserviceforazure/auto_rest_report_service_for_azure.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureReport/autorestreportserviceforazure/auto_rest_report_service_for_azure.py
@@ -44,7 +44,9 @@ def __init__(
             self, credentials, accept_language='en-US', long_running_operation_retry_timeout=30, generate_client_request_id=True, base_url=None, filepath=None):
 
         if credentials is None:
-            raise ValueError('credentials must not be None.')
+            raise ValueError("Parameter 'credentials' must not be None.")
+        if accept_language is not None and not isinstance(accept_language, str):
+            raise TypeError("Optional parameter 'accept_language' must be str.")
         if not base_url:
             base_url = 'http://localhost'
 
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureReport/setup.py b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureReport/setup.py
index 762429f51c290..fee4d2a41a3c6 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureReport/setup.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureReport/setup.py
@@ -22,7 +22,7 @@
 # prerequisite: setuptools
 # http://pypi.python.org/pypi/setuptools
 
-REQUIRES = ["msrest>=0.2.0", "msrestazure>=0.2.1"]
+REQUIRES = ["msrest>=0.3.0", "msrestazure>=0.3.0"]
 
 setup(
     name=NAME,
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureResource/autorestresourceflatteningtestservice/auto_rest_resource_flattening_test_service.py b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureResource/autorestresourceflatteningtestservice/auto_rest_resource_flattening_test_service.py
index 3a806d13f53fc..74f09db9d3400 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureResource/autorestresourceflatteningtestservice/auto_rest_resource_flattening_test_service.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureResource/autorestresourceflatteningtestservice/auto_rest_resource_flattening_test_service.py
@@ -44,7 +44,9 @@ def __init__(
             self, credentials, accept_language='en-US', long_running_operation_retry_timeout=30, generate_client_request_id=True, base_url=None, filepath=None):
 
         if credentials is None:
-            raise ValueError('credentials must not be None.')
+            raise ValueError("Parameter 'credentials' must not be None.")
+        if accept_language is not None and not isinstance(accept_language, str):
+            raise TypeError("Optional parameter 'accept_language' must be str.")
         if not base_url:
             base_url = 'http://localhost'
 
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureResource/autorestresourceflatteningtestservice/models/flattened_product.py b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureResource/autorestresourceflatteningtestservice/models/flattened_product.py
index 5b5b7ea2e4c04..37bf31568e6ae 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureResource/autorestresourceflatteningtestservice/models/flattened_product.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureResource/autorestresourceflatteningtestservice/models/flattened_product.py
@@ -15,16 +15,19 @@
 class FlattenedProduct(Resource):
     """FlattenedProduct
 
-    :param id: Resource Id
-    :type id: str
-    :param type: Resource Type
-    :type type: str
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Resource Id
+    :vartype id: str
+    :ivar type: Resource Type
+    :vartype type: str
     :param tags:
     :type tags: dict
     :param location: Resource Location
     :type location: str
-    :param name: Resource Name
-    :type name: str
+    :ivar name: Resource Name
+    :vartype name: str
     :param pname:
     :type pname: str
     :param lsize:
@@ -33,6 +36,12 @@ class FlattenedProduct(Resource):
     :type provisioning_state: str
     """ 
 
+    _validation = {
+        'id': {'readonly': True},
+        'type': {'readonly': True},
+        'name': {'readonly': True},
+    }
+
     _attribute_map = {
         'id': {'key': 'id', 'type': 'str'},
         'type': {'key': 'type', 'type': 'str'},
@@ -44,8 +53,8 @@ class FlattenedProduct(Resource):
         'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
     }
 
-    def __init__(self, id=None, type=None, tags=None, location=None, name=None, pname=None, lsize=None, provisioning_state=None):
-        super(FlattenedProduct, self).__init__(id=id, type=type, tags=tags, location=location, name=name)
+    def __init__(self, tags=None, location=None, pname=None, lsize=None, provisioning_state=None):
+        super(FlattenedProduct, self).__init__(tags=tags, location=location)
         self.pname = pname
         self.lsize = lsize
         self.provisioning_state = provisioning_state
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureResource/autorestresourceflatteningtestservice/models/resource.py b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureResource/autorestresourceflatteningtestservice/models/resource.py
index ccc46d79f60ce..349e6b7fbd717 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureResource/autorestresourceflatteningtestservice/models/resource.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureResource/autorestresourceflatteningtestservice/models/resource.py
@@ -15,18 +15,27 @@
 class Resource(Model):
     """Resource
 
-    :param id: Resource Id
-    :type id: str
-    :param type: Resource Type
-    :type type: str
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Resource Id
+    :vartype id: str
+    :ivar type: Resource Type
+    :vartype type: str
     :param tags:
     :type tags: dict
     :param location: Resource Location
     :type location: str
-    :param name: Resource Name
-    :type name: str
+    :ivar name: Resource Name
+    :vartype name: str
     """ 
 
+    _validation = {
+        'id': {'readonly': True},
+        'type': {'readonly': True},
+        'name': {'readonly': True},
+    }
+
     _attribute_map = {
         'id': {'key': 'id', 'type': 'str'},
         'type': {'key': 'type', 'type': 'str'},
@@ -35,9 +44,9 @@ class Resource(Model):
         'name': {'key': 'name', 'type': 'str'},
     }
 
-    def __init__(self, id=None, type=None, tags=None, location=None, name=None):
-        self.id = id
-        self.type = type
+    def __init__(self, tags=None, location=None):
+        self.id = None
+        self.type = None
         self.tags = tags
         self.location = location
-        self.name = name
+        self.name = None
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureResource/setup.py b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureResource/setup.py
index d4003cb22d3fd..095659cbb3fa4 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureResource/setup.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureResource/setup.py
@@ -22,7 +22,7 @@
 # prerequisite: setuptools
 # http://pypi.python.org/pypi/setuptools
 
-REQUIRES = ["msrest>=0.2.0", "msrestazure>=0.2.1"]
+REQUIRES = ["msrest>=0.3.0", "msrestazure>=0.3.0"]
 
 setup(
     name=NAME,
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureSpecials/autorestazurespecialparameterstestclient/auto_rest_azure_special_parameters_test_client.py b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureSpecials/autorestazurespecialparameterstestclient/auto_rest_azure_special_parameters_test_client.py
index cc2d96c0ce719..95f2d47d0fb58 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureSpecials/autorestazurespecialparameterstestclient/auto_rest_azure_special_parameters_test_client.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureSpecials/autorestazurespecialparameterstestclient/auto_rest_azure_special_parameters_test_client.py
@@ -56,9 +56,15 @@ def __init__(
             self, credentials, subscription_id, api_version='2015-07-01-preview', accept_language='en-US', long_running_operation_retry_timeout=30, generate_client_request_id=True, base_url=None, filepath=None):
 
         if credentials is None:
-            raise ValueError('credentials must not be None.')
+            raise ValueError("Parameter 'credentials' must not be None.")
         if subscription_id is None:
-            raise ValueError('subscription_id must not be None.')
+            raise ValueError("Parameter 'subscription_id' must not be None.")
+        if not isinstance(subscription_id, str):
+            raise TypeError("Parameter 'subscription_id' must be str.")
+        if api_version is not None and not isinstance(api_version, str):
+            raise TypeError("Optional parameter 'api_version' must be str.")
+        if accept_language is not None and not isinstance(accept_language, str):
+            raise TypeError("Optional parameter 'accept_language' must be str.")
         if not base_url:
             base_url = 'http://localhost'
 
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureSpecials/setup.py b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureSpecials/setup.py
index a23f56d19161d..cd93aa2dd66d6 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureSpecials/setup.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/AzureSpecials/setup.py
@@ -22,7 +22,7 @@
 # prerequisite: setuptools
 # http://pypi.python.org/pypi/setuptools
 
-REQUIRES = ["msrest>=0.2.0", "msrestazure>=0.2.1"]
+REQUIRES = ["msrest>=0.3.0", "msrestazure>=0.3.0"]
 
 setup(
     name=NAME,
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/CustomBaseUri/autorestparameterizedhosttestclient/auto_rest_parameterized_host_test_client.py b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/CustomBaseUri/autorestparameterizedhosttestclient/auto_rest_parameterized_host_test_client.py
index ce9c7112afaf5..79e862f82db73 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/CustomBaseUri/autorestparameterizedhosttestclient/auto_rest_parameterized_host_test_client.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/CustomBaseUri/autorestparameterizedhosttestclient/auto_rest_parameterized_host_test_client.py
@@ -45,9 +45,13 @@ def __init__(
             self, credentials, host, accept_language='en-US', long_running_operation_retry_timeout=30, generate_client_request_id=True, filepath=None):
 
         if credentials is None:
-            raise ValueError('credentials must not be None.')
+            raise ValueError("Parameter 'credentials' must not be None.")
         if host is None:
-            raise ValueError('host must not be None.')
+            raise ValueError("Parameter 'host' must not be None.")
+        if not isinstance(host, str):
+            raise TypeError("Parameter 'host' must be str.")
+        if accept_language is not None and not isinstance(accept_language, str):
+            raise TypeError("Optional parameter 'accept_language' must be str.")
         base_url = 'http://{accountName}{host}'
 
         super(AutoRestParameterizedHostTestClientConfiguration, self).__init__(base_url, filepath)
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/CustomBaseUri/setup.py b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/CustomBaseUri/setup.py
index b58762d14bf16..b60d7cd0eb460 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/CustomBaseUri/setup.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/CustomBaseUri/setup.py
@@ -22,7 +22,7 @@
 # prerequisite: setuptools
 # http://pypi.python.org/pypi/setuptools
 
-REQUIRES = ["msrest>=0.2.0", "msrestazure>=0.2.1"]
+REQUIRES = ["msrest>=0.3.0", "msrestazure>=0.3.0"]
 
 setup(
     name=NAME,
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Head/autorestheadtestservice/auto_rest_head_test_service.py b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Head/autorestheadtestservice/auto_rest_head_test_service.py
index 85044ec1cbcc4..fc86a3308cb2e 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Head/autorestheadtestservice/auto_rest_head_test_service.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Head/autorestheadtestservice/auto_rest_head_test_service.py
@@ -42,7 +42,9 @@ def __init__(
             self, credentials, accept_language='en-US', long_running_operation_retry_timeout=30, generate_client_request_id=True, base_url=None, filepath=None):
 
         if credentials is None:
-            raise ValueError('credentials must not be None.')
+            raise ValueError("Parameter 'credentials' must not be None.")
+        if accept_language is not None and not isinstance(accept_language, str):
+            raise TypeError("Optional parameter 'accept_language' must be str.")
         if not base_url:
             base_url = 'http://localhost'
 
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Head/setup.py b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Head/setup.py
index e11e2311eb413..083369e096dcc 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Head/setup.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Head/setup.py
@@ -22,7 +22,7 @@
 # prerequisite: setuptools
 # http://pypi.python.org/pypi/setuptools
 
-REQUIRES = ["msrest>=0.2.0", "msrestazure>=0.2.1"]
+REQUIRES = ["msrest>=0.3.0", "msrestazure>=0.3.0"]
 
 setup(
     name=NAME,
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/HeadExceptions/autorestheadexceptiontestservice/auto_rest_head_exception_test_service.py b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/HeadExceptions/autorestheadexceptiontestservice/auto_rest_head_exception_test_service.py
index e7531777378d2..d9745572729ef 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/HeadExceptions/autorestheadexceptiontestservice/auto_rest_head_exception_test_service.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/HeadExceptions/autorestheadexceptiontestservice/auto_rest_head_exception_test_service.py
@@ -42,7 +42,9 @@ def __init__(
             self, credentials, accept_language='en-US', long_running_operation_retry_timeout=30, generate_client_request_id=True, base_url=None, filepath=None):
 
         if credentials is None:
-            raise ValueError('credentials must not be None.')
+            raise ValueError("Parameter 'credentials' must not be None.")
+        if accept_language is not None and not isinstance(accept_language, str):
+            raise TypeError("Optional parameter 'accept_language' must be str.")
         if not base_url:
             base_url = 'http://localhost'
 
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/HeadExceptions/setup.py b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/HeadExceptions/setup.py
index eea7127ecba39..d66fa596b1ebb 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/HeadExceptions/setup.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/HeadExceptions/setup.py
@@ -22,7 +22,7 @@
 # prerequisite: setuptools
 # http://pypi.python.org/pypi/setuptools
 
-REQUIRES = ["msrest>=0.2.0", "msrestazure>=0.2.1"]
+REQUIRES = ["msrest>=0.3.0", "msrestazure>=0.3.0"]
 
 setup(
     name=NAME,
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Lro/autorestlongrunningoperationtestservice/auto_rest_long_running_operation_test_service.py b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Lro/autorestlongrunningoperationtestservice/auto_rest_long_running_operation_test_service.py
index 718b1114d10af..be1ddc0cc63c0 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Lro/autorestlongrunningoperationtestservice/auto_rest_long_running_operation_test_service.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Lro/autorestlongrunningoperationtestservice/auto_rest_long_running_operation_test_service.py
@@ -46,7 +46,9 @@ def __init__(
             self, credentials, accept_language='en-US', long_running_operation_retry_timeout=30, generate_client_request_id=True, base_url=None, filepath=None):
 
         if credentials is None:
-            raise ValueError('credentials must not be None.')
+            raise ValueError("Parameter 'credentials' must not be None.")
+        if accept_language is not None and not isinstance(accept_language, str):
+            raise TypeError("Optional parameter 'accept_language' must be str.")
         if not base_url:
             base_url = 'http://localhost'
 
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Lro/autorestlongrunningoperationtestservice/models/product.py b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Lro/autorestlongrunningoperationtestservice/models/product.py
index 6f322f37b09fc..1671df6f6c655 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Lro/autorestlongrunningoperationtestservice/models/product.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Lro/autorestlongrunningoperationtestservice/models/product.py
@@ -15,24 +15,34 @@
 class Product(Resource):
     """Product
 
-    :param id: Resource Id
-    :type id: str
-    :param type: Resource Type
-    :type type: str
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Resource Id
+    :vartype id: str
+    :ivar type: Resource Type
+    :vartype type: str
     :param tags:
     :type tags: dict
     :param location: Resource Location
     :type location: str
-    :param name: Resource Name
-    :type name: str
+    :ivar name: Resource Name
+    :vartype name: str
     :param provisioning_state:
     :type provisioning_state: str
-    :param provisioning_state_values: Possible values include: 'Succeeded',
+    :ivar provisioning_state_values: Possible values include: 'Succeeded',
      'Failed', 'canceled', 'Accepted', 'Creating', 'Created', 'Updating',
      'Updated', 'Deleting', 'Deleted', 'OK'
-    :type provisioning_state_values: str
+    :vartype provisioning_state_values: str
     """ 
 
+    _validation = {
+        'id': {'readonly': True},
+        'type': {'readonly': True},
+        'name': {'readonly': True},
+        'provisioning_state_values': {'readonly': True},
+    }
+
     _attribute_map = {
         'id': {'key': 'id', 'type': 'str'},
         'type': {'key': 'type', 'type': 'str'},
@@ -43,7 +53,7 @@ class Product(Resource):
         'provisioning_state_values': {'key': 'properties.provisioningStateValues', 'type': 'str'},
     }
 
-    def __init__(self, id=None, type=None, tags=None, location=None, name=None, provisioning_state=None, provisioning_state_values=None):
-        super(Product, self).__init__(id=id, type=type, tags=tags, location=location, name=name)
+    def __init__(self, tags=None, location=None, provisioning_state=None):
+        super(Product, self).__init__(tags=tags, location=location)
         self.provisioning_state = provisioning_state
-        self.provisioning_state_values = provisioning_state_values
+        self.provisioning_state_values = None
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Lro/autorestlongrunningoperationtestservice/models/resource.py b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Lro/autorestlongrunningoperationtestservice/models/resource.py
index ccc46d79f60ce..349e6b7fbd717 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Lro/autorestlongrunningoperationtestservice/models/resource.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Lro/autorestlongrunningoperationtestservice/models/resource.py
@@ -15,18 +15,27 @@
 class Resource(Model):
     """Resource
 
-    :param id: Resource Id
-    :type id: str
-    :param type: Resource Type
-    :type type: str
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Resource Id
+    :vartype id: str
+    :ivar type: Resource Type
+    :vartype type: str
     :param tags:
     :type tags: dict
     :param location: Resource Location
     :type location: str
-    :param name: Resource Name
-    :type name: str
+    :ivar name: Resource Name
+    :vartype name: str
     """ 
 
+    _validation = {
+        'id': {'readonly': True},
+        'type': {'readonly': True},
+        'name': {'readonly': True},
+    }
+
     _attribute_map = {
         'id': {'key': 'id', 'type': 'str'},
         'type': {'key': 'type', 'type': 'str'},
@@ -35,9 +44,9 @@ class Resource(Model):
         'name': {'key': 'name', 'type': 'str'},
     }
 
-    def __init__(self, id=None, type=None, tags=None, location=None, name=None):
-        self.id = id
-        self.type = type
+    def __init__(self, tags=None, location=None):
+        self.id = None
+        self.type = None
         self.tags = tags
         self.location = location
-        self.name = name
+        self.name = None
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Lro/autorestlongrunningoperationtestservice/models/sub_product.py b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Lro/autorestlongrunningoperationtestservice/models/sub_product.py
index 099f79ecdc9de..c813566223b8d 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Lro/autorestlongrunningoperationtestservice/models/sub_product.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Lro/autorestlongrunningoperationtestservice/models/sub_product.py
@@ -15,23 +15,31 @@
 class SubProduct(SubResource):
     """SubProduct
 
-    :param id: Sub Resource Id
-    :type id: str
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Sub Resource Id
+    :vartype id: str
     :param provisioning_state:
     :type provisioning_state: str
-    :param provisioning_state_values: Possible values include: 'Succeeded',
+    :ivar provisioning_state_values: Possible values include: 'Succeeded',
      'Failed', 'canceled', 'Accepted', 'Creating', 'Created', 'Updating',
      'Updated', 'Deleting', 'Deleted', 'OK'
-    :type provisioning_state_values: str
+    :vartype provisioning_state_values: str
     """ 
 
+    _validation = {
+        'id': {'readonly': True},
+        'provisioning_state_values': {'readonly': True},
+    }
+
     _attribute_map = {
         'id': {'key': 'id', 'type': 'str'},
         'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
         'provisioning_state_values': {'key': 'properties.provisioningStateValues', 'type': 'str'},
     }
 
-    def __init__(self, id=None, provisioning_state=None, provisioning_state_values=None):
-        super(SubProduct, self).__init__(id=id)
+    def __init__(self, provisioning_state=None):
+        super(SubProduct, self).__init__()
         self.provisioning_state = provisioning_state
-        self.provisioning_state_values = provisioning_state_values
+        self.provisioning_state_values = None
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Lro/autorestlongrunningoperationtestservice/models/sub_resource.py b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Lro/autorestlongrunningoperationtestservice/models/sub_resource.py
index 46ce23db785ac..77ec6cf29f437 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Lro/autorestlongrunningoperationtestservice/models/sub_resource.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Lro/autorestlongrunningoperationtestservice/models/sub_resource.py
@@ -15,13 +15,20 @@
 class SubResource(Model):
     """SubResource
 
-    :param id: Sub Resource Id
-    :type id: str
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Sub Resource Id
+    :vartype id: str
     """ 
 
+    _validation = {
+        'id': {'readonly': True},
+    }
+
     _attribute_map = {
         'id': {'key': 'id', 'type': 'str'},
     }
 
-    def __init__(self, id=None):
-        self.id = id
+    def __init__(self):
+        self.id = None
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Lro/autorestlongrunningoperationtestservice/operations/lrosa_ds_operations.py b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Lro/autorestlongrunningoperationtestservice/operations/lrosa_ds_operations.py
index f4bb777cedec5..a211b6975e70d 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Lro/autorestlongrunningoperationtestservice/operations/lrosa_ds_operations.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Lro/autorestlongrunningoperationtestservice/operations/lrosa_ds_operations.py
@@ -205,6 +205,92 @@ def get_long_running_output(response):
             long_running_send, get_long_running_output,
             get_long_running_status, long_running_operation_timeout)
 
+    def put_non_retry201_creating400_invalid_json(
+            self, product=None, custom_headers={}, raw=False, **operation_config):
+        """
+        Long running put request, service returns a Product with
+        'ProvisioningState' = 'Creating' and 201 response code
+
+        :param product: Product to put
+        :type product: :class:`Product
+         <fixtures.acceptancetestslro.models.Product>`
+        :param dict custom_headers: headers that will be added to the request
+        :param bool raw: returns the direct response alongside the
+         deserialized response
+        :rtype:
+         :class:`AzureOperationPoller<msrestazure.azure_operation.AzureOperationPoller>`
+         instance that returns :class:`Product
+         <fixtures.acceptancetestslro.models.Product>`
+        :rtype: :class:`ClientRawResponse<msrest.pipeline.ClientRawResponse>`
+         if raw=true
+        """
+        # Construct URL
+        url = '/lro/nonretryerror/put/201/creating/400/invalidjson'
+
+        # Construct parameters
+        query_parameters = {}
+
+        # Construct headers
+        header_parameters = {}
+        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        if self.config.generate_client_request_id:
+            header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
+        if custom_headers:
+            header_parameters.update(custom_headers)
+        if self.config.accept_language is not None:
+            header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
+
+        # Construct body
+        if product is not None:
+            body_content = self._serialize.body(product, 'Product')
+        else:
+            body_content = None
+
+        # Construct and send request
+        def long_running_send():
+
+            request = self._client.put(url, query_parameters)
+            return self._client.send(
+                request, header_parameters, body_content, **operation_config)
+
+        def get_long_running_status(status_link, headers={}):
+
+            request = self._client.get(status_link)
+            request.headers.update(headers)
+            return self._client.send(
+                request, header_parameters, **operation_config)
+
+        def get_long_running_output(response):
+
+            if response.status_code not in [200, 201]:
+                exp = CloudError(response)
+                exp.request_id = response.headers.get('x-ms-request-id')
+                raise exp
+
+            deserialized = None
+
+            if response.status_code == 200:
+                deserialized = self._deserialize('Product', response)
+            if response.status_code == 201:
+                deserialized = self._deserialize('Product', response)
+
+            if raw:
+                client_raw_response = ClientRawResponse(deserialized, response)
+                return client_raw_response
+
+            return deserialized
+
+        if raw:
+            response = long_running_send()
+            return get_long_running_output(response)
+
+        long_running_operation_timeout = operation_config.get(
+            'long_running_operation_timeout',
+            self.config.long_running_operation_timeout)
+        return AzureOperationPoller(
+            long_running_send, get_long_running_output,
+            get_long_running_status, long_running_operation_timeout)
+
     def put_async_relative_retry400(
             self, product=None, custom_headers={}, raw=False, **operation_config):
         """
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Lro/setup.py b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Lro/setup.py
index 6efdcd0d3ea4e..dab3d2e5e77e0 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Lro/setup.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Lro/setup.py
@@ -22,7 +22,7 @@
 # prerequisite: setuptools
 # http://pypi.python.org/pypi/setuptools
 
-REQUIRES = ["msrest>=0.2.0", "msrestazure>=0.2.1"]
+REQUIRES = ["msrest>=0.3.0", "msrestazure>=0.3.0"]
 
 setup(
     name=NAME,
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Paging/autorestpagingtestservice/auto_rest_paging_test_service.py b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Paging/autorestpagingtestservice/auto_rest_paging_test_service.py
index 532adc38d5acc..e3cf9310642ed 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Paging/autorestpagingtestservice/auto_rest_paging_test_service.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Paging/autorestpagingtestservice/auto_rest_paging_test_service.py
@@ -43,7 +43,9 @@ def __init__(
             self, credentials, accept_language='en-US', long_running_operation_retry_timeout=30, generate_client_request_id=True, base_url=None, filepath=None):
 
         if credentials is None:
-            raise ValueError('credentials must not be None.')
+            raise ValueError("Parameter 'credentials' must not be None.")
+        if accept_language is not None and not isinstance(accept_language, str):
+            raise TypeError("Optional parameter 'accept_language' must be str.")
         if not base_url:
             base_url = 'http://localhost'
 
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Paging/autorestpagingtestservice/models/paging_get_multiple_pages_options.py b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Paging/autorestpagingtestservice/models/paging_get_multiple_pages_options.py
index c776b4da879d7..15ba71465cac8 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Paging/autorestpagingtestservice/models/paging_get_multiple_pages_options.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Paging/autorestpagingtestservice/models/paging_get_multiple_pages_options.py
@@ -14,7 +14,7 @@
 
 class PagingGetMultiplePagesOptions(Model):
     """
-    Additional parameters for the getMultiplePages operation.
+    Additional parameters for the Paging_getMultiplePages operation.
 
     :param maxresults: Sets the maximum number of items to return in the
      response.
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Paging/autorestpagingtestservice/models/paging_get_multiple_pages_with_offset_options.py b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Paging/autorestpagingtestservice/models/paging_get_multiple_pages_with_offset_options.py
index 57650f8519648..23e7a887f274c 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Paging/autorestpagingtestservice/models/paging_get_multiple_pages_with_offset_options.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Paging/autorestpagingtestservice/models/paging_get_multiple_pages_with_offset_options.py
@@ -14,7 +14,7 @@
 
 class PagingGetMultiplePagesWithOffsetOptions(Model):
     """
-    Additional parameters for the getMultiplePagesWithOffset operation.
+    Additional parameters for the Paging_getMultiplePagesWithOffset operation.
 
     :param maxresults: Sets the maximum number of items to return in the
      response.
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Paging/setup.py b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Paging/setup.py
index b8c042a69efb9..063fc0d9388e6 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Paging/setup.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/Paging/setup.py
@@ -22,7 +22,7 @@
 # prerequisite: setuptools
 # http://pypi.python.org/pypi/setuptools
 
-REQUIRES = ["msrest>=0.2.0", "msrestazure>=0.2.1"]
+REQUIRES = ["msrest>=0.3.0", "msrestazure>=0.3.0"]
 
 setup(
     name=NAME,
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/StorageManagementClient/setup.py b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/StorageManagementClient/setup.py
index 7e7b4160e02e1..b204e8c8c203b 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/StorageManagementClient/setup.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/StorageManagementClient/setup.py
@@ -22,7 +22,7 @@
 # prerequisite: setuptools
 # http://pypi.python.org/pypi/setuptools
 
-REQUIRES = ["msrest>=0.2.0", "msrestazure>=0.2.1"]
+REQUIRES = ["msrest>=0.3.0", "msrestazure>=0.3.0"]
 
 setup(
     name=NAME,
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/StorageManagementClient/storagemanagementclient/models/resource.py b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/StorageManagementClient/storagemanagementclient/models/resource.py
index 9025ae9819072..8d25c5c02f7ac 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/StorageManagementClient/storagemanagementclient/models/resource.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/StorageManagementClient/storagemanagementclient/models/resource.py
@@ -15,12 +15,15 @@
 class Resource(Model):
     """Resource
 
-    :param id: Resource Id
-    :type id: str
-    :param name: Resource name
-    :type name: str
-    :param type: Resource type
-    :type type: str
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Resource Id
+    :vartype id: str
+    :ivar name: Resource name
+    :vartype name: str
+    :ivar type: Resource type
+    :vartype type: str
     :param location: Resource location
     :type location: str
     :param tags: Resource tags
@@ -28,6 +31,9 @@ class Resource(Model):
     """ 
 
     _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
         'location': {'required': True},
     }
 
@@ -39,9 +45,9 @@ class Resource(Model):
         'tags': {'key': 'tags', 'type': '{str}'},
     }
 
-    def __init__(self, location, id=None, name=None, type=None, tags=None):
-        self.id = id
-        self.name = name
-        self.type = type
+    def __init__(self, location, tags=None):
+        self.id = None
+        self.name = None
+        self.type = None
         self.location = location
         self.tags = tags
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/StorageManagementClient/storagemanagementclient/models/storage_account.py b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/StorageManagementClient/storagemanagementclient/models/storage_account.py
index 3268320474a92..bff1707d78076 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/StorageManagementClient/storagemanagementclient/models/storage_account.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/StorageManagementClient/storagemanagementclient/models/storage_account.py
@@ -16,12 +16,15 @@ class StorageAccount(Resource):
     """
     The storage account.
 
-    :param id: Resource Id
-    :type id: str
-    :param name: Resource name
-    :type name: str
-    :param type: Resource type
-    :type type: str
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Resource Id
+    :vartype id: str
+    :ivar name: Resource name
+    :vartype name: str
+    :ivar type: Resource type
+    :vartype type: str
     :param location: Resource location
     :type location: str
     :param tags: Resource tags
@@ -77,6 +80,9 @@ class StorageAccount(Resource):
     """ 
 
     _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
         'location': {'required': True},
     }
 
@@ -99,8 +105,8 @@ class StorageAccount(Resource):
         'secondary_endpoints': {'key': 'properties.secondaryEndpoints', 'type': 'Endpoints'},
     }
 
-    def __init__(self, location, id=None, name=None, type=None, tags=None, provisioning_state=None, account_type=None, primary_endpoints=None, primary_location=None, status_of_primary=None, last_geo_failover_time=None, secondary_location=None, status_of_secondary=None, creation_time=None, custom_domain=None, secondary_endpoints=None):
-        super(StorageAccount, self).__init__(id=id, name=name, type=type, location=location, tags=tags)
+    def __init__(self, location, tags=None, provisioning_state=None, account_type=None, primary_endpoints=None, primary_location=None, status_of_primary=None, last_geo_failover_time=None, secondary_location=None, status_of_secondary=None, creation_time=None, custom_domain=None, secondary_endpoints=None):
+        super(StorageAccount, self).__init__(location=location, tags=tags)
         self.provisioning_state = provisioning_state
         self.account_type = account_type
         self.primary_endpoints = primary_endpoints
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/StorageManagementClient/storagemanagementclient/models/storage_account_create_parameters.py b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/StorageManagementClient/storagemanagementclient/models/storage_account_create_parameters.py
index 449f6c502135a..31535a2dc8c20 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/StorageManagementClient/storagemanagementclient/models/storage_account_create_parameters.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/StorageManagementClient/storagemanagementclient/models/storage_account_create_parameters.py
@@ -16,12 +16,15 @@ class StorageAccountCreateParameters(Resource):
     """
     The parameters to provide for the account.
 
-    :param id: Resource Id
-    :type id: str
-    :param name: Resource name
-    :type name: str
-    :param type: Resource type
-    :type type: str
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Resource Id
+    :vartype id: str
+    :ivar name: Resource name
+    :vartype name: str
+    :ivar type: Resource type
+    :vartype type: str
     :param location: Resource location
     :type location: str
     :param tags: Resource tags
@@ -33,6 +36,9 @@ class StorageAccountCreateParameters(Resource):
     """ 
 
     _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
         'location': {'required': True},
     }
 
@@ -45,6 +51,6 @@ class StorageAccountCreateParameters(Resource):
         'account_type': {'key': 'properties.accountType', 'type': 'AccountType'},
     }
 
-    def __init__(self, location, id=None, name=None, type=None, tags=None, account_type=None):
-        super(StorageAccountCreateParameters, self).__init__(id=id, name=name, type=type, location=location, tags=tags)
+    def __init__(self, location, tags=None, account_type=None):
+        super(StorageAccountCreateParameters, self).__init__(location=location, tags=tags)
         self.account_type = account_type
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/StorageManagementClient/storagemanagementclient/models/storage_account_update_parameters.py b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/StorageManagementClient/storagemanagementclient/models/storage_account_update_parameters.py
index 5975e56879436..e60b187d613bd 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/StorageManagementClient/storagemanagementclient/models/storage_account_update_parameters.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/StorageManagementClient/storagemanagementclient/models/storage_account_update_parameters.py
@@ -16,12 +16,15 @@ class StorageAccountUpdateParameters(Resource):
     """
     The parameters to update on the account.
 
-    :param id: Resource Id
-    :type id: str
-    :param name: Resource name
-    :type name: str
-    :param type: Resource type
-    :type type: str
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Resource Id
+    :vartype id: str
+    :ivar name: Resource name
+    :vartype name: str
+    :ivar type: Resource type
+    :vartype type: str
     :param location: Resource location
     :type location: str
     :param tags: Resource tags
@@ -41,6 +44,9 @@ class StorageAccountUpdateParameters(Resource):
     """ 
 
     _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
         'location': {'required': True},
     }
 
@@ -54,7 +60,7 @@ class StorageAccountUpdateParameters(Resource):
         'custom_domain': {'key': 'properties.customDomain', 'type': 'CustomDomain'},
     }
 
-    def __init__(self, location, id=None, name=None, type=None, tags=None, account_type=None, custom_domain=None):
-        super(StorageAccountUpdateParameters, self).__init__(id=id, name=name, type=type, location=location, tags=tags)
+    def __init__(self, location, tags=None, account_type=None, custom_domain=None):
+        super(StorageAccountUpdateParameters, self).__init__(location=location, tags=tags)
         self.account_type = account_type
         self.custom_domain = custom_domain
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/StorageManagementClient/storagemanagementclient/storage_management_client.py b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/StorageManagementClient/storagemanagementclient/storage_management_client.py
index cd2c457915195..1334ec94142ec 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/StorageManagementClient/storagemanagementclient/storage_management_client.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/StorageManagementClient/storagemanagementclient/storage_management_client.py
@@ -50,9 +50,15 @@ def __init__(
             self, credentials, subscription_id, api_version='2015-05-01-preview', accept_language='en-US', long_running_operation_retry_timeout=30, generate_client_request_id=True, base_url=None, filepath=None):
 
         if credentials is None:
-            raise ValueError('credentials must not be None.')
+            raise ValueError("Parameter 'credentials' must not be None.")
         if subscription_id is None:
-            raise ValueError('subscription_id must not be None.')
+            raise ValueError("Parameter 'subscription_id' must not be None.")
+        if not isinstance(subscription_id, str):
+            raise TypeError("Parameter 'subscription_id' must be str.")
+        if api_version is not None and not isinstance(api_version, str):
+            raise TypeError("Optional parameter 'api_version' must be str.")
+        if accept_language is not None and not isinstance(accept_language, str):
+            raise TypeError("Optional parameter 'accept_language' must be str.")
         if not base_url:
             base_url = 'https://management.azure.com'
 
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/SubscriptionIdApiVersion/microsoftazuretesturl/microsoft_azure_test_url.py b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/SubscriptionIdApiVersion/microsoftazuretesturl/microsoft_azure_test_url.py
index 99e3bc1f4ce98..d16f3f25706a6 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/SubscriptionIdApiVersion/microsoftazuretesturl/microsoft_azure_test_url.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/SubscriptionIdApiVersion/microsoftazuretesturl/microsoft_azure_test_url.py
@@ -47,9 +47,15 @@ def __init__(
             self, credentials, subscription_id, api_version='2014-04-01-preview', accept_language='en-US', long_running_operation_retry_timeout=30, generate_client_request_id=True, base_url=None, filepath=None):
 
         if credentials is None:
-            raise ValueError('credentials must not be None.')
+            raise ValueError("Parameter 'credentials' must not be None.")
         if subscription_id is None:
-            raise ValueError('subscription_id must not be None.')
+            raise ValueError("Parameter 'subscription_id' must not be None.")
+        if not isinstance(subscription_id, str):
+            raise TypeError("Parameter 'subscription_id' must be str.")
+        if api_version is not None and not isinstance(api_version, str):
+            raise TypeError("Optional parameter 'api_version' must be str.")
+        if accept_language is not None and not isinstance(accept_language, str):
+            raise TypeError("Optional parameter 'accept_language' must be str.")
         if not base_url:
             base_url = 'https://management.azure.com/'
 
diff --git a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/SubscriptionIdApiVersion/setup.py b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/SubscriptionIdApiVersion/setup.py
index a0eeb22b2beda..270e110d8b34f 100644
--- a/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/SubscriptionIdApiVersion/setup.py
+++ b/AutoRest/Generators/Python/Azure.Python.Tests/Expected/AcceptanceTests/SubscriptionIdApiVersion/setup.py
@@ -22,7 +22,7 @@
 # prerequisite: setuptools
 # http://pypi.python.org/pypi/setuptools
 
-REQUIRES = ["msrest>=0.2.0", "msrestazure>=0.2.1"]
+REQUIRES = ["msrest>=0.3.0", "msrestazure>=0.3.0"]
 
 setup(
     name=NAME,
diff --git a/AutoRest/Generators/Python/Azure.Python/AzurePythonCodeGenerator.cs b/AutoRest/Generators/Python/Azure.Python/AzurePythonCodeGenerator.cs
index 0ad15558928b5..2bc8932aa11fc 100644
--- a/AutoRest/Generators/Python/Azure.Python/AzurePythonCodeGenerator.cs
+++ b/AutoRest/Generators/Python/Azure.Python/AzurePythonCodeGenerator.cs
@@ -19,7 +19,7 @@ namespace Microsoft.Rest.Generator.Azure.Python
 {
     public class AzurePythonCodeGenerator : PythonCodeGenerator
     {
-        private const string ClientRuntimePackage = "msrestazure version 0.2.1";
+        private const string ClientRuntimePackage = "msrestazure version 0.3.0";
 
         // page extensions class dictionary.
         private IList<PageTemplateModel> pageModels;
@@ -62,7 +62,7 @@ public override void NormalizeClientModel(ServiceClient serviceClient)
             AzureExtensions.UpdateHeadMethods(serviceClient);
             AzureExtensions.ParseODataExtension(serviceClient);
             Extensions.FlattenModels(serviceClient);
-            Extensions.AddParameterGroups(serviceClient);
+            ParameterGroupExtensionHelper.AddParameterGroups(serviceClient);
             AzureExtensions.AddAzureProperties(serviceClient);
             AzureExtensions.SetDefaultResponses(serviceClient);
             CorrectFilterParameters(serviceClient);
diff --git a/AutoRest/Generators/Python/Azure.Python/TemplateModels/AzureServiceClientTemplateModel.cs b/AutoRest/Generators/Python/Azure.Python/TemplateModels/AzureServiceClientTemplateModel.cs
index 3c0cfcbf8160c..0a3b44b0e6446 100644
--- a/AutoRest/Generators/Python/Azure.Python/TemplateModels/AzureServiceClientTemplateModel.cs
+++ b/AutoRest/Generators/Python/Azure.Python/TemplateModels/AzureServiceClientTemplateModel.cs
@@ -74,7 +74,7 @@ public override string RequiredConstructorParameters
                     else
                     {
                         string defaultValue = PythonConstants.None;
-                        if (property.DefaultValue != null && property.Type is PrimaryType)
+                        if (!string.IsNullOrWhiteSpace(property.DefaultValue) && property.Type is PrimaryType)
                         {
                             defaultValue = property.DefaultValue;
                         }
@@ -97,7 +97,7 @@ public override string SetupRequires
         {
             get
             {
-                return "\"msrest>=0.2.0\", \"msrestazure>=0.2.1\"";
+                return "\"msrest>=0.3.0\", \"msrestazure>=0.3.0\"";
             }
         }
 
diff --git a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/complex_tests.py b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/complex_tests.py
index fcbf2f38617cf..fa4902659e391 100644
--- a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/complex_tests.py
+++ b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/complex_tests.py
@@ -201,6 +201,19 @@ def test_complex(self):
         # PUT primitive/byte
         client.primitive.put_byte(valid_bytes)
 
+        """
+        COMPLEX TYPE WITH READ ONLY PROPERTIES
+        """
+        # GET readonly/valid
+        valid_obj = ReadonlyObj(size=2)
+        valid_obj.id = '1234'
+        readonly_result = client.readonlyproperty.get_valid()
+        self.assertEqual(readonly_result, valid_obj)
+
+        # PUT readonly/valid
+        readonly_result = client.readonlyproperty.put_valid(valid_obj)
+        self.assertIsNone(readonly_result)
+
         """
         COMPLEX TYPE WITH ARRAY PROPERTIES
         """
diff --git a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/file_tests.py b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/file_tests.py
index cc7fb8d0f5eb7..900265a4ed1fe 100644
--- a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/file_tests.py
+++ b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/file_tests.py
@@ -53,24 +53,21 @@ class FileTests(unittest.TestCase):
     def test_files(self):
 
         config = AutoRestSwaggerBATFileServiceConfiguration(base_url="http://localhost:3000")
-        config.log_level = log_level
         config.connection.data_block_size = 1000
         client = AutoRestSwaggerBATFileService(config)
 
-        def test_callback(data, response, progress = [0], is_response_streamed=None):
+        def test_callback(data, response, progress=[0]):
             self.assertTrue(len(data) > 0)
-            if not is_response_streamed:
-                self.assertFalse(response._content_consumed)
+            self.assertIsNotNone(response)
+            self.assertFalse(response._content_consumed)
+            total = float(response.headers['Content-Length'])
+            if total < 4096:
                 progress[0] += len(data)
-                total = float(response.headers['Content-Length'])
                 print("Downloading... {}%".format(int(progress[0]*100/total)))
-            self.assertIsNotNone(response)
 
         file_length = 0
         with io.BytesIO() as file_handle:
-
-            stream = client.files.get_file(callback=lambda x, response, progress=[0] :
-                                           test_callback(x, response, progress, False))
+            stream = client.files.get_file(callback=test_callback)
 
             for data in stream:
                 file_length += len(data)
@@ -86,11 +83,10 @@ def test_callback(data, response, progress = [0], is_response_streamed=None):
                 sample_data = hash(data.read())
             self.assertEqual(sample_data, hash(file_handle.getvalue()))
 
+        config.connection.data_block_size = 4096
         file_length = 0
         with io.BytesIO() as file_handle:
-
-            stream = client.files.get_empty_file(callback=lambda x, response, progress=[0] :
-                                                 test_callback(x, response, progress, False))
+            stream = client.files.get_empty_file(callback=test_callback)
 
             for data in stream:
                 file_length += len(data)
@@ -98,9 +94,12 @@ def test_callback(data, response, progress = [0], is_response_streamed=None):
 
             self.assertEqual(file_length, 0)
 
-        #file_length = 0
-        #stream = client.files.get_file_large(callback=lambda x, response, progress=[0] :
-        #                                     test_callback(x, response, progress, True))
+        def add_headers(adapter, request, response, *args, **kwargs):
+            response.headers['Content-Length'] = str(3000 * 1024 * 1024)
+
+        file_length = 0
+        client._client.add_hook('response', add_headers)
+        stream = client.files.get_file_large(callback=test_callback)
         #for data in stream:
         #    file_length += len(data)
 
@@ -108,24 +107,21 @@ def test_callback(data, response, progress = [0], is_response_streamed=None):
 
     def test_files_raw(self):
 
-        def test_callback(data, response, progress = [0], is_response_streamed=None):
+        def test_callback(data, response, progress=[0]):
             self.assertTrue(len(data) > 0)
-            if not is_response_streamed:
-                self.assertFalse(response._content_consumed)
+            self.assertIsNotNone(response)
+            self.assertFalse(response._content_consumed)
+            total = float(response.headers.get('Content-Length', 0))
+            if total:
                 progress[0] += len(data)
-                total = float(response.headers['Content-Length'])
                 print("Downloading... {}%".format(int(progress[0]*100/total)))
-            self.assertIsNotNone(response)
 
         config = AutoRestSwaggerBATFileServiceConfiguration(base_url="http://localhost:3000")
-        config.log_level = log_level
         client = AutoRestSwaggerBATFileService(config)
 
         file_length = 0
         with io.BytesIO() as file_handle:
-
-            response = client.files.get_file(raw=True, callback=lambda x, response, progress=[0] :
-                                             test_callback(x, response, progress, False))
+            response = client.files.get_file(raw=True, callback=test_callback)
             stream = response.output
 
             for data in stream:
@@ -144,9 +140,7 @@ def test_callback(data, response, progress = [0], is_response_streamed=None):
 
         file_length = 0
         with io.BytesIO() as file_handle:
-
-            response = client.files.get_empty_file(raw=True, callback=lambda x, response, progress=[0] :
-                                                   test_callback(x, response, progress, False))
+            response = client.files.get_empty_file(raw=True, callback=test_callback)
             stream = response.output
 
             for data in stream:
@@ -155,16 +149,5 @@ def test_callback(data, response, progress = [0], is_response_streamed=None):
 
             self.assertEqual(file_length, 0)
 
-        #file_length = 0
-        #response = client.files.get_file_large(raw=True, callback=lambda x, response, progress=[0] :
-        #                                     test_callback(x, response, progress, True))
-
-        #stream = response.output
-
-        #for data in stream:
-        #    file_length += len(data)
-
-        #self.assertEqual(file_length, 3000 * 1024 * 1024)
-
 if __name__ == '__main__':
     unittest.main()
\ No newline at end of file
diff --git a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/form_data_tests.py b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/form_data_tests.py
index f18bfdb92aa05..ea1ed1a726f9e 100644
--- a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/form_data_tests.py
+++ b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/form_data_tests.py
@@ -174,7 +174,6 @@ def test_callback(data, response, progress = [0]):
         with open(self.dummy_file, 'rb') as upload_data:
             resp = client.formdata.upload_file_via_body(upload_data, callback=test_callback)
             for r in resp:
-                print(r)
                 result.write(r)
             self.assertEqual(result.getvalue().decode(), "Test file")
 
diff --git a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/url_tests.py b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/url_tests.py
index 05f7b4dcdba4f..3204669e8568c 100644
--- a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/url_tests.py
+++ b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/url_tests.py
@@ -90,8 +90,9 @@ def test_url_path(self):
         self.client.paths.get_negative_ten_billion(-10000000000)
         self.client.paths.get_ten_billion(10000000000)
         self.client.paths.string_empty("")
-        #test_array = ["ArrayPath1", r"begin!*'();:@ &=+$,/?#[]end", None, ""]
-        #self.client.paths.array_csv_in_path(test_array)
+
+        test_array = ["ArrayPath1", r"begin!*'();:@ &=+$,/?#[]end", None, ""]
+        self.client.paths.array_csv_in_path(test_array)
 
         with self.assertRaises(ValidationError):
             self.client.paths.string_null(None)
diff --git a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/validation_tests.py b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/validation_tests.py
index 5af07d6773dbd..7e1ba54e0556e 100644
--- a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/validation_tests.py
+++ b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/validation_tests.py
@@ -67,10 +67,7 @@ def test_constant_values(self):
 
         client.get_with_constant_in_path()
 
-        # TODO: Const body should be built implicitly
         body = Product(child=ChildProduct())
-        body.const_child = ConstantProduct()
-
         product = client.post_with_constant_in_body(body=body)
         self.assertIsNotNone(product)
 
@@ -121,7 +118,6 @@ def test_validation(self):
 
         try:
             tempproduct=Product(child=ChildProduct(), capacity=0)
-            tempproduct.const_child=ConstantProduct()
             client.validation_of_body("123", 150, tempproduct)
         except ValidationError as err:
             self.assertEqual(err.rule, "minimum_ex")
@@ -129,7 +125,6 @@ def test_validation(self):
 
         try:
             tempproduct=Product(child=ChildProduct(), capacity=100)
-            tempproduct.const_child=ConstantProduct()
             client.validation_of_body("123", 150, tempproduct)
         except ValidationError as err:
             self.assertEqual(err.rule, "maximum_ex")
@@ -138,7 +133,6 @@ def test_validation(self):
         try:
             tempproduct=Product(child=ChildProduct(),
                 display_names=["item1","item2","item3","item4","item5","item6","item7"])
-            tempproduct.const_child=ConstantProduct()
             client.validation_of_body("123", 150, tempproduct)
         except ValidationError as err:
             self.assertEqual(err.rule, "max_items")
@@ -155,4 +149,8 @@ def test_validation(self):
             client2.validation_of_method_parameters("123", 150)
         except ValidationError as err:
             self.assertEqual(err.rule, "pattern")
-            self.assertEqual(err.target, "self.config.api_version")
\ No newline at end of file
+            self.assertEqual(err.target, "self.config.api_version")
+
+
+if __name__ == '__main__':
+    unittest.main()
\ No newline at end of file
diff --git a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/zzz_tests.py b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/zzz_tests.py
index b54157497620c..2afd6aa9c3c70 100644
--- a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/zzz_tests.py
+++ b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/zzz_tests.py
@@ -54,33 +54,37 @@ def test_ensure_coverage(self):
         client = AutoRestReportService(config)
         report = client.get_report()
 
-        # These will not be supported in Python
-        report['getIntegerOverflow']=1
-        report['getIntegerUnderflow']=1
-        report['getLongOverflow']=1
-        report['getLongUnderflow']=1
-        report['getDateInvalid']=1
-        report['getDictionaryNullkey']=1
-        report['HttpRedirect300Get']=1
-
-        # TODO: Support large file streams
-        report['FileStreamVeryLarge']=1
-
-        # TODO: Support ignore readonly property in http put
-        report['putComplexReadOnlyPropertyValid']=1
-
-        skipped = [k for k, v in report.items() if v == 0]
-        manually_marked_successful = [k for k, v in report.items() if v == 2]
-        for s in manually_marked_successful:
-            print("SKIPPED {0}".format(s))
-
-        for s in skipped:
+        # Add tests that wont be supported due to the nature of Python here
+        not_supported = {
+            'getIntegerOverflow': 1,
+            'getIntegerUnderflow': 1,
+            'getLongOverflow': 1,
+            'getLongUnderflow': 1,
+            'getDateInvalid': 1,
+            'getDictionaryNullkey': 1,
+            'HttpRedirect300Get': 1,
+        }
+
+        # Please add missing features or failing tests here
+        missing_features_or_bugs = {'FileStreamVeryLarge' : 1}
+
+        report.update(not_supported)
+        report.update(missing_features_or_bugs)
+        failed = [k for k, v in report.items() if v == 0]
+
+        for s in not_supported.keys():
+            print("IGNORING {0}".format(s))
+
+        for s in missing_features_or_bugs.keys():
+            print("PENDING {0}".format(s))
+
+        for s in failed:
             print("FAILED TO EXECUTE {0}".format(s))
 
         totalTests = len(report)
-        print ("The test coverage is {0}/{1}.".format(totalTests - len(skipped), totalTests))
+        print ("The test coverage is {0}/{1}.".format(totalTests - len(failed), totalTests))
         
-        self.assertEqual(0, len(skipped))
+        self.assertEqual(0, len(failed))
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/BodyComplex/autorestcomplextestservice/auto_rest_complex_test_service.py b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/BodyComplex/autorestcomplextestservice/auto_rest_complex_test_service.py
index 8ff86db017bbd..3887687ac962c 100644
--- a/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/BodyComplex/autorestcomplextestservice/auto_rest_complex_test_service.py
+++ b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/BodyComplex/autorestcomplextestservice/auto_rest_complex_test_service.py
@@ -38,7 +38,9 @@ def __init__(
             self, api_version, base_url=None, filepath=None):
 
         if api_version is None:
-            raise ValueError('api_version must not be None.')
+            raise ValueError("Parameter 'api_version' must not be None.")
+        if not isinstance(api_version, str):
+            raise TypeError("Parameter 'api_version' must be str.")
         if not base_url:
             base_url = 'http://localhost'
 
diff --git a/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/BodyComplex/autorestcomplextestservice/models/readonly_obj.py b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/BodyComplex/autorestcomplextestservice/models/readonly_obj.py
index f0db42cc1b3f9..109d15efbe7e4 100644
--- a/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/BodyComplex/autorestcomplextestservice/models/readonly_obj.py
+++ b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/BodyComplex/autorestcomplextestservice/models/readonly_obj.py
@@ -15,17 +15,24 @@
 class ReadonlyObj(Model):
     """ReadonlyObj
 
-    :param id:
-    :type id: str
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id:
+    :vartype id: str
     :param size:
     :type size: int
     """ 
 
+    _validation = {
+        'id': {'readonly': True},
+    }
+
     _attribute_map = {
         'id': {'key': 'id', 'type': 'str'},
         'size': {'key': 'size', 'type': 'int'},
     }
 
-    def __init__(self, id=None, size=None):
-        self.id = id
+    def __init__(self, size=None):
+        self.id = None
         self.size = size
diff --git a/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/BodyInteger/autorestintegertestservice/operations/int_model.py b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/BodyInteger/autorestintegertestservice/operations/int_model.py
index 45d9ed146e114..a2b06061ed5cb 100644
--- a/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/BodyInteger/autorestintegertestservice/operations/int_model.py
+++ b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/BodyInteger/autorestintegertestservice/operations/int_model.py
@@ -466,3 +466,178 @@ def put_min64(
         if raw:
             client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
+
+    def get_unix_time(
+            self, custom_headers={}, raw=False, **operation_config):
+        """
+        Get datetime encoded as Unix time value
+
+        :param dict custom_headers: headers that will be added to the request
+        :param bool raw: returns the direct response alongside the
+         deserialized response
+        :param operation_config: :ref:`Operation configuration
+         overrides<msrest:optionsforoperations>`.
+        :rtype: long
+        :rtype: :class:`ClientRawResponse<msrest.pipeline.ClientRawResponse>`
+         if raw=true
+        """
+        # Construct URL
+        url = '/int/unixtime'
+
+        # Construct parameters
+        query_parameters = {}
+
+        # Construct headers
+        header_parameters = {}
+        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        if custom_headers:
+            header_parameters.update(custom_headers)
+
+        # Construct and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, **operation_config)
+
+        if response.status_code not in [200]:
+            raise models.ErrorException(self._deserialize, response)
+
+        deserialized = None
+
+        if response.status_code == 200:
+            deserialized = self._deserialize('long', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def put_unix_time_date(
+            self, int_body, custom_headers={}, raw=False, **operation_config):
+        """
+        Put datetime encoded as Unix time
+
+        :param int_body:
+        :type int_body: long
+        :param dict custom_headers: headers that will be added to the request
+        :param bool raw: returns the direct response alongside the
+         deserialized response
+        :param operation_config: :ref:`Operation configuration
+         overrides<msrest:optionsforoperations>`.
+        :rtype: None
+        :rtype: :class:`ClientRawResponse<msrest.pipeline.ClientRawResponse>`
+         if raw=true
+        """
+        # Construct URL
+        url = '/int/unixtime'
+
+        # Construct parameters
+        query_parameters = {}
+
+        # Construct headers
+        header_parameters = {}
+        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        if custom_headers:
+            header_parameters.update(custom_headers)
+
+        # Construct body
+        body_content = self._serialize.body(int_body, 'long')
+
+        # Construct and send request
+        request = self._client.put(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, **operation_config)
+
+        if response.status_code not in [200]:
+            raise models.ErrorException(self._deserialize, response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(None, response)
+            return client_raw_response
+
+    def get_invalid_unix_time(
+            self, custom_headers={}, raw=False, **operation_config):
+        """
+        Get invalid Unix time value
+
+        :param dict custom_headers: headers that will be added to the request
+        :param bool raw: returns the direct response alongside the
+         deserialized response
+        :param operation_config: :ref:`Operation configuration
+         overrides<msrest:optionsforoperations>`.
+        :rtype: long
+        :rtype: :class:`ClientRawResponse<msrest.pipeline.ClientRawResponse>`
+         if raw=true
+        """
+        # Construct URL
+        url = '/int/invalidunixtime'
+
+        # Construct parameters
+        query_parameters = {}
+
+        # Construct headers
+        header_parameters = {}
+        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        if custom_headers:
+            header_parameters.update(custom_headers)
+
+        # Construct and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, **operation_config)
+
+        if response.status_code not in [200]:
+            raise models.ErrorException(self._deserialize, response)
+
+        deserialized = None
+
+        if response.status_code == 200:
+            deserialized = self._deserialize('long', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def get_null_unix_time(
+            self, custom_headers={}, raw=False, **operation_config):
+        """
+        Get null Unix time value
+
+        :param dict custom_headers: headers that will be added to the request
+        :param bool raw: returns the direct response alongside the
+         deserialized response
+        :param operation_config: :ref:`Operation configuration
+         overrides<msrest:optionsforoperations>`.
+        :rtype: long
+        :rtype: :class:`ClientRawResponse<msrest.pipeline.ClientRawResponse>`
+         if raw=true
+        """
+        # Construct URL
+        url = '/int/nullunixtime'
+
+        # Construct parameters
+        query_parameters = {}
+
+        # Construct headers
+        header_parameters = {}
+        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        if custom_headers:
+            header_parameters.update(custom_headers)
+
+        # Construct and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, **operation_config)
+
+        if response.status_code not in [200]:
+            raise models.ErrorException(self._deserialize, response)
+
+        deserialized = None
+
+        if response.status_code == 200:
+            deserialized = self._deserialize('long', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
diff --git a/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/CustomBaseUri/autorestparameterizedhosttestclient/auto_rest_parameterized_host_test_client.py b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/CustomBaseUri/autorestparameterizedhosttestclient/auto_rest_parameterized_host_test_client.py
index 570afdaa95129..5839338b5a2d2 100644
--- a/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/CustomBaseUri/autorestparameterizedhosttestclient/auto_rest_parameterized_host_test_client.py
+++ b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/CustomBaseUri/autorestparameterizedhosttestclient/auto_rest_parameterized_host_test_client.py
@@ -31,7 +31,9 @@ def __init__(
             self, host, filepath=None):
 
         if host is None:
-            raise ValueError('host must not be None.')
+            raise ValueError("Parameter 'host' must not be None.")
+        if not isinstance(host, str):
+            raise TypeError("Parameter 'host' must be str.")
         base_url = 'http://{accountName}{host}'
 
         super(AutoRestParameterizedHostTestClientConfiguration, self).__init__(base_url, filepath)
diff --git a/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/autorestparameterizedcustomhosttestclient/__init__.py b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/autorestparameterizedcustomhosttestclient/__init__.py
new file mode 100644
index 0000000000000..6711cf5b14df9
--- /dev/null
+++ b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/autorestparameterizedcustomhosttestclient/__init__.py
@@ -0,0 +1,21 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from .auto_rest_parameterized_custom_host_test_client import AutoRestParameterizedCustomHostTestClient, AutoRestParameterizedCustomHostTestClientConfiguration
+from .version import VERSION
+
+__all__ = [
+    'AutoRestParameterizedCustomHostTestClient',
+    'AutoRestParameterizedCustomHostTestClientConfiguration'
+]
+
+__version__ = VERSION
+
diff --git a/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/autorestparameterizedcustomhosttestclient/auto_rest_parameterized_custom_host_test_client.py b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/autorestparameterizedcustomhosttestclient/auto_rest_parameterized_custom_host_test_client.py
new file mode 100644
index 0000000000000..6a61d697f46ef
--- /dev/null
+++ b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/autorestparameterizedcustomhosttestclient/auto_rest_parameterized_custom_host_test_client.py
@@ -0,0 +1,73 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.service_client import ServiceClient
+from msrest import Configuration, Serializer, Deserializer
+from .version import VERSION
+from .operations.paths import Paths
+from . import models
+
+
+class AutoRestParameterizedCustomHostTestClientConfiguration(Configuration):
+    """Configuration for AutoRestParameterizedCustomHostTestClient
+    Note that all parameters used to create this instance are saved as instance
+    attributes.
+
+    :param subscription_id: The subscription id with value 'test12'.
+    :type subscription_id: str
+    :param dns_suffix: A string value that is used as a global part of the
+     parameterized host. Default value 'host'.
+    :type dns_suffix: str
+    :param str filepath: Existing config
+    """
+
+    def __init__(
+            self, subscription_id, dns_suffix, filepath=None):
+
+        if subscription_id is None:
+            raise ValueError("Parameter 'subscription_id' must not be None.")
+        if not isinstance(subscription_id, str):
+            raise TypeError("Parameter 'subscription_id' must be str.")
+        if dns_suffix is None:
+            raise ValueError("Parameter 'dns_suffix' must not be None.")
+        if not isinstance(dns_suffix, str):
+            raise TypeError("Parameter 'dns_suffix' must be str.")
+        base_url = '{vault}{secret}{dnsSuffix}'
+
+        super(AutoRestParameterizedCustomHostTestClientConfiguration, self).__init__(base_url, filepath)
+
+        self.add_user_agent('autorestparameterizedcustomhosttestclient/{}'.format(VERSION))
+
+        self.subscription_id = subscription_id
+        self.dns_suffix = dns_suffix
+
+
+class AutoRestParameterizedCustomHostTestClient(object):
+    """Test Infrastructure for AutoRest
+
+    :param config: Configuration for client.
+    :type config: AutoRestParameterizedCustomHostTestClientConfiguration
+
+    :ivar paths: Paths operations
+    :vartype paths: .operations.Paths
+    """
+
+    def __init__(self, config):
+
+        self._client = ServiceClient(None, config)
+
+        client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
+        self._serialize = Serializer()
+        self._deserialize = Deserializer(client_models)
+
+        self.config = config
+        self.paths = Paths(
+            self._client, self.config, self._serialize, self._deserialize)
diff --git a/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/autorestparameterizedcustomhosttestclient/credentials.py b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/autorestparameterizedcustomhosttestclient/credentials.py
new file mode 100644
index 0000000000000..0d097b4f2a6cf
--- /dev/null
+++ b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/autorestparameterizedcustomhosttestclient/credentials.py
@@ -0,0 +1,15 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.authentication import (
+    BasicAuthentication,
+    BasicTokenAuthentication,
+    OAuthTokenAuthentication)
diff --git a/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/autorestparameterizedcustomhosttestclient/exceptions.py b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/autorestparameterizedcustomhosttestclient/exceptions.py
new file mode 100644
index 0000000000000..c3cc00226060c
--- /dev/null
+++ b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/autorestparameterizedcustomhosttestclient/exceptions.py
@@ -0,0 +1,21 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.exceptions import (
+    ClientException,
+    SerializationError,
+    DeserializationError,
+    TokenExpiredError,
+    ClientRequestError,
+    AuthenticationError,
+    HttpOperationError,
+    ValidationError,
+)
diff --git a/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/autorestparameterizedcustomhosttestclient/models/__init__.py b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/autorestparameterizedcustomhosttestclient/models/__init__.py
new file mode 100644
index 0000000000000..fd6d517a47113
--- /dev/null
+++ b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/autorestparameterizedcustomhosttestclient/models/__init__.py
@@ -0,0 +1,16 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from .error import Error, ErrorException
+
+__all__ = [
+    'Error', 'ErrorException',
+]
diff --git a/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/autorestparameterizedcustomhosttestclient/models/error.py b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/autorestparameterizedcustomhosttestclient/models/error.py
new file mode 100644
index 0000000000000..c2d19e377e004
--- /dev/null
+++ b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/autorestparameterizedcustomhosttestclient/models/error.py
@@ -0,0 +1,44 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+from msrest.exceptions import HttpOperationError
+
+
+class Error(Model):
+    """Error
+
+    :param status:
+    :type status: int
+    :param message:
+    :type message: str
+    """ 
+
+    _attribute_map = {
+        'status': {'key': 'status', 'type': 'int'},
+        'message': {'key': 'message', 'type': 'str'},
+    }
+
+    def __init__(self, status=None, message=None):
+        self.status = status
+        self.message = message
+
+
+class ErrorException(HttpOperationError):
+    """Server responsed with exception of type: 'Error'.
+
+    :param deserialize: A deserializer
+    :param response: Server response to be deserialized.
+    """
+
+    def __init__(self, deserialize, response, *args):
+
+        super(ErrorException, self).__init__(deserialize, response, 'Error', *args)
diff --git a/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/autorestparameterizedcustomhosttestclient/operations/__init__.py b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/autorestparameterizedcustomhosttestclient/operations/__init__.py
new file mode 100644
index 0000000000000..fa4a82a28df55
--- /dev/null
+++ b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/autorestparameterizedcustomhosttestclient/operations/__init__.py
@@ -0,0 +1,16 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from .paths import Paths
+
+__all__ = [
+    'Paths',
+]
diff --git a/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/autorestparameterizedcustomhosttestclient/operations/paths.py b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/autorestparameterizedcustomhosttestclient/operations/paths.py
new file mode 100644
index 0000000000000..2c43f455f742d
--- /dev/null
+++ b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/autorestparameterizedcustomhosttestclient/operations/paths.py
@@ -0,0 +1,87 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.pipeline import ClientRawResponse
+
+from .. import models
+
+
+class Paths(object):
+    """Paths operations.
+
+    :param client: Client for service requests.
+    :param config: Configuration of service client.
+    :param serializer: An object model serializer.
+    :param deserializer: An objec model deserializer.
+    """
+
+    def __init__(self, client, config, serializer, deserializer):
+
+        self._client = client
+        self._serialize = serializer
+        self._deserialize = deserializer
+
+        self.config = config
+
+    def get_empty(
+            self, vault, secret, key_name, key_version="v1", custom_headers={}, raw=False, **operation_config):
+        """
+        Get a 200 to test a valid base uri
+
+        :param vault: The vault name, e.g. https://myvault
+        :type vault: str
+        :param secret: Secret value.
+        :type secret: str
+        :param key_name: The key name with value 'key1'.
+        :type key_name: str
+        :param key_version: The key version. Default value 'v1'.
+        :type key_version: str
+        :param dict custom_headers: headers that will be added to the request
+        :param bool raw: returns the direct response alongside the
+         deserialized response
+        :param operation_config: :ref:`Operation configuration
+         overrides<msrest:optionsforoperations>`.
+        :rtype: None
+        :rtype: :class:`ClientRawResponse<msrest.pipeline.ClientRawResponse>`
+         if raw=true
+        """
+        # Construct URL
+        url = '/customuri/{subscriptionId}/{keyName}'
+        path_format_arguments = {
+            'vault': self._serialize.url("vault", vault, 'str', skip_quote=True),
+            'secret': self._serialize.url("secret", secret, 'str', skip_quote=True),
+            'dnsSuffix': self._serialize.url("self.config.dns_suffix", self.config.dns_suffix, 'str', skip_quote=True),
+            'keyName': self._serialize.url("key_name", key_name, 'str'),
+            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
+        }
+        url = self._client.format_url(url, **path_format_arguments)
+
+        # Construct parameters
+        query_parameters = {}
+        if key_version is not None:
+            query_parameters['keyVersion'] = self._serialize.query("key_version", key_version, 'str')
+
+        # Construct headers
+        header_parameters = {}
+        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        if custom_headers:
+            header_parameters.update(custom_headers)
+
+        # Construct and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, **operation_config)
+
+        if response.status_code not in [200]:
+            raise models.ErrorException(self._deserialize, response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(None, response)
+            return client_raw_response
diff --git a/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/autorestparameterizedcustomhosttestclient/version.py b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/autorestparameterizedcustomhosttestclient/version.py
new file mode 100644
index 0000000000000..a39916c162cec
--- /dev/null
+++ b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/autorestparameterizedcustomhosttestclient/version.py
@@ -0,0 +1,13 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+VERSION = "1.0.0"
+
diff --git a/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/setup.py b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/setup.py
new file mode 100644
index 0000000000000..3521fb6abef92
--- /dev/null
+++ b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/setup.py
@@ -0,0 +1,40 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+# coding: utf-8
+
+from setuptools import setup, find_packages
+
+NAME = "autorestparameterizedcustomhosttestclient"
+VERSION = "1.0.0"
+
+# To install the library, run the following
+#
+# python setup.py install
+#
+# prerequisite: setuptools
+# http://pypi.python.org/pypi/setuptools
+
+REQUIRES = ["msrest>=0.2.0"]
+
+setup(
+    name=NAME,
+    version=VERSION,
+    description="AutoRestParameterizedCustomHostTestClient",
+    author_email="",
+    url="",
+    keywords=["Swagger", "AutoRestParameterizedCustomHostTestClient"],
+    install_requires=REQUIRES,
+    packages=find_packages(),
+    include_package_data=True,
+    long_description="""\
+    Test Infrastructure for AutoRest
+    """
+)
diff --git a/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/ModelFlattening/autorestresourceflatteningtestservice/models/flattened_product.py b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/ModelFlattening/autorestresourceflatteningtestservice/models/flattened_product.py
index 99e49b9aa384f..55df7eedae364 100644
--- a/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/ModelFlattening/autorestresourceflatteningtestservice/models/flattened_product.py
+++ b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/ModelFlattening/autorestresourceflatteningtestservice/models/flattened_product.py
@@ -15,28 +15,38 @@
 class FlattenedProduct(Resource):
     """FlattenedProduct
 
-    :param id: Resource Id
-    :type id: str
-    :param type: Resource Type
-    :type type: str
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Resource Id
+    :vartype id: str
+    :ivar type: Resource Type
+    :vartype type: str
     :param tags:
     :type tags: dict
     :param location: Resource Location
     :type location: str
-    :param name: Resource Name
-    :type name: str
+    :ivar name: Resource Name
+    :vartype name: str
     :param pname:
     :type pname: str
     :param flattened_product_type:
     :type flattened_product_type: str
-    :param provisioning_state_values: Possible values include: 'Succeeded',
+    :ivar provisioning_state_values: Possible values include: 'Succeeded',
      'Failed', 'canceled', 'Accepted', 'Creating', 'Created', 'Updating',
      'Updated', 'Deleting', 'Deleted', 'OK'
-    :type provisioning_state_values: str
+    :vartype provisioning_state_values: str
     :param provisioning_state:
     :type provisioning_state: str
     """ 
 
+    _validation = {
+        'id': {'readonly': True},
+        'type': {'readonly': True},
+        'name': {'readonly': True},
+        'provisioning_state_values': {'readonly': True},
+    }
+
     _attribute_map = {
         'id': {'key': 'id', 'type': 'str'},
         'type': {'key': 'type', 'type': 'str'},
@@ -49,9 +59,9 @@ class FlattenedProduct(Resource):
         'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
     }
 
-    def __init__(self, id=None, type=None, tags=None, location=None, name=None, pname=None, flattened_product_type=None, provisioning_state_values=None, provisioning_state=None):
-        super(FlattenedProduct, self).__init__(id=id, type=type, tags=tags, location=location, name=name)
+    def __init__(self, tags=None, location=None, pname=None, flattened_product_type=None, provisioning_state=None):
+        super(FlattenedProduct, self).__init__(tags=tags, location=location)
         self.pname = pname
         self.flattened_product_type = flattened_product_type
-        self.provisioning_state_values = provisioning_state_values
+        self.provisioning_state_values = None
         self.provisioning_state = provisioning_state
diff --git a/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/ModelFlattening/autorestresourceflatteningtestservice/models/resource.py b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/ModelFlattening/autorestresourceflatteningtestservice/models/resource.py
index ccc46d79f60ce..349e6b7fbd717 100644
--- a/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/ModelFlattening/autorestresourceflatteningtestservice/models/resource.py
+++ b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/ModelFlattening/autorestresourceflatteningtestservice/models/resource.py
@@ -15,18 +15,27 @@
 class Resource(Model):
     """Resource
 
-    :param id: Resource Id
-    :type id: str
-    :param type: Resource Type
-    :type type: str
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Resource Id
+    :vartype id: str
+    :ivar type: Resource Type
+    :vartype type: str
     :param tags:
     :type tags: dict
     :param location: Resource Location
     :type location: str
-    :param name: Resource Name
-    :type name: str
+    :ivar name: Resource Name
+    :vartype name: str
     """ 
 
+    _validation = {
+        'id': {'readonly': True},
+        'type': {'readonly': True},
+        'name': {'readonly': True},
+    }
+
     _attribute_map = {
         'id': {'key': 'id', 'type': 'str'},
         'type': {'key': 'type', 'type': 'str'},
@@ -35,9 +44,9 @@ class Resource(Model):
         'name': {'key': 'name', 'type': 'str'},
     }
 
-    def __init__(self, id=None, type=None, tags=None, location=None, name=None):
-        self.id = id
-        self.type = type
+    def __init__(self, tags=None, location=None):
+        self.id = None
+        self.type = None
         self.tags = tags
         self.location = location
-        self.name = name
+        self.name = None
diff --git a/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/ModelFlattening/autorestresourceflatteningtestservice/models/simple_product.py b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/ModelFlattening/autorestresourceflatteningtestservice/models/simple_product.py
index 1be642054ecac..02537d1797c79 100644
--- a/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/ModelFlattening/autorestresourceflatteningtestservice/models/simple_product.py
+++ b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/ModelFlattening/autorestresourceflatteningtestservice/models/simple_product.py
@@ -16,6 +16,9 @@ class SimpleProduct(BaseProduct):
     """
     The product documentation.
 
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
     :param product_id: Unique identifier representing a specific product for
      a given latitude & longitude. For example, uberX in San Francisco will
      have a different product_id than uberX in Los Angeles.
@@ -24,9 +27,9 @@ class SimpleProduct(BaseProduct):
     :type description: str
     :param max_product_display_name: Display name of product.
     :type max_product_display_name: str
-    :param capacity: Capacity of product. For example, 4 people. Default
+    :ivar capacity: Capacity of product. For example, 4 people. Default
      value: "Large" .
-    :type capacity: str
+    :vartype capacity: str
     :param generic_value: Generic URL value.
     :type generic_value: str
     :param odatavalue: URL value.
@@ -48,9 +51,10 @@ class SimpleProduct(BaseProduct):
         'odatavalue': {'key': 'details.max_product_image.@odata\\.value', 'type': 'str'},
     }
 
+    capacity = "Large"
+
     def __init__(self, product_id, max_product_display_name, description=None, generic_value=None, odatavalue=None):
         super(SimpleProduct, self).__init__(product_id=product_id, description=description)
         self.max_product_display_name = max_product_display_name
-        self.capacity = "Large"
         self.generic_value = generic_value
         self.odatavalue = odatavalue
diff --git a/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/RequiredOptional/autorestrequiredoptionaltestservice/auto_rest_required_optional_test_service.py b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/RequiredOptional/autorestrequiredoptionaltestservice/auto_rest_required_optional_test_service.py
index d9a36a8ffd5b0..7dcce131d92ad 100644
--- a/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/RequiredOptional/autorestrequiredoptionaltestservice/auto_rest_required_optional_test_service.py
+++ b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/RequiredOptional/autorestrequiredoptionaltestservice/auto_rest_required_optional_test_service.py
@@ -36,9 +36,13 @@ def __init__(
             self, required_global_path, required_global_query, optional_global_query=None, base_url=None, filepath=None):
 
         if required_global_path is None:
-            raise ValueError('required_global_path must not be None.')
+            raise ValueError("Parameter 'required_global_path' must not be None.")
+        if not isinstance(required_global_path, str):
+            raise TypeError("Parameter 'required_global_path' must be str.")
         if required_global_query is None:
-            raise ValueError('required_global_query must not be None.')
+            raise ValueError("Parameter 'required_global_query' must not be None.")
+        if not isinstance(required_global_query, str):
+            raise TypeError("Parameter 'required_global_query' must be str.")
         if not base_url:
             base_url = 'http://localhost'
 
diff --git a/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/Url/autoresturltestservice/auto_rest_url_test_service.py b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/Url/autoresturltestservice/auto_rest_url_test_service.py
index 31c1880929875..34efde192fd6b 100644
--- a/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/Url/autoresturltestservice/auto_rest_url_test_service.py
+++ b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/Url/autoresturltestservice/auto_rest_url_test_service.py
@@ -36,7 +36,11 @@ def __init__(
             self, global_string_path, global_string_query=None, base_url=None, filepath=None):
 
         if global_string_path is None:
-            raise ValueError('global_string_path must not be None.')
+            raise ValueError("Parameter 'global_string_path' must not be None.")
+        if not isinstance(global_string_path, str):
+            raise TypeError("Parameter 'global_string_path' must be str.")
+        if global_string_query is not None and not isinstance(global_string_query, str):
+            raise TypeError("Optional parameter 'global_string_query' must be str.")
         if not base_url:
             base_url = 'http://localhost'
 
diff --git a/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/Url/autoresturltestservice/operations/paths.py b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/Url/autoresturltestservice/operations/paths.py
index 46bface0d9375..c419d607826a2 100644
--- a/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/Url/autoresturltestservice/operations/paths.py
+++ b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/Url/autoresturltestservice/operations/paths.py
@@ -1089,7 +1089,7 @@ def array_csv_in_path(
          if raw=true
         """
         # Construct URL
-        url = '/paths/array/ArrayPath1%2cbegin%21%2A%27%28%29%3B%3A%40%20%26%3D%2B%24%2C%2F%3F%23%5B%5Dend%2c%2c/{arrayPath:commaSeparated}'
+        url = '/paths/array/ArrayPath1%2cbegin%21%2A%27%28%29%3B%3A%40%20%26%3D%2B%24%2C%2F%3F%23%5B%5Dend%2c%2c/{arrayPath}'
         path_format_arguments = {
             'arrayPath': self._serialize.url("array_path", array_path, '[str]', div=',')
         }
@@ -1114,3 +1114,46 @@ def array_csv_in_path(
         if raw:
             client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
+
+    def unix_time_url(
+            self, unix_time_url_path, custom_headers={}, raw=False, **operation_config):
+        """
+        Get the date 2016-04-13 encoded value as '1460505600' (Unix time)
+
+        :param unix_time_url_path: Unix time encoded value
+        :type unix_time_url_path: long
+        :param dict custom_headers: headers that will be added to the request
+        :param bool raw: returns the direct response alongside the
+         deserialized response
+        :param operation_config: :ref:`Operation configuration
+         overrides<msrest:optionsforoperations>`.
+        :rtype: None
+        :rtype: :class:`ClientRawResponse<msrest.pipeline.ClientRawResponse>`
+         if raw=true
+        """
+        # Construct URL
+        url = '/paths/int/1460505600/{unixTimeUrlPath}'
+        path_format_arguments = {
+            'unixTimeUrlPath': self._serialize.url("unix_time_url_path", unix_time_url_path, 'long')
+        }
+        url = self._client.format_url(url, **path_format_arguments)
+
+        # Construct parameters
+        query_parameters = {}
+
+        # Construct headers
+        header_parameters = {}
+        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        if custom_headers:
+            header_parameters.update(custom_headers)
+
+        # Construct and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, **operation_config)
+
+        if response.status_code not in [200]:
+            raise models.ErrorException(self._deserialize, response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(None, response)
+            return client_raw_response
diff --git a/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/Validation/autorestvalidationtest/auto_rest_validation_test.py b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/Validation/autorestvalidationtest/auto_rest_validation_test.py
index 7fd4093d00b6e..f9a6b88ede469 100644
--- a/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/Validation/autorestvalidationtest/auto_rest_validation_test.py
+++ b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/Validation/autorestvalidationtest/auto_rest_validation_test.py
@@ -34,9 +34,13 @@ def __init__(
             self, subscription_id, api_version, base_url=None, filepath=None):
 
         if subscription_id is None:
-            raise ValueError('subscription_id must not be None.')
+            raise ValueError("Parameter 'subscription_id' must not be None.")
+        if not isinstance(subscription_id, str):
+            raise TypeError("Parameter 'subscription_id' must be str.")
         if api_version is None:
-            raise ValueError('api_version must not be None.')
+            raise ValueError("Parameter 'api_version' must not be None.")
+        if not isinstance(api_version, str):
+            raise TypeError("Parameter 'api_version' must be str.")
         if not base_url:
             base_url = 'http://localhost'
 
diff --git a/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/Validation/autorestvalidationtest/models/child_product.py b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/Validation/autorestvalidationtest/models/child_product.py
index e7270ddf47641..0ef944dd8e9ca 100644
--- a/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/Validation/autorestvalidationtest/models/child_product.py
+++ b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/Validation/autorestvalidationtest/models/child_product.py
@@ -16,8 +16,11 @@ class ChildProduct(Model):
     """
     The product documentation.
 
-    :param const_property: Constant string. Default value: "constant" .
-    :type const_property: str
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar const_property: Constant string. Default value: "constant" .
+    :vartype const_property: str
     :param count: Count
     :type count: int
     """ 
@@ -31,6 +34,7 @@ class ChildProduct(Model):
         'count': {'key': 'count', 'type': 'int'},
     }
 
+    const_property = "constant"
+
     def __init__(self, count=None):
-        self.const_property = "constant"
         self.count = count
diff --git a/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/Validation/autorestvalidationtest/models/constant_product.py b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/Validation/autorestvalidationtest/models/constant_product.py
index 14f416cef6f00..cb4531c4ec1aa 100644
--- a/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/Validation/autorestvalidationtest/models/constant_product.py
+++ b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/Validation/autorestvalidationtest/models/constant_product.py
@@ -16,10 +16,13 @@ class ConstantProduct(Model):
     """
     The product documentation.
 
-    :param const_property: Constant string. Default value: "constant" .
-    :type const_property: str
-    :param const_property2: Constant string2. Default value: "constant2" .
-    :type const_property2: str
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar const_property: Constant string. Default value: "constant" .
+    :vartype const_property: str
+    :ivar const_property2: Constant string2. Default value: "constant2" .
+    :vartype const_property2: str
     """ 
 
     _validation = {
@@ -32,6 +35,6 @@ class ConstantProduct(Model):
         'const_property2': {'key': 'constProperty2', 'type': 'str'},
     }
 
-    def __init__(self):
-        self.const_property = "constant"
-        self.const_property2 = "constant2"
+    const_property = "constant"
+
+    const_property2 = "constant2"
diff --git a/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/Validation/autorestvalidationtest/models/product.py b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/Validation/autorestvalidationtest/models/product.py
index c9577fa07f23d..65d49c5d12e17 100644
--- a/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/Validation/autorestvalidationtest/models/product.py
+++ b/AutoRest/Generators/Python/Python.Tests/Expected/AcceptanceTests/Validation/autorestvalidationtest/models/product.py
@@ -9,6 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
+from .constant_product import ConstantProduct
 from msrest.serialization import Model
 
 
@@ -16,6 +17,9 @@ class Product(Model):
     """
     The product documentation.
 
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
     :param display_names: Non required array of unique items from 0 to 6
      elements.
     :type display_names: list of str
@@ -26,13 +30,13 @@ class Product(Model):
     :param child:
     :type child: :class:`ChildProduct
      <fixtures.acceptancetestsvalidation.models.ChildProduct>`
-    :param const_child:
-    :type const_child: :class:`ConstantProduct
+    :ivar const_child:
+    :vartype const_child: :class:`ConstantProduct
      <fixtures.acceptancetestsvalidation.models.ConstantProduct>`
-    :param const_int: Constant int. Default value: 0 .
-    :type const_int: int
-    :param const_string: Constant string. Default value: "constant" .
-    :type const_string: str
+    :ivar const_int: Constant int. Default value: 0 .
+    :vartype const_int: int
+    :ivar const_string: Constant string. Default value: "constant" .
+    :vartype const_string: str
     :param const_string_as_enum: Constant string as Enum. Possible values
      include: 'constant_string_as_enum'
     :type const_string_as_enum: str
@@ -59,12 +63,15 @@ class Product(Model):
         'const_string_as_enum': {'key': 'constStringAsEnum', 'type': 'EnumConst'},
     }
 
+    const_child = ConstantProduct()
+
+    const_int = 0
+
+    const_string = "constant"
+
     def __init__(self, child, display_names=None, capacity=None, image=None, const_string_as_enum=None):
         self.display_names = display_names
         self.capacity = capacity
         self.image = image
         self.child = child
-        self.const_child = None
-        self.const_int = 0
-        self.const_string = "constant"
         self.const_string_as_enum = const_string_as_enum
diff --git a/AutoRest/Generators/Python/Python.Tests/Python.Tests.pyproj b/AutoRest/Generators/Python/Python.Tests/Python.Tests.pyproj
index 551692fe3e198..b6cfb6ea96c3e 100644
--- a/AutoRest/Generators/Python/Python.Tests/Python.Tests.pyproj
+++ b/AutoRest/Generators/Python/Python.Tests/Python.Tests.pyproj
@@ -125,6 +125,10 @@
     <Folder Include="Expected\AcceptanceTests\BodyString\autorestswaggerbatservice\" />
     <Folder Include="Expected\AcceptanceTests\BodyString\autorestswaggerbatservice\models\" />
     <Folder Include="Expected\AcceptanceTests\BodyString\autorestswaggerbatservice\operations\" />
+    <Folder Include="Expected\AcceptanceTests\CustomBaseUriMoreOptions\" />
+    <Folder Include="Expected\AcceptanceTests\CustomBaseUriMoreOptions\autorestparameterizedcustomhosttestclient\" />
+    <Folder Include="Expected\AcceptanceTests\CustomBaseUriMoreOptions\autorestparameterizedcustomhosttestclient\models\" />
+    <Folder Include="Expected\AcceptanceTests\CustomBaseUriMoreOptions\autorestparameterizedcustomhosttestclient\operations\" />
     <Folder Include="Expected\AcceptanceTests\CustomBaseUri\" />
     <Folder Include="Expected\AcceptanceTests\CustomBaseUri\autorestparameterizedhosttestclient\" />
     <Folder Include="Expected\AcceptanceTests\CustomBaseUri\autorestparameterizedhosttestclient\models\" />
diff --git a/AutoRest/Generators/Python/Python/PythonCodeGenerator.cs b/AutoRest/Generators/Python/Python/PythonCodeGenerator.cs
index d987055d49f6f..8131b8cba6d34 100644
--- a/AutoRest/Generators/Python/Python/PythonCodeGenerator.cs
+++ b/AutoRest/Generators/Python/Python/PythonCodeGenerator.cs
@@ -16,7 +16,7 @@ namespace Microsoft.Rest.Generator.Python
 {
     public class PythonCodeGenerator : CodeGenerator
     {
-        private const string ClientRuntimePackage = "msrest version 0.2.0";
+        private const string ClientRuntimePackage = "msrest version 0.3.0";
 
         public PythonCodeGenerator(Settings settings) : base(settings)
         {
diff --git a/AutoRest/Generators/Python/Python/PythonCodeNamer.cs b/AutoRest/Generators/Python/Python/PythonCodeNamer.cs
index 4aebfb6378a11..11ae0801acce4 100644
--- a/AutoRest/Generators/Python/Python/PythonCodeNamer.cs
+++ b/AutoRest/Generators/Python/Python/PythonCodeNamer.cs
@@ -376,6 +376,10 @@ private static IType NormalizePrimaryType(PrimaryType primaryType)
             {
                 primaryType.Name = "Decimal";
             }
+            else if (primaryType.Type == KnownPrimaryType.UnixTime)
+            {
+                primaryType.Name = "long"; 
+            }
             else if (primaryType.Type == KnownPrimaryType.Object)  // Revisit here
             {
                 primaryType.Name = "object";
diff --git a/AutoRest/Generators/Python/Python/TemplateModels/MethodTemplateModel.cs b/AutoRest/Generators/Python/Python/TemplateModels/MethodTemplateModel.cs
index 5c47e7be1f83c..ee71dc5b08b4d 100644
--- a/AutoRest/Generators/Python/Python/TemplateModels/MethodTemplateModel.cs
+++ b/AutoRest/Generators/Python/Python/TemplateModels/MethodTemplateModel.cs
@@ -6,6 +6,7 @@
 using System.Globalization;
 using System.Linq;
 using System.Net;
+using System.Text.RegularExpressions;
 using Microsoft.Rest.Generator.ClientModel;
 using Microsoft.Rest.Generator.Python.TemplateModels;
 using Microsoft.Rest.Generator.Utilities;
@@ -31,6 +32,19 @@ public MethodTemplateModel(Method source, ServiceClient serviceClient)
                 OperationName = serviceClient.Name;
             }
             AddCustomHeader = true;
+            string formatter;
+            foreach (var parameter in LocalParameters)
+            {
+                if (string.IsNullOrWhiteSpace(parameter.DefaultValue))
+                {
+                    parameter.DefaultValue = PythonConstants.None;
+                }
+            }
+            foreach (Match m in Regex.Matches(Url, @"\{[\w]+:[\w]+\}"))
+            {
+                formatter = m.Value.Split(':').First() + '}';
+                Url = Url.Replace(m.Value, formatter);
+            }
         }
 
         public bool AddCustomHeader { get; private set; }
@@ -151,7 +165,7 @@ public virtual string MethodParameterDeclaration(bool addCustomHeaderParameters)
 
             foreach (var parameter in LocalParameters)
             {
-                if (parameter.IsRequired && parameter.DefaultValue.Equals(PythonConstants.None))
+                if (parameter.IsRequired && parameter.DefaultValue == PythonConstants.None)
                 {
                     requiredDeclarations.Add(parameter.Name);
                 }
diff --git a/AutoRest/Generators/Python/Python/TemplateModels/ModelTemplateModel.cs b/AutoRest/Generators/Python/Python/TemplateModels/ModelTemplateModel.cs
index dbd8fd040ff5f..2c43e7c092ca7 100644
--- a/AutoRest/Generators/Python/Python/TemplateModels/ModelTemplateModel.cs
+++ b/AutoRest/Generators/Python/Python/TemplateModels/ModelTemplateModel.cs
@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using System.Text;
 using Microsoft.Rest.Generator.ClientModel;
 using Microsoft.Rest.Generator.Python.TemplateModels;
 using Microsoft.Rest.Generator.Utilities;
@@ -48,6 +49,14 @@ public ModelTemplateModel(CompositeType source, ServiceClient serviceClient)
                 _parent = new ModelTemplateModel(source.BaseModelType, serviceClient);
             }
 
+            foreach (var property in ComposedProperties)
+            {
+                if (string.IsNullOrWhiteSpace(property.DefaultValue))
+                {
+                    property.DefaultValue = PythonConstants.None;
+                }
+            }
+
             if (this.IsPolymorphic)
             {
                 foreach (var modelType in ServiceClient.ModelTypes)
@@ -104,6 +113,10 @@ public IList<string> Validators
                     {
                         validation.Add("'constant': True");
                     }
+                    if (parameter.IsReadOnly)
+                    {
+                        validation.Add("'readonly': True");
+                    }
                     if (parameter.Constraints.Any())
                     {
                         validation.AddRange(BuildValidationParameters(parameter.Constraints));
@@ -190,6 +203,22 @@ public bool HasParent
             get { return this._parent != null; }
         }
 
+        public bool NeedsConstructor
+        {
+            get
+            {
+                var nonConstant = Properties.Where(p => !p.IsConstant);
+                if (nonConstant.Any())
+                {
+                    return true;
+                }
+                else
+                {
+                    return (HasParent || NeedsPolymorphicConverter);
+                }
+            }
+        }
+
         /// <summary>
         /// Provides the modelProperty documentation string along with default value if any.
         /// </summary>
@@ -202,11 +231,14 @@ public static string GetPropertyDocumentationString(Property property)
             {
                 throw new ArgumentNullException("property");
             }
-
             string docString = string.Format(CultureInfo.InvariantCulture, ":param {0}:", property.Name);
-
+            if (property.IsConstant || property.IsReadOnly)
+            {
+                docString = string.Format(CultureInfo.InvariantCulture, ":ivar {0}:", property.Name);
+            }
+            
             string documentation = property.Documentation;
-            if (!string.IsNullOrWhiteSpace(property.DefaultValue) && property.DefaultValue != PythonConstants.None)
+            if (property.DefaultValue != PythonConstants.None)
             {
                 if (documentation != null && !documentation.EndsWith(".", StringComparison.OrdinalIgnoreCase))
                 {
@@ -243,16 +275,43 @@ public IList<string> RequiredFieldsList
             }
         }
 
+        public IEnumerable<Property> ReadOnlyAttributes
+        {
+            get
+            {
+                return ComposedProperties.Where(p => p.IsConstant || p.IsReadOnly);
+            }
+        }
+
+        public IDictionary<string, IType> ComplexConstants
+        {
+            get
+            {
+                Dictionary<string, IType> complexConstant = new Dictionary<string, IType> ();
+                foreach (var property in Properties)
+                {
+                    if (property.IsConstant)
+                    {
+                        CompositeType compType = property.Type as CompositeType;
+                        if (compType != null)
+                        {
+                            complexConstant[property.Name] = compType;
+                        }
+                    }
+                }
+                return complexConstant;
+            }
+        }
+
         public virtual string SuperParameterDeclaration()
         {
             List<string> combinedDeclarations = new List<string>();
 
-            foreach (var property in ComposedProperties.Except(Properties))
+            foreach (var property in ComposedProperties.Except(Properties).Except(ReadOnlyAttributes))
             {
                 if (this.IsPolymorphic)
                     if (property.Name == this.BasePolymorphicDiscriminator)
                         continue;
-
                 combinedDeclarations.Add(string.Format(CultureInfo.InvariantCulture, "{0}={0}", property.Name));
             }
             return string.Join(", ", combinedDeclarations);
@@ -264,17 +323,13 @@ public virtual string MethodParameterDeclaration()
             List<string> requiredDeclarations = new List<string>();
             List<string> combinedDeclarations = new List<string>();
 
-            foreach (var property in ComposedProperties)
+            foreach (var property in ComposedProperties.Except(ReadOnlyAttributes))
             {
                 if (this.IsPolymorphic)
                     if (property.Name == this.BasePolymorphicDiscriminator)
                         continue;
 
-                if (property.IsConstant)
-                {
-                    continue;
-                }
-                if (property.IsRequired && property.DefaultValue.Equals(PythonConstants.None))
+                if (property.IsRequired && property.DefaultValue == PythonConstants.None)
                 {
                     requiredDeclarations.Add(property.Name);
                 }
@@ -363,9 +418,20 @@ public string InitializeProperty(string objectName, Property property)
             {
                 throw new ArgumentNullException("property");
             }
+            if (property.IsReadOnly)
+            {
+                return string.Format(CultureInfo.InvariantCulture, "{0}.{1} = None", objectName, property.Name);
+            }
             if (property.IsConstant)
             {
-                return string.Format(CultureInfo.InvariantCulture, "{0}.{1} = {2}", objectName, property.Name, property.DefaultValue);
+                if (ComplexConstants.ContainsKey(property.Name))
+                {
+                    return string.Format(CultureInfo.InvariantCulture, "{0} = {1}()", property.Name, property.Type.Name);
+                }
+                else
+                {
+                    return string.Format(CultureInfo.InvariantCulture, "{0} = {1}", property.Name, property.DefaultValue);
+                }
             }
             if (IsPolymorphic)
             {
diff --git a/AutoRest/Generators/Python/Python/TemplateModels/ServiceClientTemplateModel.cs b/AutoRest/Generators/Python/Python/TemplateModels/ServiceClientTemplateModel.cs
index 4eb487cdfdee5..60629ea26ca28 100644
--- a/AutoRest/Generators/Python/Python/TemplateModels/ServiceClientTemplateModel.cs
+++ b/AutoRest/Generators/Python/Python/TemplateModels/ServiceClientTemplateModel.cs
@@ -105,7 +105,10 @@ public virtual string RequiredConstructorParameters
             }
         }
 
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "ValueError"), System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", MessageId = "Microsoft.Rest.Generator.Utilities.IndentedStringBuilder.AppendLine(System.String)")]
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "ValueError"),
+            System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "TypeError"),
+            System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "str"),
+            System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", MessageId = "Microsoft.Rest.Generator.Utilities.IndentedStringBuilder.AppendLine(System.String)")]
         public virtual string ValidateRequiredParameters
         {
             get
@@ -118,9 +121,31 @@ public virtual string ValidateRequiredParameters
                         builder.
                             AppendFormat("if {0} is None:", property.Name.ToPythonCase()).AppendLine().
                             Indent().
-                                AppendLine(string.Format(CultureInfo.InvariantCulture, "raise ValueError('{0} must not be None.')", property.Name.ToPythonCase())).
+                                AppendLine(string.Format(CultureInfo.InvariantCulture, "raise ValueError(\"Parameter '{0}' must not be None.\")", property.Name.ToPythonCase())).
                             Outdent();
+                        if (property.Type.IsPrimaryType(KnownPrimaryType.String))
+                        {
+                            builder.
+                                AppendFormat("if not isinstance({0}, str):", property.Name.ToPythonCase()).AppendLine().
+                                Indent().
+                                    AppendLine(string.Format(CultureInfo.InvariantCulture, "raise TypeError(\"Parameter '{0}' must be str.\")", property.Name.ToPythonCase())).
+                                Outdent();
+                        }
                     }
+                    else
+                    {
+                        if (property.Type.IsPrimaryType(KnownPrimaryType.String))
+                        {
+                            builder.
+                                AppendFormat("if {0} is not None and not isinstance({0}, str):", property.Name.ToPythonCase()).AppendLine().
+                                Indent().
+                                    AppendLine(string.Format(CultureInfo.InvariantCulture, "raise TypeError(\"Optional parameter '{0}' must be str.\")", property.Name.ToPythonCase())).
+                                Outdent();
+                        }
+
+                    }
+                    
+
                 }
                 return builder.ToString();
             }
diff --git a/AutoRest/Generators/Python/Python/Templates/ModelTemplate.cshtml b/AutoRest/Generators/Python/Python/Templates/ModelTemplate.cshtml
index 40ee94f75cb4b..17e86079f9cfd 100644
--- a/AutoRest/Generators/Python/Python/Templates/ModelTemplate.cshtml
+++ b/AutoRest/Generators/Python/Python/Templates/ModelTemplate.cshtml
@@ -11,6 +11,13 @@
 @Header("# ").TrimMultilineHeader()
 # --------------------------------------------------------------------------
 @EmptyLine
+@if(Model.ComplexConstants.Any())
+{
+    foreach(var property in Model.ComplexConstants.Values)
+    {
+@:from .@property.Name.ToPythonCase() import @property.Name
+    }
+}
 @if (Model.BaseModelType != null)
 {
 @:from .@Model.BaseModelType.Name.ToPythonCase() import @Model.BaseModelType.Name
@@ -42,14 +49,26 @@ else
 {
 @:    """@(Model.Name)
 }
+@if (Model.ReadOnlyAttributes.Any())
+{
+@EmptyLine
+@:    @WrapComment(string.Empty, "Variables are only populated by the server, and will be ignored when sending a request.")
+}
 @if (Model.ComposedProperties.Any())
 {
 @EmptyLine
-  foreach (var property in Model.ComposedProperties)
-  {
+    foreach (var property in Model.ComposedProperties)
+    {
 @:    @ParameterWrapComment(string.Empty, ModelTemplateModel.GetPropertyDocumentationString(property))
+        if (property.IsConstant || property.IsReadOnly)
+        {
+@:    @ParameterWrapComment(string.Empty, ":vartype " + property.Name + ": " + Model.GetPropertyDocumentationType(property.Type))
+    }
+        else
+        {
 @:    @ParameterWrapComment(string.Empty, ":type " + property.Name + ": " + Model.GetPropertyDocumentationType(property.Type))
-  }
+        }
+    }
 }
     """ 
 @if (Model.Validators.Any() || Model.RequiredFieldsList.Any())
@@ -89,26 +108,37 @@ else
     }
 </text>
 }
-@EmptyLine
-    def __init__(self@(Model.MethodParameterDeclaration())):
-@if (Model.HasParent)
+@foreach(var property in Model.Properties)
 {
-        @:super(@(Model.Name), self).__init__(@(Model.SuperParameterDeclaration()))
+    if (property.IsConstant)
+    {
+@EmptyLine
+    @:@(Model.InitializeProperty(String.Empty, property))
+    }
 }
-@{
-	var propertyList = new List<Property>(Model.Properties);
-	if (propertyList.Count > 0)
-	{
-	  for (int i = 0; i < propertyList.Count; i++)
-	  {
+@if (Model.NeedsConstructor)
+{ 
+@EmptyLine
+    @:def __init__(self@(Model.MethodParameterDeclaration())):
+    if (Model.HasParent)
+    {
+        @:super(@(Model.Name), self).__init__(@(Model.SuperParameterDeclaration()))
+    }
+    var propertyList = new List<Property>(Model.Properties);
+    if (propertyList.Count > 0)
+    {
+        for (int i = 0; i < propertyList.Count; i++)
+        {
+            if (!propertyList[i].IsConstant)
+            {
         @:@(Model.InitializeProperty("self", propertyList[i]))
-	  }
+            }
+	    }
 	}
-}
-
-@if (Model.NeedsPolymorphicConverter)
-{
+    if (Model.NeedsPolymorphicConverter)
+    {
         @:self.@Model.BasePolymorphicDiscriminator = '@Model.SerializedName'
+    }
 }
 @if (Model.IsException)
 {
diff --git a/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/custom_base_uri_more_spec.rb b/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/custom_base_uri_more_spec.rb
new file mode 100644
index 0000000000000..29a5dff237a7f
--- /dev/null
+++ b/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/custom_base_uri_more_spec.rb
@@ -0,0 +1,39 @@
+# encoding: utf-8
+
+$: << 'RspecTests/Generated/custom_base_uri_more'
+
+require 'custom_base_url_more_options'
+require 'uri'
+
+module CustomBaseUriMoreModule
+  describe 'Custom base uri more options' do
+    before(:all) do
+      url = URI(ENV['StubServerURI'])
+      @vault = "http://#{url.host}"
+      @key_name = "key1"
+
+      dummyToken = 'dummy12321343423'
+      @credentials = MsRest::TokenCredentials.new(dummyToken)
+
+      client = CustomBaseUriMoreModule::AutoRestParameterizedCustomHostTestClient.new(@credentials)
+      client.subscription_id = 'test12'
+      client.instance_variable_set("@dns_suffix", ":#{url.port.to_s}")
+      @custom_base_url_client =  CustomBaseUriMoreModule::Paths.new(client)
+    end
+
+    it 'should get empty' do
+      result = @custom_base_url_client.get_empty_async(@vault, '', @key_name).value!
+      expect(result.response.status).to eq(200)
+    end
+
+    it 'should throw on nil vault or secret' do
+      expect {
+        @custom_base_url_client.get_empty_async(nil, nil, @key_name).value!
+      }.to raise_error(ArgumentError)
+
+      expect {
+        @custom_base_url_client.get_empty_async(@vault, nil, @key_name).value!
+      }.to raise_error(ArgumentError)
+    end
+  end
+end
diff --git a/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/custom_base_uri_spec.rb b/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/custom_base_uri_spec.rb
new file mode 100644
index 0000000000000..c3eb81c719d54
--- /dev/null
+++ b/AutoRest/Generators/Ruby/Azure.Ruby.Tests/RspecTests/custom_base_uri_spec.rb
@@ -0,0 +1,33 @@
+# encoding: utf-8
+
+$: << 'RspecTests/Generated/custom_base_uri'
+
+require 'custom_base_url'
+require 'uri'
+
+module CustomBaseUriModule
+  describe 'Custom base uri' do
+    before(:all) do
+      url = URI(ENV['StubServerURI'])
+      @account_name = url.host
+
+      dummyToken = 'dummy12321343423'
+      @credentials = MsRest::TokenCredentials.new(dummyToken)
+
+      client = CustomBaseUriModule::AutoRestParameterizedHostTestClient.new(@credentials)
+      client.instance_variable_set("@host", ":#{url.port.to_s}")
+      @custom_base_url_client =  CustomBaseUriModule::Paths.new(client)
+    end
+
+    it 'should get empty' do
+      result = @custom_base_url_client.get_empty_async(@account_name).value!
+      expect(result.response.status).to eq(200)
+    end
+
+    it 'should throw on nil account name' do
+      expect {
+        @custom_base_url_client.get_empty_async(nil).value!
+      }.to raise_error(ArgumentError)
+    end
+  end
+end
diff --git a/AutoRest/Generators/Ruby/Azure.Ruby/AzureClientModelExtensions.cs b/AutoRest/Generators/Ruby/Azure.Ruby/AzureClientModelExtensions.cs
index 13a93416ce55d..61699fbef07be 100644
--- a/AutoRest/Generators/Ruby/Azure.Ruby/AzureClientModelExtensions.cs
+++ b/AutoRest/Generators/Ruby/Azure.Ruby/AzureClientModelExtensions.cs
@@ -68,6 +68,11 @@ public static class AzureClientModelExtensions
                 {
                     return builder.AppendLine("{0} = DateTime.parse({0}) unless {0}.to_s.empty?", valueReference).ToString();
                 }
+
+                if (primary.Type == KnownPrimaryType.UnixTime)
+                {
+                    return builder.AppendLine("{0} = DateTime.strptime({0}.to_s, '%s') unless {0}.to_s.empty?", valueReference).ToString();
+                }
             }
             else if (enumType != null && !string.IsNullOrEmpty(enumType.Name))
             {
@@ -175,6 +180,11 @@ public static class AzureClientModelExtensions
                 {
                     return builder.AppendLine("{0} = {0}.new_offset(0).strftime('%a, %d %b %Y %H:%M:%S GMT')", valueReference).ToString();
                 }
+
+                if (primary.Type == KnownPrimaryType.UnixTime)
+                {
+                    return builder.AppendLine("{0} = {0}.new_offset(0).strftime('%s')", valueReference).ToString();
+                }
             }
             else if (sequence != null)
             {
diff --git a/AutoRest/Generators/Ruby/Azure.Ruby/Templates/AzureMethodTemplate.cshtml b/AutoRest/Generators/Ruby/Azure.Ruby/Templates/AzureMethodTemplate.cshtml
index 55a987c34f994..ce6484d4ba299 100644
--- a/AutoRest/Generators/Ruby/Azure.Ruby/Templates/AzureMethodTemplate.cshtml
+++ b/AutoRest/Generators/Ruby/Azure.Ruby/Templates/AzureMethodTemplate.cshtml
@@ -42,7 +42,7 @@ def @(Model.Name)(@(Model.MethodParameterDeclaration))
 
    @EmptyLine
    # Waiting for response.
-   @(Model.ClientReference).get_post_or_delete_operation_result(response, deserialize_method)
+   @(Model.ClientReference).get_long_running_operation_result(response, deserialize_method)
   end
 
   @EmptyLine
@@ -84,7 +84,7 @@ def @(Model.Name)(@(Model.MethodParameterDeclaration))
 
     @EmptyLine
     # Waiting for response.
-    @(Model.ClientReference).get_put_operation_result(response, deserialize_method)
+    @(Model.ClientReference).get_long_running_operation_result(response, deserialize_method)
   end
 
   @EmptyLine
diff --git a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/integer_spec.rb b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/integer_spec.rb
index 2d118b8531760..f7556f6741a20 100644
--- a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/integer_spec.rb
+++ b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/integer_spec.rb
@@ -67,11 +67,33 @@
 
   it 'should get null' do
     result = @int_client.get_null_async().value!
-	  expect(result.response.status).to eq(200)
-	  expect(result.body).to eq(nil)
+    expect(result.response.status).to eq(200)
+    expect(result.body).to eq(nil)
   end
 
   it 'should get invalid' do
     expect{ @int_client.get_invalid_async().value! }.to raise_error(MsRest::DeserializationError)
   end
+
+  it 'should put unix time' do
+    result = @int_client.put_unix_time_date_async(DateTime.new(2016, 4, 13, 0, 0, 0, 'Z')).value!
+    expect(result.response.status).to eq(200)
+    expect(result.body).to eq(nil)
+  end
+
+  it 'should get unix time' do
+    result = @int_client.get_unix_time_async().value!
+    expect(result.response.status).to eq(200)
+    expect(result.body).to eq(DateTime.new(2016, 4, 13, 0, 0, 0, 'Z'))
+  end
+
+  it 'should get null unix time' do
+    result = @int_client.get_null_unix_time_async().value!
+    expect(result.response.status).to eq(200)
+    expect(result.body).to eq(nil)
+  end
+
+  it 'should get invalid unix time' do
+    expect{ @int_client.get_invalid_unix_time_async().value! }.to raise_error(MsRest::DeserializationError)
+  end
 end
\ No newline at end of file
diff --git a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/path_spec.rb b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/path_spec.rb
index 7e7dc17b5f733..3c2676513fc9f 100644
--- a/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/path_spec.rb
+++ b/AutoRest/Generators/Ruby/Ruby.Tests/RspecTests/path_spec.rb
@@ -15,6 +15,8 @@
 
     client = AutoRestUrlTestService.new(@credentials, @base_url)
     @paths_client = Paths.new(client)
+
+    @array_path = ['ArrayPath1', "begin!*'();:@ &=+$,/?#[]end", nil, '']
   end
 
   it 'should create test service' do
@@ -124,4 +126,9 @@
     result = @paths_client.date_time_null_async('null').value!
     expect(result.response.status).to eq(200)
   end
+
+  it 'should get array csv in path' do
+    result = @paths_client.array_csv_in_path_async(@array_path).value!
+    expect(result.response.status).to eq(200)
+  end
 end
\ No newline at end of file
diff --git a/AutoRest/Generators/Ruby/Ruby/ClientModelExtensions.cs b/AutoRest/Generators/Ruby/Ruby/ClientModelExtensions.cs
index 8a055ed3fe45a..853c37f8ea7e7 100644
--- a/AutoRest/Generators/Ruby/Ruby/ClientModelExtensions.cs
+++ b/AutoRest/Generators/Ruby/Ruby/ClientModelExtensions.cs
@@ -313,6 +313,11 @@ public static bool HasModelTypes(this ServiceClient client)
                 {
                     return builder.AppendLine("{0} = DateTime.parse({0}) unless {0}.to_s.empty?", valueReference).ToString();
                 }
+
+                if (primary.Type == KnownPrimaryType.UnixTime)
+                {
+                    return builder.AppendLine("{0} = DateTime.strptime({0}.to_s, '%s') unless {0}.to_s.empty?", valueReference).ToString();
+                }
             }
             else if (enumType != null && !string.IsNullOrEmpty(enumType.Name))
             {
@@ -415,6 +420,11 @@ public static bool HasModelTypes(this ServiceClient client)
                 {
                     return builder.AppendLine("{0} = {0}.new_offset(0).strftime('%a, %d %b %Y %H:%M:%S GMT')", valueReference).ToString();
                 }
+
+                if (primary.Type == KnownPrimaryType.UnixTime)
+                {
+                    return builder.AppendLine("{0} = {0}.new_offset(0).strftime('%s')", valueReference).ToString();
+                }
             }
             else if (sequence != null)
             {
diff --git a/AutoRest/Generators/Ruby/Ruby/RubyCodeGenerator.cs b/AutoRest/Generators/Ruby/Ruby/RubyCodeGenerator.cs
index 5b875665dfa92..368888b082657 100644
--- a/AutoRest/Generators/Ruby/Ruby/RubyCodeGenerator.cs
+++ b/AutoRest/Generators/Ruby/Ruby/RubyCodeGenerator.cs
@@ -111,24 +111,25 @@ public override string ImplementationFileExtension
         /// <summary>
         /// Normalizes client model by updating names and types to be language specific.
         /// </summary>
-        /// <param name="serviceClientModel"></param>
-        public override void NormalizeClientModel(ServiceClient serviceClientModel)
+        /// <param name="serviceClient"></param>
+        public override void NormalizeClientModel(ServiceClient serviceClient)
         {
-            PopulateAdditionalProperties(serviceClientModel);
-            CodeNamer.NormalizeClientModel(serviceClientModel);
-            CodeNamer.ResolveNameCollisions(serviceClientModel, Settings.Namespace,
+            Extensions.ProcessParameterizedHost(serviceClient, Settings);
+            PopulateAdditionalProperties(serviceClient);
+            CodeNamer.NormalizeClientModel(serviceClient);
+            CodeNamer.ResolveNameCollisions(serviceClient, Settings.Namespace,
                 Settings.Namespace + "::Models");
         }
 
         /// <summary>
         /// Adds special properties to the service client (e.g. credentials).
         /// </summary>
-        /// <param name="serviceClientModel">The service client.</param>
-        private void PopulateAdditionalProperties(ServiceClient serviceClientModel)
+        /// <param name="serviceClient">The service client.</param>
+        private void PopulateAdditionalProperties(ServiceClient serviceClient)
         {
             if (Settings.AddCredentials)
             {
-                serviceClientModel.Properties.Add(new Property
+                serviceClient.Properties.Add(new Property
                 {
                     Name = "Credentials",
                     Type = new PrimaryType(KnownPrimaryType.Credentials),
diff --git a/AutoRest/Generators/Ruby/Ruby/RubyCodeNamer.cs b/AutoRest/Generators/Ruby/Ruby/RubyCodeNamer.cs
index bcb90309c677e..3709e888fdb8c 100644
--- a/AutoRest/Generators/Ruby/Ruby/RubyCodeNamer.cs
+++ b/AutoRest/Generators/Ruby/Ruby/RubyCodeNamer.cs
@@ -372,6 +372,10 @@ private IType NormalizePrimaryType(PrimaryType primaryType)
             {
                 primaryType.Name = "Duration";
             }
+            else if (primaryType.Type == KnownPrimaryType.UnixTime)
+            {
+                primaryType.Name = "DateTime";
+            }
             else if (primaryType.Type == KnownPrimaryType.Object)
             {
                 primaryType.Name = "Object";
diff --git a/AutoRest/Generators/Ruby/Ruby/TemplateModels/MethodTemplateModel.cs b/AutoRest/Generators/Ruby/Ruby/TemplateModels/MethodTemplateModel.cs
index f66881e9294be..e51e53727c910 100644
--- a/AutoRest/Generators/Ruby/Ruby/TemplateModels/MethodTemplateModel.cs
+++ b/AutoRest/Generators/Ruby/Ruby/TemplateModels/MethodTemplateModel.cs
@@ -1,10 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Net;
+using System.Text.RegularExpressions;
 using Microsoft.Rest.Generator.ClientModel;
 using Microsoft.Rest.Generator.Ruby.TemplateModels;
 using Microsoft.Rest.Generator.Utilities;
@@ -29,6 +31,173 @@ public MethodTemplateModel(Method source, ServiceClient serviceClient)
             ServiceClient = serviceClient;
         }
 
+        /// <summary>
+        /// Gets the return type name for the underlying interface method
+        /// </summary>
+        public virtual string OperationResponseReturnTypeString
+        {
+            get
+            {
+                return "MsRest::HttpOperationResponse";
+            }
+        }
+
+        /// <summary>
+        /// Gets the type for operation exception
+        /// </summary>
+        public virtual string OperationExceptionTypeString
+        {
+            get
+            {
+                return "MsRest::HttpOperationError";
+            }
+        }
+
+        /// <summary>
+        /// Gets the code required to initialize response body.
+        /// </summary>
+        public virtual string InitializeResponseBody
+        {
+            get { return string.Empty; }
+        }
+
+        /// <summary>
+        /// Gets the list of namespaces where we look for classes that need to
+        /// be instantiated dynamically due to polymorphism.
+        /// </summary>
+        public virtual List<string> ClassNamespaces
+        {
+            get
+            {
+                return new List<string> { };
+            }
+        }
+
+        /// <summary>
+        /// Gets the path parameters as a Ruby dictionary string
+        /// </summary>
+        public virtual string PathParamsRbDict
+        {
+            get
+            {
+                return ParamsToRubyDict(EncodingPathParams);
+            }
+        }
+
+        /// <summary>
+        /// Gets the skip encoding path parameters as a Ruby dictionary string
+        /// </summary>
+        public virtual string SkipEncodingPathParamsRbDict
+        {
+            get
+            {
+                return ParamsToRubyDict(SkipEncodingPathParams);
+            }
+        }
+
+        /// <summary>
+        /// Gets the query parameters as a Ruby dictionary string
+        /// </summary>
+        public virtual string QueryParamsRbDict
+        {
+            get
+            {
+                return ParamsToRubyDict(EncodingQueryParams);
+            }
+        }
+
+        /// <summary>
+        /// Gets the skip encoding query parameters as a Ruby dictionary string
+        /// </summary>
+        public virtual string SkipEncodingQueryParamsRbDict
+        {
+            get
+            {
+                return ParamsToRubyDict(SkipEncodingQueryParams);
+            }
+        }
+
+        /// <summary>
+        /// Gets the path parameters not including the params that skip encoding
+        /// </summary>
+        public virtual IEnumerable<ParameterTemplateModel> EncodingPathParams
+        {
+            get { return AllPathParams.Where(p => !(p.Extensions.ContainsKey(Generator.Extensions.SkipUrlEncodingExtension) &&
+                    String.Equals(p.Extensions[Generator.Extensions.SkipUrlEncodingExtension].ToString(), "true", StringComparison.OrdinalIgnoreCase))); }
+        }
+
+        /// <summary>
+        /// Gets the skip encoding path parameters
+        /// </summary>
+        public virtual IEnumerable<ParameterTemplateModel> SkipEncodingPathParams
+        {
+            get
+            {
+                return AllPathParams.Where(p => 
+                    (p.Extensions.ContainsKey(Generator.Extensions.SkipUrlEncodingExtension) &&
+                    String.Equals(p.Extensions[Generator.Extensions.SkipUrlEncodingExtension].ToString(), "true", StringComparison.OrdinalIgnoreCase) &&
+                    !p.Extensions.ContainsKey("hostParameter")));
+            }
+        }
+
+        /// <summary>
+        /// Gets all path parameters
+        /// </summary>
+        public virtual IEnumerable<ParameterTemplateModel> AllPathParams
+        {
+            get { return ParameterTemplateModels.Where(p => p.Location == ParameterLocation.Path); }
+        }
+
+        /// <summary>
+        /// Gets the skip encoding query parameters
+        /// </summary>
+        public virtual IEnumerable<ParameterTemplateModel> SkipEncodingQueryParams
+        {
+            get { return AllQueryParams.Where(p => p.Extensions.ContainsKey(Generator.Extensions.SkipUrlEncodingExtension)); }
+        }
+
+        /// <summary>
+        /// Gets the query parameters not including the params that skip encoding
+        /// </summary>
+        public virtual IEnumerable<ParameterTemplateModel> EncodingQueryParams
+        {
+            get { return AllQueryParams.Where(p => !p.Extensions.ContainsKey(Generator.Extensions.SkipUrlEncodingExtension)); }
+        }
+
+        /// <summary>
+        /// Gets all of the query parameters
+        /// </summary>
+        public virtual IEnumerable<ParameterTemplateModel> AllQueryParams
+        {
+            get { return ParameterTemplateModels.Where(p => p.Location == ParameterLocation.Query); }
+        }
+
+        /// <summary>
+        /// Gets the list of middelwares required for HTTP requests.
+        /// </summary>
+        public virtual IList<string> FaradayMiddlewares
+        {
+            get
+            {
+                return new List<string>()
+                {
+                    "[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02]",
+                    "[:cookie_jar]"
+                };
+            }
+        }
+
+        /// <summary>
+        /// Gets the expression for default header setting.
+        /// </summary>
+        public virtual string SetDefaultHeaders
+        {
+            get
+            {
+                return string.Empty;
+            }
+        }
+
         /// <summary>
         /// Gets the reference to the service client object.
         /// </summary>
@@ -38,7 +207,7 @@ public MethodTemplateModel(Method source, ServiceClient serviceClient)
         /// Gets the list of method paramater templates.
         /// </summary>
         public List<ParameterTemplateModel> ParameterTemplateModels { get; private set; }
-
+        
         /// <summary>
         /// Gets the list of parameter which need to be included into HTTP header.
         /// </summary>
@@ -102,14 +271,11 @@ public string MethodParameterDeclaration
                             PrimaryType type = parameter.Type as PrimaryType;
                             if (type != null)
                             {
-                                if (type.Type == KnownPrimaryType.Boolean || type.Type == KnownPrimaryType.Double || type.Type == KnownPrimaryType.Int || type.Type == KnownPrimaryType.Long)
+                                if (type.Type == KnownPrimaryType.Boolean || type.Type == KnownPrimaryType.Double || 
+                                    type.Type == KnownPrimaryType.Int || type.Type == KnownPrimaryType.Long || type.Type == KnownPrimaryType.String)
                                 {
                                     format = "{0} = " + parameter.DefaultValue;
                                 }
-                                else if (type.Type == KnownPrimaryType.String)
-                                {
-                                    format = "{0} = \"" + parameter.DefaultValue + "\"";
-                                }
                             }
                         }
                     }
@@ -152,48 +318,6 @@ public IEnumerable<ParameterTemplateModel> LocalParameters
             }
         }
 
-        /// <summary>
-        /// Gets the return type name for the underlying interface method
-        /// </summary>
-        public virtual string OperationResponseReturnTypeString
-        {
-            get
-            {
-                return "MsRest::HttpOperationResponse";
-            }
-        }
-
-        /// <summary>
-        /// Gets the type for operation exception
-        /// </summary>
-        public virtual string OperationExceptionTypeString
-        {
-            get
-            {
-                return "MsRest::HttpOperationError";
-            }
-        }
-
-        /// <summary>
-        /// Gets the code required to initialize response body.
-        /// </summary>
-        public virtual string InitializeResponseBody
-        {
-            get { return string.Empty; }
-        }
-
-        /// <summary>
-        /// Gets the list of namespaces where we look for classes that need to
-        /// be instantiated dynamically due to polymorphism.
-        /// </summary>
-        public virtual List<string> ClassNamespaces
-        {
-            get
-            {
-                return new List<string> { };
-            }
-        }
-
         /// <summary>
         /// Get the method's request body (or null if there is no request body)
         /// </summary>
@@ -229,16 +353,6 @@ public bool UrlWithPath
             }
         }
 
-        /// <summary>
-        /// Gets the formatted status code.
-        /// </summary>
-        /// <param name="code">The status code.</param>
-        /// <returns>Formatted status code.</returns>
-        public string GetStatusCodeReference(HttpStatusCode code)
-        {
-            return string.Format("{0}", (int)code);
-        }
-
         /// <summary>
         /// Creates a code in form of string which deserializes given input variable of given type.
         /// </summary>
@@ -324,99 +438,52 @@ public virtual string RemoveDuplicateForwardSlashes(string urlVariableName)
 
             return builder.ToString();
         }
-        
+
         /// <summary>
-        /// Gets the path parameters as a Ruby dictionary string
+        /// Generate code to build the URL from a url expression and method parameters
         /// </summary>
-        public virtual string PathParamsRbDict
+        /// <param name="variableName">The variable to store the url in.</param>
+        /// <returns></returns>
+        public virtual string BuildUrl(string variableName)
         {
-            get
-            {
-                return ParamsToRubyDict(EncodingPathParams);
-            }
+            var builder = new IndentedStringBuilder("  ");
+            BuildPathParameters(variableName, builder);
+
+            return builder.ToString();
         }
-        
+
         /// <summary>
-        /// Gets the skip encoding path parameters as a Ruby dictionary string
+        /// Gets the formatted status code.
         /// </summary>
-        public virtual string SkipEncodingPathParamsRbDict
+        /// <param name="code">The status code.</param>
+        /// <returns>Formatted status code.</returns>
+        public string GetStatusCodeReference(HttpStatusCode code)
         {
-            get
-            {
-                return ParamsToRubyDict(SkipEncodingPathParams);
-            }
+            return string.Format("{0}", (int)code);
         }
-        
+
         /// <summary>
-        /// Gets the query parameters as a Ruby dictionary string
+        /// Generate code to replace path parameters in the url template with the appropriate values
         /// </summary>
-        public virtual string QueryParamsRbDict
+        /// <param name="variableName">The variable name for the url to be constructed</param>
+        /// <param name="builder">The string builder for url construction</param>
+        protected virtual void BuildPathParameters(string variableName, IndentedStringBuilder builder)
         {
-            get
+            if (builder == null)
             {
-                return ParamsToRubyDict(EncodingQueryParams);
+                throw new ArgumentNullException("builder");
             }
-        }
-        
-        /// <summary>
-        /// Gets the skip encoding query parameters as a Ruby dictionary string
-        /// </summary>
-        public virtual string SkipEncodingQueryParamsRbDict
-        {
-            get
+
+            IEnumerable<Parameter> pathParameters = LogicalParameters.Where(p => p.Extensions.ContainsKey("hostParameter") && p.Location == ParameterLocation.Path);
+
+            foreach (var pathParameter in pathParameters)
             {
-                return ParamsToRubyDict(SkipEncodingQueryParams);
+                var pathReplaceFormat = "{0} = {0}.gsub('{{{1}}}', {2})";
+                var urlPathName = UrlPathNameFromPathPattern(pathParameter.SerializedName);
+                builder.AppendLine(pathReplaceFormat, variableName, urlPathName, pathParameter.GetFormattedReferenceValue());
             }
         }
-        
-        /// <summary>
-        /// Gets the skip encoding path parameters
-        /// </summary>
-        public virtual IEnumerable<ParameterTemplateModel> SkipEncodingPathParams
-        {
-            get { return AllPathParams.Where(p => p.Extensions.ContainsKey(Generator.Extensions.SkipUrlEncodingExtension)); }
-        }
-        
-        /// <summary>
-        /// Gets the path parameters not including the params that skip encoding
-        /// </summary>
-        public virtual IEnumerable<ParameterTemplateModel> EncodingPathParams
-        {
-            get { return AllPathParams.Where(p => !p.Extensions.ContainsKey(Generator.Extensions.SkipUrlEncodingExtension)); }
-        }
-        
-        /// <summary>
-        /// Gets all path parameters
-        /// </summary>
-        public virtual IEnumerable<ParameterTemplateModel> AllPathParams
-        {
-            get { return ParameterTemplateModels.Where(p => p.Location == ParameterLocation.Path); }
-        }
-        
-        /// <summary>
-        /// Gets the skip encoding query parameters
-        /// </summary>
-        public virtual IEnumerable<ParameterTemplateModel> SkipEncodingQueryParams
-        {
-            get { return AllQueryParams.Where(p => p.Extensions.ContainsKey(Generator.Extensions.SkipUrlEncodingExtension)); }
-        }
-        
-        /// <summary>
-        /// Gets the query parameters not including the params that skip encoding
-        /// </summary>
-        public virtual IEnumerable<ParameterTemplateModel> EncodingQueryParams
-        {
-            get { return AllQueryParams.Where(p => !p.Extensions.ContainsKey(Generator.Extensions.SkipUrlEncodingExtension)); }
-        }
-        
-        /// <summary>
-        /// Gets all of the query parameters
-        /// </summary>
-        public virtual IEnumerable<ParameterTemplateModel> AllQueryParams
-        {
-            get { return ParameterTemplateModels.Where(p => p.Location == ParameterLocation.Query); }
-        }
-        
+
         /// <summary>
         /// Builds the parameters as a Ruby dictionary string
         /// </summary>
@@ -428,36 +495,27 @@ protected string ParamsToRubyDict(IEnumerable<ParameterTemplateModel> parameters
             foreach (var param in parameters)
             {
                 string variableName = param.Name;
-                encodedParameters.Add(string.Format("'{0}' => {1}", param.SerializedName, variableName));
+                string urlPathName = UrlPathNameFromPathPattern(param.SerializedName);
+                encodedParameters.Add(string.Format("'{0}' => {1}", urlPathName, param.GetFormattedReferenceValue()));
             }
-            
             return string.Format(CultureInfo.InvariantCulture, "{{{0}}}", string.Join(",", encodedParameters));
         }
 
         /// <summary>
-        /// Gets the list of middelwares required for HTTP requests.
-        /// </summary>
-        public virtual IList<string> FaradayMiddlewares
-        {
-            get
-            {
-                return new List<string>()
-                {
-                    "[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02]",
-                    "[:cookie_jar]"
-                };
-            }
-        }
-
-        /// <summary>
-        /// Gets the expression for default header setting.
+        /// Builds the url path parameter from the pattern if exists
         /// </summary>
-        public virtual string SetDefaultHeaders
+        /// <param name="urlPathParamName">Name of the path parameter to match.</param>
+        /// <returns>url path parameter as a string</returns>
+        private string UrlPathNameFromPathPattern(string urlPathParamName)
         {
-            get
+            string pat = @".*\{" + urlPathParamName + @"(\:\w+)\}";
+            Regex r = new Regex(pat);
+            Match m = r.Match(Url);
+            if (m.Success)
             {
-                return string.Empty;
+                urlPathParamName += m.Groups[1].Value;
             }
+            return urlPathParamName;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/AutoRest/Generators/Ruby/Ruby/TemplateModels/ServiceClientTemplateModel.cs b/AutoRest/Generators/Ruby/Ruby/TemplateModels/ServiceClientTemplateModel.cs
index d7d3bb2b3cec8..cc0fb64a65cf2 100644
--- a/AutoRest/Generators/Ruby/Ruby/TemplateModels/ServiceClientTemplateModel.cs
+++ b/AutoRest/Generators/Ruby/Ruby/TemplateModels/ServiceClientTemplateModel.cs
@@ -25,6 +25,7 @@ public ServiceClientTemplateModel(ServiceClient serviceClient)
             MethodTemplateModels = new List<MethodTemplateModel>();
             Methods.Where(m => m.Group == null)
                 .ForEach(m => MethodTemplateModels.Add(new MethodTemplateModel(m, serviceClient)));
+            this.IsCustomBaseUri = serviceClient.Extensions.ContainsKey(Microsoft.Rest.Generator.Extensions.ParameterizedHostExtension);
         }
 
         /// <summary>
@@ -37,6 +38,11 @@ public ServiceClientTemplateModel(ServiceClient serviceClient)
         /// </summary>
         public List<MethodTemplateModel> MethodTemplateModels { get; set; }
 
+        /// <summary>
+        /// Gets the flag indicating whether url is from x-ms-parameterized-host extension.
+        /// </summary>
+        public bool IsCustomBaseUri { get; private set; }
+
         /// <summary>
         /// Gets the list of modules/classes which need to be included.
         /// </summary>
diff --git a/AutoRest/Generators/Ruby/Ruby/Templates/MethodTemplate.cshtml b/AutoRest/Generators/Ruby/Ruby/Templates/MethodTemplate.cshtml
index 6b085d99c9ab8..b8d70fabe5b9a 100644
--- a/AutoRest/Generators/Ruby/Ruby/Templates/MethodTemplate.cshtml
+++ b/AutoRest/Generators/Ruby/Ruby/Templates/MethodTemplate.cshtml
@@ -101,7 +101,6 @@ def @(Model.Name)_async(@(Model.MethodParameterDeclaration))
   @:@(parameter.Type.ValidateType(Model.Scope, parameter.Name))
       }
 }
-
   request_headers = {}
 @if (Model.Parameters.Any(p => p.Location == ParameterLocation.Header))
 {
@@ -152,7 +151,12 @@ def @(Model.Name)_async(@(Model.MethodParameterDeclaration))
       headers: request_headers.merge(custom_headers || {})
   }
   
-  request = MsRest::HttpOperationRequest.new(@@base_url || @(Model.ClientReference).base_url, path_template, :@Model.HttpMethod.ToString().ToLower(), options)
+@EmptyLine
+  request_url = @@base_url || @(Model.ClientReference).base_url
+  @(Model.BuildUrl("request_url"))
+@EmptyLine
+
+  request = MsRest::HttpOperationRequest.new(request_url, path_template, :@Model.HttpMethod.ToString().ToLower(), options)
   promise = request.run_promise do |req|
     @(Model.ClientReference).credentials.sign_request(req) unless @(Model.ClientReference).credentials.nil?
   end
diff --git a/AutoRest/Generators/Ruby/Ruby/Templates/ServiceClientTemplate.cshtml b/AutoRest/Generators/Ruby/Ruby/Templates/ServiceClientTemplate.cshtml
index da18fb0e5a68a..1a049baf23861 100644
--- a/AutoRest/Generators/Ruby/Ruby/Templates/ServiceClientTemplate.cshtml
+++ b/AutoRest/Generators/Ruby/Ruby/Templates/ServiceClientTemplate.cshtml
@@ -23,7 +23,7 @@ module @Settings.Namespace
     @EmptyLine
 
     # @@return [String] the base URI of the service.
-    attr_accessor :base_url
+    @(Model.IsCustomBaseUri ? "attr_reader" : "attr_accessor") :base_url
 @EmptyLine
 
 @foreach (var property in Model.Properties)
@@ -43,12 +43,29 @@ module @Settings.Namespace
     #
     # Creates initializes a new instance of the @Model.Name class.
     # @@param credentials [MsRest::ServiceClientCredentials] credentials to authorize HTTP requests made by the service client.
-    # @@param base_url [String] the base URI of the service.
+    @if (!Model.IsCustomBaseUri)
+    {
+    @:# @@param base_url [String] the base URI of the service.
+    }
     # @@param options [Array] filters to be applied to the HTTP requests.
     #
-    def initialize(credentials, base_url = nil, options = nil)
+    @if (!Model.IsCustomBaseUri)
+    {
+    @:def initialize(credentials, base_url = nil, options = nil)
+    }
+    else
+    {
+    @:def initialize(credentials, options = nil)
+    }
       super(credentials, options)
-      @@base_url = base_url || '@Model.BaseUrl'
+      @if (!Model.IsCustomBaseUri)
+      {
+      @:@@base_url = base_url || '@Model.BaseUrl'
+      }
+      else
+      {
+      @:@@base_url = '@Model.BaseUrl'
+      }
       @EmptyLine
       fail ArgumentError, 'credentials is nil' if credentials.nil?
       fail ArgumentError, 'invalid type of credentials input parameter' unless credentials.is_a?(MsRest::ServiceClientCredentials)
diff --git a/AutoRest/Modelers/Swagger.Tests/SwaggerSpecHelper.cs b/AutoRest/Modelers/Swagger.Tests/SwaggerSpecHelper.cs
index ed656f10d44bc..0012a6f4892dc 100644
--- a/AutoRest/Modelers/Swagger.Tests/SwaggerSpecHelper.cs
+++ b/AutoRest/Modelers/Swagger.Tests/SwaggerSpecHelper.cs
@@ -89,6 +89,6 @@ private static void EnsureFilesMatch(string expectedFileContent, string actualFi
             {
                 Assert.Equal(expectedLines[i], actualLines[i]);
             }
-        }        
+        }
     }
 }
\ No newline at end of file
diff --git a/AutoRest/Modelers/Swagger/CollectionFormatBuilder.cs b/AutoRest/Modelers/Swagger/CollectionFormatBuilder.cs
index edfba8a2c1340..f9ee08f3c57f6 100644
--- a/AutoRest/Modelers/Swagger/CollectionFormatBuilder.cs
+++ b/AutoRest/Modelers/Swagger/CollectionFormatBuilder.cs
@@ -80,7 +80,7 @@ private static void AddCollectionFormat(SwaggerParameter swaggerParameter, Strin
                     break;
 
                 case CollectionFormat.Multi:
-                    // TODO multi is not supported yet: http://vstfrd:8080/Azure/RD/_workitems/edit/3172867
+                    // TODO multi is not supported yet: https://github.com/Azure/autorest/issues/717
                     throw new NotSupportedException(string.Format(CultureInfo.InvariantCulture, 
                         Resources.MultiCollectionFormatNotSupported,
                         swaggerParameter.Name));
diff --git a/AutoRest/Modelers/Swagger/Model/SwaggerObject.cs b/AutoRest/Modelers/Swagger/Model/SwaggerObject.cs
index 2ca86ef10d3e1..02bfb0d23b8bc 100644
--- a/AutoRest/Modelers/Swagger/Model/SwaggerObject.cs
+++ b/AutoRest/Modelers/Swagger/Model/SwaggerObject.cs
@@ -132,6 +132,10 @@ public PrimaryType ToType()
                     {
                         return new PrimaryType(KnownPrimaryType.Long);
                     }
+                    if (string.Equals("unixtime", Format, StringComparison.OrdinalIgnoreCase))
+                    {
+                        return new PrimaryType(KnownPrimaryType.UnixTime);
+                    }
                     return new PrimaryType(KnownPrimaryType.Int);
                 case DataType.Boolean:
                     return new PrimaryType(KnownPrimaryType.Boolean);
diff --git a/AutoRest/NugetPackageTest/packages.config b/AutoRest/NugetPackageTest/packages.config
index 356cf06d88364..6cc4944dba66b 100644
--- a/AutoRest/NugetPackageTest/packages.config
+++ b/AutoRest/NugetPackageTest/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Rest.ClientRuntime" version="2.2.0" targetFramework="net45" />
-  <package id="autorest" version="0.16.0" targetFramework="net45" />
+  <package id="autorest" version="0.17.0" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
   <package id="xunit" version="2.1.0" targetFramework="net45" />
   <package id="xunit.abstractions" version="2.0.0" targetFramework="net451" />
diff --git a/AutoRest/TestServer/server/app.js b/AutoRest/TestServer/server/app.js
index f0da0d60682c8..9453e73965c22 100644
--- a/AutoRest/TestServer/server/app.js
+++ b/AutoRest/TestServer/server/app.js
@@ -195,15 +195,6 @@ var coverage = {
   "getStringWithLeadingAndTrailingWhitespace" : 0,
   "putStringWithLeadingAndTrailingWhitespace" : 0,
   "getStringNotProvided": 0,
-  /* TODO: only C# and node.js support the base64url format currently. Exclude these tests from code coverage until it is implemented in other languages */
-  "getStringBase64Encoded": 1,
-  "getStringBase64UrlEncoded": 1,
-  "putStringBase64UrlEncoded": 1,
-  "getStringNullBase64UrlEncoding": 1,
-  "getArrayBase64Url": 1,
-  "getDictionaryBase64Url": 1,
-  "UrlPathsStringBase64Url": 1,
-  "UrlPathsArrayCSVInPath": 1,
   "getEnumNotExpandable": 0,
   "putEnumNotExpandable":0,
   "putComplexBasicValid": 0,
@@ -428,6 +419,8 @@ var coverage = {
   "ConstantsInPath": 0,
   "ConstantsInBody": 0,
   "CustomBaseUri": 0,
+  //Once all the languages implement this test, the scenario counter should be reset to zero. It is currently implemented in C# and node.js
+  "CustomBaseUriMoreOptions": 1,
   'getModelFlattenArray': 0,
   'putModelFlattenArray': 0,
   'getModelFlattenDictionary': 0,
@@ -436,7 +429,22 @@ var coverage = {
   'putModelFlattenResourceCollection': 0,
   'putModelFlattenCustomBase': 0,
   'postModelFlattenCustomParameter': 0,
-  'putModelFlattenCustomGroupedParameter': 0
+  'putModelFlattenCustomGroupedParameter': 0,
+  /* TODO: only C# and node.js support the base64url format currently. Exclude these tests from code coverage until it is implemented in other languages */
+  "getStringBase64Encoded": 1,
+  "getStringBase64UrlEncoded": 1,
+  "putStringBase64UrlEncoded": 1,
+  "getStringNullBase64UrlEncoding": 1,
+  "getArrayBase64Url": 1,
+  "getDictionaryBase64Url": 1,
+  "UrlPathsStringBase64Url": 1,
+  "UrlPathsArrayCSVInPath": 1,
+  /* TODO: only C# supports the unixtime format currently. Exclude these tests from code coverage until it is implemented in other languages */
+  "getUnixTime": 1,
+  "getInvalidUnixTime": 1,
+  "getNullUnixTime": 1,
+  "putUnixTime": 1,
+  "UrlPathsIntUnixTime": 1
 };
 
 // view engine setup
diff --git a/AutoRest/TestServer/server/routes/customUri.js b/AutoRest/TestServer/server/routes/customUri.js
index 2eee79cadfc33..85d074cdeceb2 100644
--- a/AutoRest/TestServer/server/routes/customUri.js
+++ b/AutoRest/TestServer/server/routes/customUri.js
@@ -9,6 +9,17 @@ var specials = function (coverage) {
       coverage['CustomBaseUri']++;
       res.status(200).end();
   });
+
+  router.get('/:subscriptionId/:keyName', function (req, res, next) {
+    if (req.params.subscriptionId === 'test12' && req.params.keyName === 'key1' 
+      && Object.keys(req.query).length == 1 && req.query.keyVersion === 'v1') {
+      coverage['CustomBaseUriMoreOptions']++;
+      res.status(200).end();
+    } else {
+      utils.send400(res, next, 'Either one of the path parameters (subscriptionId=test12, keyName=key1) or query parameter (keyVersion=v1) did not match. ' + 
+      	'Received parameters are: subscriptionId ' + subscriptionId + ', keyName ' + keyName + ', keyVersion ' + keyVersion);
+    }
+  });
 }
 
 specials.prototype.router = router;
diff --git a/AutoRest/TestServer/server/routes/int.js b/AutoRest/TestServer/server/routes/int.js
index 2299732ca5ad1..f4acbd7104cd2 100644
--- a/AutoRest/TestServer/server/routes/int.js
+++ b/AutoRest/TestServer/server/routes/int.js
@@ -65,10 +65,27 @@ var integer = function(coverage) {
         } else if (req.params.scenario === 'underflowint64') {
             coverage['getLongUnderflow']++;
             res.status(200).end('-9223372036854775910');
+        } else if (req.params.scenario === 'unixtime') {
+            coverage['getUnixTime']++;
+            res.status(200).end('1460505600');
+        } else if (req.params.scenario === 'invalidunixtime') {
+            coverage['getInvalidUnixTime']++;
+            res.status(200).end('123jkl');
+        } else if (req.params.scenario === 'nullunixtime') {
+            coverage['getNullUnixTime']++;
+            res.status(200).end();
         } else {
             res.status(400).send('Request path must contain true or false');
         }
-
+    });
+    
+    router.put('/unixtime', function(req, res, next) {
+          if (req.body != 1460505600) {
+              utils.send400(res, next, "Did not like the value provided for unixtime in the req " + util.inspect(req.body));
+          } else {
+              coverage['putUnixTime']++;
+              res.status(200).end();
+          }
     });
 }
 
diff --git a/AutoRest/TestServer/server/routes/lros.js b/AutoRest/TestServer/server/routes/lros.js
index 9d9dc540e16aa..ca11fa50082be 100644
--- a/AutoRest/TestServer/server/routes/lros.js
+++ b/AutoRest/TestServer/server/routes/lros.js
@@ -940,6 +940,17 @@ var lros = function (coverage) {
     res.status(400).end('{ "message" : "Error from the server" }');
   });
 
+  /* TODO: only C# has implemented this test. Exclude it from code coverage until it is implemented in other languages */
+  coverage['LRONonRetryPut201Creating400InvalidJson'] = 1;
+  router.put('/nonretryerror/put/201/creating/400/invalidjson', function (req, res, next) {
+      res.status(201).end('{ "properties": { "provisioningState": "Creating"}, "id": "100", "name": "foo" }');
+  });
+
+  router.get('/nonretryerror/put/201/creating/400/invalidjson', function (req, res, next) {
+      coverage['LRONonRetryPut201Creating400InvalidJson']++;
+      res.status(400).end('<{ "message" : "Error from the server" }');
+  });
+
   coverage['LRONonRetryPutAsyncRetry400'] = 0;
   router.put('/nonretryerror/putasync/retry/400', function (req, res, next) {
     var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/nonretryerror/putasync/retry/failed/operationResults/400';
diff --git a/AutoRest/TestServer/server/routes/paths.js b/AutoRest/TestServer/server/routes/paths.js
index ba1b8e99df9e6..04b5002453c3c 100644
--- a/AutoRest/TestServer/server/routes/paths.js
+++ b/AutoRest/TestServer/server/routes/paths.js
@@ -23,6 +23,7 @@ var scenarioMap = {
   "2012-01-01T01:01:01Z": "Valid",
   "green color" : "Valid",
   "bG9yZW0" : "Base64Url",
+  "1460505600": "UnixTime",
   "ArrayPath1,begin!*'();:@ &=+$,/?#[]end,,": "CSVInPath"
 };
 
diff --git a/AutoRest/TestServer/swagger/body-integer.json b/AutoRest/TestServer/swagger/body-integer.json
index 00b73a2c2731c..5f321e2981692 100644
--- a/AutoRest/TestServer/swagger/body-integer.json
+++ b/AutoRest/TestServer/swagger/body-integer.json
@@ -251,6 +251,95 @@
           }
         }
       }
+    },
+    "/int/unixtime": {
+      "get": {
+        "operationId": "int_getUnixTime",
+        "description": "Get datetime encoded as Unix time value",
+        "responses": {
+          "200": {
+            "description": "The date value encoded as Unix time",
+            "schema": {
+              "type": "integer",
+              "format": "unixtime"
+            }
+          },
+          "default": {
+            "description": "Unexpected error",
+            "schema": {
+              "$ref": "#/definitions/Error"
+            }
+          }
+        }
+      },
+      "put": {
+        "operationId": "int_putUnixTimeDate",
+        "description": "Put datetime encoded as Unix time",
+        "parameters": [
+          {
+            "name": "intBody",
+            "in": "body",
+            "schema": {
+              "type": "integer",
+              "format": "unixtime"
+            },
+            "required": true
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The datetime value encoded as Unix time"
+          },
+          "default": {
+            "description": "Unexpected error",
+            "schema": {
+              "$ref": "#/definitions/Error"
+            }
+          }
+        }
+      }
+    },
+    "/int/invalidunixtime": {
+      "get": {
+        "operationId": "int_getInvalidUnixTime",
+        "description": "Get invalid Unix time value",
+        "responses": {
+          "200": {
+            "description": "The invalid Unix time value",
+            "schema": {
+              "type": "integer",
+              "format": "unixtime"
+            }
+          },
+          "default": {
+            "description": "Unexpected error",
+            "schema": {
+              "$ref": "#/definitions/Error"
+            }
+          }
+        }
+      }
+    },
+    "/int/nullunixtime": {
+      "get": {
+        "operationId": "int_getNullUnixTime",
+        "description": "Get null Unix time value",
+        "responses": {
+          "200": {
+            "description": "The null Unix time value",
+            "schema": {
+              "type": "integer",
+              "format": "unixtime"
+            }
+          },
+          "default": {
+            "description": "Unexpected error",
+            "schema": {
+              "$ref": "#/definitions/Error"
+            }
+          }
+        }
+      }
     }
   },
   "definitions": {
diff --git a/AutoRest/TestServer/swagger/custom-baseUrl-more-options.json b/AutoRest/TestServer/swagger/custom-baseUrl-more-options.json
new file mode 100644
index 0000000000000..75ef7453976ee
--- /dev/null
+++ b/AutoRest/TestServer/swagger/custom-baseUrl-more-options.json
@@ -0,0 +1,108 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "AutoRest Parameterized Custom Host Test Client",
+    "description": "Test Infrastructure for AutoRest",
+    "version": "1.0.0"
+  },
+  "x-ms-parameterized-host": {
+    "hostTemplate": "{vault}{secret}{dnsSuffix}",
+    "useSchemePrefix": false,
+    "parameters": [
+      {
+        "name": "vault",
+        "description": "The vault name, e.g. https://myvault",
+        "required": true,
+        "type": "string",
+        "in": "path",
+        "x-ms-skip-url-encoding": true
+      },
+      {
+        "name": "secret",
+        "description": "Secret value.",
+        "required": true,
+        "type": "string",
+        "in": "path",
+        "x-ms-skip-url-encoding": true
+      },
+      {
+        "$ref": "#/parameters/dnsSuffix"
+      }
+    ]
+  },
+  "produces": [ "application/json" ],
+  "consumes": [ "application/json" ],
+  "paths": {
+    "/customuri/{subscriptionId}/{keyName}": {
+      "get": {
+        "operationId": "paths_getEmpty",
+        "description": "Get a 200 to test a valid base uri",
+        "tags": [
+          "Path Operations"
+        ],
+        "parameters": [
+          {
+            "name": "keyName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The key name with value 'key1'."
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "name": "keyVersion",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "default": "v1",
+            "description": "The key version. Default value 'v1'."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Successfully received a 200 response"
+          },
+          "default": {
+            "description": "Unexpected error",
+            "schema": {
+              "$ref": "#/definitions/Error"
+            }
+          }
+        }
+      }   
+    }
+  },
+  "parameters": {
+    "SubscriptionIdParameter": {
+      "name": "subscriptionId",
+      "in": "path",
+      "required": true,
+      "type": "string",
+      "description": "The subscription id with value 'test12'."
+    },
+    "dnsSuffix": {
+      "name": "dnsSuffix",
+      "description": "A string value that is used as a global part of the parameterized host. Default value 'host'.",
+      "type": "string",
+      "required": false,
+      "default": "host",
+      "in": "path",
+      "x-ms-skip-url-encoding": true
+    }
+  },
+  "definitions": {
+    "Error": {
+      "properties": {
+        "status": {
+          "type": "integer",
+          "format": "int32"
+        },
+        "message": {
+          "type": "string"
+        }
+      }
+    }
+  }
+}
diff --git a/AutoRest/TestServer/swagger/custom-baseUrl.json b/AutoRest/TestServer/swagger/custom-baseUrl.json
index 5ca07d1627a06..aaa0309f4b94a 100644
--- a/AutoRest/TestServer/swagger/custom-baseUrl.json
+++ b/AutoRest/TestServer/swagger/custom-baseUrl.json
@@ -8,6 +8,7 @@
   "host": "badhost",
   "x-ms-parameterized-host": {
     "hostTemplate": "{accountName}{host}",
+    "positionInOperation": "last",
     "parameters": [
       {
         "name": "accountName",
diff --git a/AutoRest/TestServer/swagger/lro.json b/AutoRest/TestServer/swagger/lro.json
index b064ce8c3aa2d..9f9bba0c26759 100644
--- a/AutoRest/TestServer/swagger/lro.json
+++ b/AutoRest/TestServer/swagger/lro.json
@@ -1772,6 +1772,46 @@
           }
         }
       }
+    },
+     "/lro/nonretryerror/put/201/creating/400/invalidjson": {
+      "put": {
+        "x-ms-long-running-operation": true,
+        "operationId": "LROSADs_putNonRetry201Creating400InvalidJson",
+        "description": "Long running put request, service returns a Product with 'ProvisioningState' = 'Creating' and 201 response code",
+        "tags": [
+          "LROSAD Operations"
+        ],
+        "parameters": [
+          {
+            "name": "product",
+            "description": "Product to put",
+            "in": "body",
+            "schema": {
+              "$ref": "#/definitions/Product"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Response after completion, with ProvisioningState='Succeeded'",
+            "schema": {
+              "$ref": "#/definitions/Product"
+            }
+          },
+          "201": {
+            "description": "Initial response, with ProvisioningState = 'Creating'",
+            "schema": {
+              "$ref": "#/definitions/Product"
+            }
+          },
+          "default": {
+            "description": "Unexpected error",
+            "schema": {
+              "$ref": "#/definitions/CloudError"
+            }
+          }
+        }
+      }
     },
     "/lro/nonretryerror/putasync/retry/400": {
       "put": {
diff --git a/AutoRest/TestServer/swagger/url.json b/AutoRest/TestServer/swagger/url.json
index 4bf4530d177fb..670ff00f9bd1d 100644
--- a/AutoRest/TestServer/swagger/url.json
+++ b/AutoRest/TestServer/swagger/url.json
@@ -773,6 +773,36 @@
         }
       }
     },
+    "/paths/int/1460505600/{unixTimeUrlPath}": {
+      "get": {
+        "operationId": "paths_unixTimeUrl",
+        "description": "Get the date 2016-04-13 encoded value as '1460505600' (Unix time)",
+        "tags": [
+          "Path Operations"
+        ],
+        "parameters": [
+          {
+            "name": "unixTimeUrlPath",
+            "in": "path",
+            "description": "Unix time encoded value",
+            "type": "integer",
+            "format": "unixtime",
+            "required": true
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Successfully Received date 2016-04-13 encoded value as '1460505600' (Unix time)"
+          },
+          "default": {
+            "description": "Unexpected error",
+            "schema": {
+              "$ref": "#/definitions/Error"
+            }
+          }
+        }
+      }
+    },
     "/queries/bool/true": {
       "get": {
         "operationId": "queries_getBooleanTrue",
diff --git a/ChangeLog.md b/ChangeLog.md
index c4affb34a9f94..3bb5f63273058 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,5 +1,15 @@
-## VNext (not released yet)
-* Fix ruby require module_definition if namespace is specified. See [#831](https://github.com/Azure/autorest/issues/831)
+##2016.05.11 Version 0.16.0
+* Fixed ruby require module_definition if namespace is specified. See [#831](https://github.com/Azure/autorest/issues/831)
+* Added an exit code for AutoRest.exe to indicate success or error
+* Added support for Unix time formatted dates with the `'unix-time'` format (#909)
+  * Serializing/deserializing Unix time formatted dates in C# and NodeJS to DateTime (C#) and Date (NodeJS)
+* Added support for Base64Url formatted values with the `'base64url'` format (#805)
+  * Serializing/deserializing Base64Url formatted values in C# and NodeJS to byte\[\] (C#) and Buffer (NodeJS)
+* Fixed issue where the contents of the output file for SingleFileGeneration are appended instead of replaced (#667)
+* Made generated parameter group documentation more accurate for `'x-ms-parameter-grouping'` extension (#634)
+* UserAgent header in ServiceClient now includes more detailed information (#583)
+* Added the ability to specify a name in generated code for query parameters, entity headers, etc. with the [`'x-ms-client-name'`](https://github.com/Azure/autorest/blob/master/Documentation/swagger-extensions.md#x-ms-client-name)
+* Bug fixes in all code generators (#722, #742, #745, #746, #819, #820, #824, #825, #889, #896, #897, #900, #915, #923, #934, #944, #943)
 
 ##2016.03.04 Version 0.15.0
 * Added Java code generator!
diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/LongRunningOperationsTest.cs b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/LongRunningOperationsTest.cs
index bf999fe9f7c1b..1d0bb2069f1bf 100644
--- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/LongRunningOperationsTest.cs
+++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/LongRunningOperationsTest.cs
@@ -104,6 +104,19 @@ public void TestAsyncOperationWithMissingProvisioningState()
             Assert.Equal("100", resource.Id);
         }
 
+        [Fact]
+        public void TestAsyncOperationWithNonSuccessStatusAndInvalidResponseContent()
+        {
+            var tokenCredentials = new TokenCredentials("123", "abc");
+            var handler = new PlaybackTestHandler(MockAsyncOperaionWithNonSuccessStatusAndInvalidResponseContent());
+            var fakeClient = new RedisManagementClient(tokenCredentials, handler);
+            fakeClient.LongRunningOperationInitialTimeout = fakeClient.LongRunningOperationRetryTimeout = 0;
+            var error = Assert.Throws<CloudException>(() =>
+                fakeClient.RedisOperations.Delete("rg", "redis", "1234"));
+            Assert.Equal("Long running operation failed with status 'BadRequest'.", error.Message);
+            Assert.Null(error.Body);
+        }
+
         [Fact]
         public void TestPutOperationWithoutProvisioningState()
         {
@@ -737,6 +750,22 @@ private IEnumerable<HttpResponseMessage> MockAsyncOperaionWithMissingProvisionin
             yield return response3;
         }
 
+        private IEnumerable<HttpResponseMessage> MockAsyncOperaionWithNonSuccessStatusAndInvalidResponseContent()
+        {
+            var response1 = new HttpResponseMessage(HttpStatusCode.Accepted)
+            {
+                Content = new StringContent("")
+            };
+            response1.Headers.Add("Location", "http://custom/status");
+            yield return response1;
+
+            var response2 = new HttpResponseMessage(HttpStatusCode.BadRequest)
+            {
+                Content = new StringContent("<")
+            };
+            yield return response2;
+        }
+
         private IEnumerable<HttpResponseMessage> MockPutOperaionWithoutProvisioningStateInResponse()
         {
             var response1 = new HttpResponseMessage(HttpStatusCode.Created)
diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/ODataTests.cs b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/ODataTests.cs
index 639023af44855..e267142696404 100644
--- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/ODataTests.cs
+++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/ODataTests.cs
@@ -7,6 +7,7 @@
 using Microsoft.Rest.Azure.OData;
 using Newtonsoft.Json;
 using Xunit;
+using System.Collections.Generic;
 
 namespace Microsoft.Rest.ClientRuntime.Azure.Test
 {
@@ -227,7 +228,6 @@ public void EncodingTheParameters()
         [Fact]
         public void ODataQuerySupportsAllParameters()
         {
-            var queryString = "foo eq 'bar'";
             var query = new ODataQuery<Param1>(p => p.Foo == "bar")
             {
                 Expand = "param1",
@@ -235,7 +235,7 @@ public void ODataQuerySupportsAllParameters()
                 Skip = 10,
                 Top = 100
             };
-            Assert.Equal(string.Format("$filter={0}&$orderby=d&$expand=param1&$top=100&$skip=10", Uri.EscapeDataString(queryString)), query.ToString());
+            Assert.Equal("$filter=foo eq 'bar'&$orderby=d&$expand=param1&$top=100&$skip=10", query.ToString());
         }
 
         [Fact]
@@ -249,49 +249,86 @@ public void ODataQuerySupportsEmptyState()
             {
                 Value = null
             };
+            var paramEncoded = new InputParam1
+            {
+                Value = "bar/car"
+            };
             query = new ODataQuery<Param1>(p => p.Foo == param.Value);
             Assert.Equal("", query.ToString());
             query = new ODataQuery<Param1>(p => p.Foo == param.Value && p.AssignedTo(param.Value));
             Assert.Equal("", query.ToString());
             query = new ODataQuery<Param1>(p => p.AssignedTo(param.Value));
             Assert.Equal("", query.ToString());
+            query = new ODataQuery<Param1>(p => p.AssignedTo(paramEncoded.Value));
+            Assert.Equal("$filter=assignedTo('bar%2Fcar')", query.ToString());
+        }
+
+        [Fact]
+        public void ODataQuerySupportsCustomDateTimeOffsetFilter()
+        {
+            var param = new Param1
+            {
+                SubmitTime = DateTimeOffset.Parse("2016-03-28T08:15:00.0971693+00:00"),
+                State = "Ended"
+
+            };
+
+            var filter = new List<string>();
+            filter.Add(string.Format("submitTime lt datetimeoffset'{0}'", Uri.EscapeDataString(param.SubmitTime.Value.ToString("O"))));
+            filter.Add(string.Format("state ne '{0}'", param.State));
+            var filterString = string.Join(" and ", filter.ToArray());
+
+
+            var query = new ODataQuery<Param1>
+            {
+                Filter = filterString
+            };
+            Assert.Equal("$filter=submitTime lt datetimeoffset'2016-03-28T08%3A15%3A00.0971693%2B00%3A00' and state ne 'Ended'", query.ToString());
         }
 
+
         [Fact]
         public void ODataQuerySupportsPartialState()
         {
-            var queryString = "foo eq 'bar'";
             var query = new ODataQuery<Param1>(p => p.Foo == "bar")
             {
                 Top = 100
             };
-            Assert.Equal(string.Format("$filter={0}&$top=100", Uri.EscapeDataString(queryString)), query.ToString());
+            Assert.Equal("$filter=foo eq 'bar'&$top=100", query.ToString());
+        }
+
+        [Fact]
+        public void ODataQuerySupportsPartialStateWithSlashes()
+        {
+            var queryString = "$filter=foo eq 'bar%2Fclub'&$top=100";
+            var query = new ODataQuery<Param1>(p => p.Foo == "bar/club")
+            {
+                Top = 100
+            };
+            Assert.Equal(queryString, query.ToString());
         }
 
         [Fact]
         public void ODataQuerySupportsImplicitConversionFromFilterString()
         {
-            var queryString = "foo eq 'bar'";
-            ODataQuery<Param1> query = queryString;
+            ODataQuery<Param1> query = "foo eq 'bar'";
             query.Top = 100;
-            Assert.Equal(string.Format("$filter={0}&$top=100", Uri.EscapeDataString(queryString)), query.ToString());
+            Assert.Equal("$filter=foo eq 'bar'&$top=100", query.ToString());
         }
 
         [Fact]
         public void ODataQuerySupportsImplicitConversionFromFullFilterString()
         {
-            var queryString = "foo eq 'bar'";
-            ODataQuery<Param1> query = string.Format("$filter={0}", queryString);
+            ODataQuery<Param1> query = "$filter=foo eq 'bar'";
             query.Top = 100;
-            Assert.Equal(string.Format("$filter={0}&$top=100", Uri.EscapeDataString(queryString)), query.ToString());
+            Assert.Equal("$filter=foo eq 'bar'&$top=100", query.ToString());
         }
 
         [Fact]
         public void ODataQuerySupportsImplicitConversionFromQueryString()
         {
-            var queryString = "foo eq 'bar'";
-            ODataQuery<Param1> query = string.Format("$filter={0}&$top=100", queryString);
-            Assert.Equal(string.Format("$filter={0}&$top=100", Uri.EscapeDataString(queryString)), query.ToString());
+            ODataQuery<Param1> query = "$filter=foo eq 'bar'&$top=100";
+            Assert.Equal("$filter=foo eq 'bar'&$top=100", query.ToString());
         }
 
         [Fact]
@@ -323,7 +360,7 @@ public void ODataQuerySupportsMethod()
             var filterString = FilterString.Generate<Param1>(parameters => parameters.AtScope() && 
                 parameters.AssignedTo(param.Value));
 
-            Assert.Equal(filterString, "atScope() and assignedTo('Microsoft.Web%2Fsites')");
+            Assert.Equal("atScope() and assignedTo('Microsoft.Web%2Fsites')", filterString);
         }
     }
 
@@ -361,6 +398,10 @@ public class Param1
         [JsonProperty("d")]
         public DateTime Date { get; set; }
         public DateTime Date2 { get; set; }
+        [JsonProperty("submitTime")]
+        public DateTimeOffset? SubmitTime { get; set; }
+        [JsonProperty("state")]
+        public string State { get; set; }
         [JsonProperty("vals")]
         public string[] Values { get; set; }
         [JsonProperty("param2")]
diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/AzureClientExtensions.cs b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/AzureClientExtensions.cs
index 57bbd064b95c2..422f074bd3028 100644
--- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/AzureClientExtensions.cs
+++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/AzureClientExtensions.cs
@@ -122,6 +122,38 @@ public static class AzureClientExtensions
             return pollingState.AzureOperationResponse;
         }
 
+        /// <summary>
+        /// Gets operation result for PUT and PATCH operations.
+        /// </summary>
+        /// <param name="client">IAzureClient</param>
+        /// <param name="response">Response from the begin operation</param>
+        /// <param name="customHeaders">Headers that will be added to request</param>
+        /// <param name="cancellationToken">Cancellation token</param>
+        /// <returns>Operation response</returns>
+        public static async Task<AzureOperationResponse> GetPutOrPatchOperationResultAsync(
+            this IAzureClient client,
+            AzureOperationResponse response,
+            Dictionary<string, List<string>> customHeaders,
+            CancellationToken cancellationToken)
+        {
+            var newResponse = new AzureOperationResponse<object>
+            {
+                Request = response.Request,
+                Response = response.Response,
+                RequestId = response.RequestId
+            };
+
+            var azureOperationResponse = await client.GetPutOrPatchOperationResultAsync(
+                newResponse, customHeaders, cancellationToken);
+
+            return new AzureOperationResponse
+            {
+                Request = azureOperationResponse.Request,
+                Response = azureOperationResponse.Response,
+                RequestId = azureOperationResponse.RequestId
+            };
+        }
+
         /// <summary>
         /// Gets operation result for DELETE and POST operations.
         /// </summary>
@@ -599,7 +631,16 @@ public static class AzureClientExtensions
                 statusCode != HttpStatusCode.Created &&
                 statusCode != HttpStatusCode.NoContent)
             {
-                CloudError errorBody = SafeJsonConvert.DeserializeObject<CloudError>(responseContent, client.DeserializationSettings);
+                CloudError errorBody = null;
+                try
+                {
+                    errorBody = SafeJsonConvert.DeserializeObject<CloudError>(responseContent, client.DeserializationSettings);
+                }
+                catch (JsonException)
+                {
+                    // failed to deserialize, return empty body
+                }
+
                 throw new CloudException(string.Format(CultureInfo.InvariantCulture,
                     Resources.LongRunningOperationFailed, statusCode))
                 {
diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/OData/ODataQuery.cs b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/OData/ODataQuery.cs
index 99fed407ca114..252c7739db668 100644
--- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/OData/ODataQuery.cs
+++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/OData/ODataQuery.cs
@@ -146,17 +146,17 @@ public override string ToString()
             if (!string.IsNullOrEmpty(Filter))
             {
                 queryStringList.Add(string.Format(CultureInfo.InvariantCulture,
-                    "$filter={0}", Uri.EscapeDataString(Filter)));
+                    "$filter={0}", Filter));
             }
             if (!string.IsNullOrEmpty(OrderBy))
             {
                 queryStringList.Add(string.Format(CultureInfo.InvariantCulture,
-                    "$orderby={0}", Uri.EscapeDataString(OrderBy)));
+                    "$orderby={0}", OrderBy));
             }
             if (!string.IsNullOrEmpty(Expand))
             {
                 queryStringList.Add(string.Format(CultureInfo.InvariantCulture,
-                    "$expand={0}", Uri.EscapeDataString(Expand)));
+                    "$expand={0}", Expand));
             }
             if (Top != null)
             {
diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime/Serialization/UnixTimeJsonConverter.cs b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime/Serialization/UnixTimeJsonConverter.cs
new file mode 100644
index 0000000000000..fd345541a6de0
--- /dev/null
+++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime/Serialization/UnixTimeJsonConverter.cs
@@ -0,0 +1,77 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace Microsoft.Rest.Serialization
+{
+    public class UnixTimeJsonConverter : JsonConverter
+    {
+        public static readonly DateTime EpochDate = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
+
+        /// <summary>
+        /// Converts a byte array to a Base64Url encoded string
+        /// </summary>
+        /// <param name="input">The byte array to convert</param>
+        /// <returns>The Base64Url encoded form of the input</returns>
+        private static long? ToUnixTime(DateTime dateTime)
+        {
+            return (long?)dateTime.Subtract(EpochDate).TotalSeconds;
+        }
+
+        /// <summary>
+        /// Converts a Base64Url encoded string to a byte array
+        /// </summary>
+        /// <param name="input">The Base64Url encoded string</param>
+        /// <returns>The byte array represented by the enconded string</returns>
+        private static DateTime? FromUnixTime(long? seconds)
+        {
+            if (seconds.HasValue)
+            {
+                return EpochDate.AddSeconds(seconds.Value);
+            }
+            return null;
+        }
+
+        public override bool CanConvert(Type objectType)
+        {
+            if (objectType == typeof(DateTime?) || objectType == typeof(DateTime))
+                return true;
+
+            return false;
+        }
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            if (objectType != typeof(DateTime?))
+            {
+                return serializer.Deserialize(reader, objectType);
+            }
+            else
+            {
+                var value = serializer.Deserialize<long?>(reader);
+
+                if (value.HasValue)
+                {
+                    return FromUnixTime(value);
+                }
+            }
+
+            return null;
+        }
+
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {
+            if (value.GetType() != typeof(DateTime))
+            {
+                JToken.FromObject(value).WriteTo(writer);
+            }
+            else
+            {
+                JToken.FromObject(ToUnixTime((DateTime)value)).WriteTo(writer);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime/ServiceClient.cs b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime/ServiceClient.cs
index e80afc887e0f8..6763f4e6641fa 100644
--- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime/ServiceClient.cs
+++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime/ServiceClient.cs
@@ -208,25 +208,53 @@ protected void InitializeHttpClient(HttpClientHandler httpClientHandler, params
             HttpClient = newClient;
             Type type = this.GetType();
             HttpClient.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue(type.FullName,
-                GetAssemblyVersion()));
+                GetClientVersion()));
         }
 
         /// <summary>
-        /// Get the assembly version of a service client.
+        /// Gets the AssemblyInformationalVersion if available
+        /// if not it gets the AssemblyFileVerion
+        /// if neither are available it will default to the Assembly Version of a service client.
         /// </summary>
-        /// <returns>The assembly version of the client.</returns>        
-        private string GetAssemblyVersion()
+        /// <returns>The version of the client.</returns>
+        private string GetClientVersion()
         {
+
+            string version = String.Empty;
             Type type = this.GetType();
-            string version =
-                type
-                    .GetTypeInfo()
-                    .Assembly
-                    .FullName
-                    .Split(',')
-                    .Select(c => c.Trim())
-                    .First(c => c.StartsWith("Version=", StringComparison.OrdinalIgnoreCase))
-                    .Substring("Version=".Length);
+            Assembly assembly = type.GetTypeInfo().Assembly;
+
+            try
+            {
+                // try to get AssemblyInformationalVersion first
+                AssemblyInformationalVersionAttribute aivAttribute =
+                        assembly.GetCustomAttribute(typeof(AssemblyInformationalVersionAttribute)) as AssemblyInformationalVersionAttribute;
+                version = aivAttribute?.InformationalVersion;
+
+                // if not available try to get AssemblyFileVersion
+                if (String.IsNullOrEmpty(version))
+                {
+                    AssemblyFileVersionAttribute fvAttribute =
+                        assembly.GetCustomAttribute(typeof(AssemblyFileVersionAttribute)) as AssemblyFileVersionAttribute;
+                    version = fvAttribute?.Version;
+                }
+            }
+            catch (AmbiguousMatchException)
+            {
+                // in case there are more then one attribute of the type
+            }
+
+            // no usable version attribute found so default to Assembly Version
+            if (String.IsNullOrEmpty(version))
+            {
+                version =
+                    assembly
+                        .FullName
+                        .Split(',')
+                        .Select(c => c.Trim())
+                        .First(c => c.StartsWith("Version=", StringComparison.OrdinalIgnoreCase))
+                        .Substring("Version=".Length);
+            }
             return version;
         }
     }
diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime/ServiceClientTracing.cs b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime/ServiceClientTracing.cs
index a9df767f21494..1343b5edcf0b0 100644
--- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime/ServiceClientTracing.cs
+++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime/ServiceClientTracing.cs
@@ -10,7 +10,7 @@
 namespace Microsoft.Rest
 {
     /// <summary>
-    /// Provides a set of methods and properties that help you trace the serviceclient.
+    /// Provides a set of methods and properties that help you trace the service client.
     /// </summary>
     public static class ServiceClientTracing
     {
@@ -119,7 +119,7 @@ public static bool RemoveTracingInterceptor(IServiceClientTracingInterceptor int
         /// <summary>
         /// Write the informational tracing message.
         /// </summary>
-        /// <param name="message">The msessage to trace.</param>
+        /// <param name="message">The message to trace.</param>
         /// <param name="parameters">An object array containing zero or more objects to format</param>
         public static void Information(string message, params object[] parameters)
         {
diff --git a/ClientRuntimes/Java/client-runtime/build.gradle b/ClientRuntimes/Java/client-runtime/build.gradle
index 47cbaf08c6397..b734d33608eaf 100644
--- a/ClientRuntimes/Java/client-runtime/build.gradle
+++ b/ClientRuntimes/Java/client-runtime/build.gradle
@@ -25,7 +25,7 @@ dependencies {
     compile 'com.google.guava:guava:18.0'
     compile 'com.squareup.retrofit2:retrofit:2.0.0-beta4'
     compile 'com.squareup.okhttp3:okhttp:3.2.0'
-    compile ('com.squareup.okio:okio:1.7.0-SNAPSHOT') { changing = true }
+    compile 'com.squareup.okio:okio:1.7.0'
     compile 'com.squareup.okhttp3:logging-interceptor:3.1.1'
     compile 'com.squareup.okhttp3:okhttp-urlconnection:3.1.1'
     compile 'com.squareup.retrofit2:converter-jackson:2.0.0-beta4'
diff --git a/ClientRuntimes/NodeJS/ms-rest-azure/LICENSE b/ClientRuntimes/NodeJS/ms-rest-azure/LICENSE
new file mode 100644
index 0000000000000..b8b569d7746d9
--- /dev/null
+++ b/ClientRuntimes/NodeJS/ms-rest-azure/LICENSE
@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Microsoft
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
diff --git a/ClientRuntimes/NodeJS/ms-rest-azure/lib/azureEnvironment.js b/ClientRuntimes/NodeJS/ms-rest-azure/lib/azureEnvironment.js
index 9aa5e6fb2a48d..bc8e1a961dc48 100644
--- a/ClientRuntimes/NodeJS/ms-rest-azure/lib/azureEnvironment.js
+++ b/ClientRuntimes/NodeJS/ms-rest-azure/lib/azureEnvironment.js
@@ -2,48 +2,158 @@
 // Licensed under the MIT License. See License.txt in the project root for license information. 
 
 'use strict';
-
-var _ = require('underscore');
-
+var util = require('util');
 /**
  * @class
  * Initializes a new instance of the AzureEnvironment class.
  * @constructor
- * @param {string} authenticationEndpoint - ActiveDirectory Endpoint for the Azure Environment.
- * @param {string} tokenAudience - Token audience for an endpoint.
- * @param {bool} [validateAuthority] - Determines whether the authentication endpoint should 
+ * @param {string} parameters.name - The Environment name
+ * @param {string} parameters.portalUrl - the management portal URL
+ * @param {string} parameters.managementEndpointUrl - the management service endpoint
+ * @param {string} parameters.resourceManagerEndpointUrl - the resource management endpoint
+ * @param {string} parameters.activeDirectoryEndpointUrl - the Active Directory login endpoint
+ * @param {string} parameters.activeDirectoryResourceId - The resource ID to obtain AD tokens for
+ * @param {string} [parameters.publishingProfileUrl] - the publish settings file URL
+ * @param {string} [parameters.sqlManagementEndpointUrl] - the sql server management endpoint for mobile commands
+ * @param {string} [parameters.sqlServerHostnameSuffix] - the dns suffix for sql servers
+ * @param {string} [parameters.galleryEndpointUrl] - the template gallery endpoint
+ * @param {string} [parameters.activeDirectoryGraphResourceId] - the Active Directory resource ID
+ * @param {string} [parameters.activeDirectoryGraphApiVersion] - the Active Directory api version
+ * @param {string} [parameters.storageEndpointSuffix] - the endpoint suffix for storage accounts
+ * @param {string} [parameters.keyVaultDnsSuffix] - the keyvault service dns suffix
+ * @param {string} [parameters.azureDataLakeStoreFileSystemEndpointSuffix] - the data lake store filesystem service dns suffix
+ * @param {string} [parameters.azureDataLakeAnalyticsCatalogAndJobEndpointSuffix] - the data lake analytics job and catalog service dns suffix
+ * @param {bool} [parameters.validateAuthority] - Determines whether the authentication endpoint should 
  * be validated with Azure AD. Default value is true.
  */
-function AzureEnvironment(authenticationEndpoint, tokenAudience, validateAuthority) {
-  this.authenticationEndpoint = authenticationEndpoint;
-  this.tokenAudience = tokenAudience;
-  this.validateAuthority = validateAuthority;
-}
+function AzureEnvironment(parameters) {
+  //Set defaults.
+  this.validateAuthority = true;
 
-/**
- * Provides the settings for authentication with Azure
- */
-var Azure = new AzureEnvironment('https://login.microsoftonline.com/',
-                                 'https://management.core.windows.net/',
-                                  true);
+  if (parameters) {
+    //Validate required parameters
+    var requiredParams = [ 'name', 'portalUrl', 'managementEndpointUrl', 'resourceManagerEndpointUrl', 
+    'activeDirectoryEndpointUrl', 'activeDirectoryResourceId'];
+    requiredParams.forEach(function (param) {
+      if (!parameters[param] || typeof parameters[param].valueOf() !== 'string') {
+        throw new Error(util.format('Please provide "%s" for the environment and it must be of type "string".', param));
+      }
+    });
+    //Assign provided parameters
+    for (var prop in parameters) {
+      this[prop] = parameters[prop];
+    }
+  }
+}
+var supportedEnvironments = {
+  Azure: {
+    name: 'Azure',
+    portalUrl: 'http://go.microsoft.com/fwlink/?LinkId=254433',
+    publishingProfileUrl: 'http://go.microsoft.com/fwlink/?LinkId=254432',
+    managementEndpointUrl: 'https://management.core.windows.net',
+    resourceManagerEndpointUrl: 'https://management.azure.com/',
+    sqlManagementEndpointUrl: 'https://management.core.windows.net:8443/',
+    sqlServerHostnameSuffix: '.database.windows.net',
+    galleryEndpointUrl: 'https://gallery.azure.com/',
+    activeDirectoryEndpointUrl: 'https://login.microsoftonline.com/',
+    activeDirectoryResourceId: 'https://management.core.windows.net/',
+    activeDirectoryGraphResourceId: 'https://graph.windows.net/',
+    activeDirectoryGraphApiVersion: '2013-04-05',
+    storageEndpointSuffix: '.core.windows.net',
+    keyVaultDnsSuffix: '.vault.azure.net',
+    azureDataLakeStoreFileSystemEndpointSuffix: 'azuredatalakestore.net',
+    azureDataLakeAnalyticsCatalogAndJobEndpointSuffix: 'azuredatalakeanalytics.net'
+  },
+  AzureChina: {
+    name: 'AzureChina',
+    portalUrl: 'http://go.microsoft.com/fwlink/?LinkId=301902',
+    publishingProfileUrl: 'http://go.microsoft.com/fwlink/?LinkID=301774',
+    managementEndpointUrl: 'https://management.core.chinacloudapi.cn',
+    resourceManagerEndpointUrl: 'https://management.chinacloudapi.cn',
+    sqlManagementEndpointUrl: 'https://management.core.chinacloudapi.cn:8443/',
+    sqlServerHostnameSuffix: '.database.chinacloudapi.cn',
+    galleryEndpointUrl: 'https://gallery.chinacloudapi.cn/',
+    activeDirectoryEndpointUrl: 'https://login.chinacloudapi.cn/',
+    activeDirectoryResourceId: 'https://management.core.chinacloudapi.cn/',
+    activeDirectoryGraphResourceId: 'https://graph.chinacloudapi.cn/',
+    activeDirectoryGraphApiVersion: '2013-04-05',
+    storageEndpointSuffix: '.core.chinacloudapi.cn',
+    keyVaultDnsSuffix: '.vault.azure.cn',
+    // TODO: add dns suffixes for the china cloud for datalake store and datalake analytics once they are defined.
+    azureDataLakeStoreFileSystemEndpointSuffix: 'N/A',
+    azureDataLakeAnalyticsCatalogAndJobEndpointSuffix: 'N/A'
+  },
+  AzureUSGovernment: {
+    name: 'AzureUSGovernment',
+    portalUrl: 'https://manage.windowsazure.us',
+    publishingProfileUrl: 'https://manage.windowsazure.us/publishsettings/index',
+    managementEndpointUrl: 'https://management.core.usgovcloudapi.net',
+    resourceManagerEndpointUrl: 'https://management.usgovcloudapi.net',
+    sqlManagementEndpointUrl: 'https://management.core.usgovcloudapi.net:8443/',
+    sqlServerHostnameSuffix: '.database.usgovcloudapi.net',
+    galleryEndpointUrl: 'https://gallery.usgovcloudapi.net/',
+    activeDirectoryEndpointUrl: 'https://login.microsoftonline.com/',
+    activeDirectoryResourceId: 'https://management.core.usgovcloudapi.net/',
+    activeDirectoryGraphResourceId: 'https://graph.windows.net/',
+    activeDirectoryGraphApiVersion: '2013-04-05',
+    storageEndpointSuffix: '.core.usgovcloudapi.net',
+    keyVaultDnsSuffix: '.vault.usgovcloudapi.net',
+    // TODO: add dns suffixes for the US government for datalake store and datalake analytics once they are defined.
+    azureDataLakeStoreFileSystemEndpointSuffix: 'N/A',
+    azureDataLakeAnalyticsCatalogAndJobEndpointSuffix: 'N/A'
+  },
+  AzureGermanCloud: {
+    name: 'AzureGermanCloud',
+    portalUrl: 'http://portal.microsoftazure.de/',
+    publishingProfileUrl: 'https://manage.microsoftazure.de/publishsettings/index',
+    managementEndpointUrl: 'https://management.core.cloudapi.de',
+    resourceManagerEndpointUrl: 'https://management.microsoftazure.de',
+    sqlManagementEndpointUrl: 'https://management.core.cloudapi.de:8443/',
+    sqlServerHostnameSuffix: '.database.cloudapi.de',
+    galleryEndpointUrl: 'https://gallery.cloudapi.de/',
+    activeDirectoryEndpointUrl: 'https://login.microsoftonline.de/',
+    activeDirectoryResourceId: 'https://management.core.cloudapi.de/',
+    activeDirectoryGraphResourceId: 'https://graph.cloudapi.de/',
+    activeDirectoryGraphApiVersion: '2013-04-05',
+    storageEndpointSuffix: '.core.cloudapi.de',
+    keyVaultDnsSuffix: '.vault.microsoftazure.de',
+    // TODO: add dns suffixes for the US government for datalake store and datalake analytics once they are defined.
+    azureDataLakeStoreFileSystemEndpointSuffix: 'N/A',
+    azureDataLakeAnalyticsCatalogAndJobEndpointSuffix: 'N/A'
+  }
+};
 
 /**
- * Provides the settings for authentication with Azure China
+ * Adds a new instance of the AzureEnvironment to the prototype.
+ * @param {string} parameters.name - The Environment name
+ * @param {string} parameters.portalUrl - the management portal URL
+ * @param {string} parameters.managementEndpointUrl - the management service endpoint
+ * @param {string} parameters.resourceManagerEndpointUrl - the resource management endpoint
+ * @param {string} parameters.activeDirectoryEndpointUrl - the Active Directory login endpoint
+ * @param {string} parameters.activeDirectoryResourceId - The resource ID to obtain AD tokens for
+ * @param {string} [parameters.publishingProfileUrl] - the publish settings file URL
+ * @param {string} [parameters.sqlManagementEndpointUrl] - the sql server management endpoint for mobile commands
+ * @param {string} [parameters.sqlServerHostnameSuffix] - the dns suffix for sql servers
+ * @param {string} [parameters.galleryEndpointUrl] - the template gallery endpoint
+ * @param {string} [parameters.activeDirectoryGraphResourceId] - the Active Directory resource ID
+ * @param {string} [parameters.activeDirectoryGraphApiVersion] - the Active Directory api version
+ * @param {string} [parameters.storageEndpointSuffix] - the endpoint suffix for storage accounts
+ * @param {string} [parameters.keyVaultDnsSuffix] - the keyvault service dns suffix
+ * @param {string} [parameters.azureDataLakeStoreFileSystemEndpointSuffix] - the data lake store filesystem service dns suffix
+ * @param {string} [parameters.azureDataLakeAnalyticsCatalogAndJobEndpointSuffix] - the data lake analytics job and catalog service dns suffix
+ * @param {bool} [parameters.validateAuthority] - Determines whether the authentication endpoint should 
+ * be validated with Azure AD. Default value is true.
+ * @return {AzureEnvironment} - Reference to the newly added Environment
  */
-var AzureChina = new AzureEnvironment('https://login.chinacloudapi.cn/',
-                                      'https://management.core.chinacloudapi.cn/',
-                                       true);
+AzureEnvironment.prototype.add = function(parameters) {
+  var _environment = new AzureEnvironment(parameters);
+  AzureEnvironment.prototype[_environment.name] = _environment;
+  return _environment;
+};
 
-/**
- * Provides the settings for authentication with Azure US Government
- */
-var AzureUSGovernment = new AzureEnvironment('https://login.microsoftonline.com/',
-                                             'https://management.core.usgovcloudapi.net/',
-                                              true);
+//Adding the supported environments
+for(var key in supportedEnvironments) {
+  AzureEnvironment.prototype.add(supportedEnvironments[key]);
+}
 
-_.extend(module.exports, {
-  Azure: Azure,
-  AzureChina: AzureChina,
-  AzureEnvironment: AzureEnvironment,
-  AzureUSGovernment: AzureUSGovernment
-});
+module.exports = new AzureEnvironment();
\ No newline at end of file
diff --git a/ClientRuntimes/NodeJS/ms-rest-azure/lib/azureServiceClient.js b/ClientRuntimes/NodeJS/ms-rest-azure/lib/azureServiceClient.js
index ae1798dc5e56a..ca4413b85a00b 100644
--- a/ClientRuntimes/NodeJS/ms-rest-azure/lib/azureServiceClient.js
+++ b/ClientRuntimes/NodeJS/ms-rest-azure/lib/azureServiceClient.js
@@ -57,92 +57,32 @@ function AzureServiceClient(credentials, options) {
 util.inherits(AzureServiceClient, msRest.ServiceClient);
 
 /**
- * Poll Azure long running PUT operation.
+ * Poll Azure long running PUT or PATCH operation. (Deprecated, new version of the code-gen will generate code to call getLongRunningOperationResult)
  * @param {object} [resultOfInitialRequest] - Response of the initial request for the long running operation.
  * @param {object} [options]
  * @param {object} [options.customHeaders] headers that will be added to request
  */
 AzureServiceClient.prototype.getPutOrPatchOperationResult = function (resultOfInitialRequest, options, callback) {
-  var self = this;
-
-  if(!callback && typeof options === 'function') {
-    callback = options;
-    options = null;
-  }
-  if (!callback) {
-    throw new Error('Missing callback');
-  }
-  
-  if (!resultOfInitialRequest) {
-    return callback(new Error('Missing resultOfInitialRequest parameter'));
-  }
-  
-  if (resultOfInitialRequest.response.statusCode !== 200 &&
-      resultOfInitialRequest.response.statusCode !== 201 &&
-      resultOfInitialRequest.response.statusCode !== 202) {
-    return callback(new Error(util.format('Unexpected polling status code from long running operation \'%s\'', 
-      resultOfInitialRequest.response.statusCode)));
-  }
-  var pollingState = null;
-  try {
-    pollingState = new PollingState(resultOfInitialRequest, this.longRunningOperationRetryTimeout);
-  } catch (error) {
-    callback(error);
-  }
-  
-  var resourceUrl = resultOfInitialRequest.request.url;
-  this._options = options;
-  
-  async.whilst(
-    //while condition
-    function () {
-      var finished = [LroStates.Succeeded, LroStates.Failed, LroStates.Canceled].some(function (e) {
-        return pollingState.status === e;
-      });
-      return !finished;
-    },
-    //while loop body
-    function (callback) {
-      setTimeout(function () {
-        if (pollingState.azureAsyncOperationHeaderLink) {
-          self._updateStateFromAzureAsyncOperationHeader(pollingState, false, function (err) {
-            return callback(err);
-          });
-        } else if (pollingState.locationHeaderLink) {
-          self._updateStateFromLocationHeaderOnPut(pollingState, function (err) {
-            return callback(err);
-          });
-        } else {
-          self._updateStateFromGetResourceOperation(resourceUrl, pollingState, function (err) {
-            return callback(err);
-          });
-        }
-      }, pollingState.getTimeout());
-    },
-    //when done
-    function (err) {
-      if (pollingState.status === LroStates.Succeeded) {
-        if (!pollingState.resource) {
-          self._updateStateFromGetResourceOperation(resourceUrl, pollingState, function (err) {
-            return callback(err, pollingState.getOperationResponse());
-          });
-        } else {
-          return callback(null, pollingState.getOperationResponse());
-        }
-      } else {
-        return callback(pollingState.getCloudError(err));
-      }
-    });
+  return this.getLongRunningOperationResult(resultOfInitialRequest, options, callback);
 };
 
-
 /**
- * Poll Azure long running POST or DELETE operations.
+ * Poll Azure long running POST or DELETE operations. (Deprecated, new version of the code-gen will generate code to call getLongRunningOperationResult)
  * @param {object} [resultOfInitialRequest] - result of the initial request.
  * @param {object} [options]
  * @param {object} [options.customHeaders] headers that will be added to request
  */
 AzureServiceClient.prototype.getPostOrDeleteOperationResult = function (resultOfInitialRequest, options, callback) {
+  return this.getLongRunningOperationResult(resultOfInitialRequest, options, callback);
+};
+
+/**
+ * Poll Azure long running PUT, PATCH, POST or DELETE operations.
+ * @param {object} [resultOfInitialRequest] - result of the initial request.
+ * @param {object} [options]
+ * @param {object} [options.customHeaders] headers that will be added to request
+ */
+AzureServiceClient.prototype.getLongRunningOperationResult = function (resultOfInitialRequest, options, callback) {
   var self = this;
   
   if (!callback && typeof options === 'function') {
@@ -152,7 +92,7 @@ AzureServiceClient.prototype.getPostOrDeleteOperationResult = function (resultOf
   if (!callback) {
     throw new Error('Missing callback');
   }
-  
+
   if (!resultOfInitialRequest) {
     return callback(new Error('Missing resultOfInitialRequest parameter'));
   }
@@ -161,36 +101,51 @@ AzureServiceClient.prototype.getPostOrDeleteOperationResult = function (resultOf
     return callback(new Error('Missing resultOfInitialRequest.response'));
   }
   
-  if (resultOfInitialRequest.response.statusCode !== 200 &&
-      resultOfInitialRequest.response.statusCode !== 202 &&
-      resultOfInitialRequest.response.statusCode !== 204) {
-    return callback(new Error(util.format('Unexpected polling status code from long running operation \'%s\'', 
-      resultOfInitialRequest.response.statusCode)));
+  if (!resultOfInitialRequest.request) {
+    return callback(new Error('Missing resultOfInitialRequest.request'));
+  }
+  
+  if (!resultOfInitialRequest.request.method) {
+    return callback(new Error('Missing resultOfInitialRequest.request.method'));
+  }
+
+  var initialRequestMethod = resultOfInitialRequest.request.method;
+  
+  if (this._checkResponseStatusCodeFailed(resultOfInitialRequest)) {
+    return callback(new Error(util.format('Unexpected polling status code from long running operation \'%s\' for method \'%s\'',
+      resultOfInitialRequest.response.statusCode,
+	  initialRequestMethod)));
   }
   
   var pollingState = null;
+  
   try {
     pollingState = new PollingState(resultOfInitialRequest, this.longRunningOperationRetryTimeout);
   } catch (error) {
     callback(error);
   }
+  var resourceUrl = resultOfInitialRequest.request.url;
   this._options = options;
 
   async.whilst(
-    function () {
-      var finished = [LroStates.Succeeded, LroStates.Failed, LroStates.Canceled].some(function (e) {
+    function() {
+      var finished = [LroStates.Succeeded, LroStates.Failed, LroStates.Canceled].some(function(e) {
         return e === pollingState.status;
       });
       return !finished;
     },
     function (callback) {
-      setTimeout(function () {
+      setTimeout(function() {
         if (pollingState.azureAsyncOperationHeaderLink) {
-          self._updateStateFromAzureAsyncOperationHeader(pollingState, true, function (err) {
+          self._updateStateFromAzureAsyncOperationHeader(pollingState, true, function(err) {
             return callback(err);
           });
         } else if (pollingState.locationHeaderLink) {
-          self._updateStateFromLocationHeaderOnPostOrDelete(pollingState, function (err) {
+          self._updateStateFromLocationHeader(initialRequestMethod, pollingState, function(err) {
+            return callback(err);
+          });
+        } else if (initialRequestMethod === 'PUT') {
+          self._updateStateFromGetResourceOperation(resourceUrl, pollingState, function(err) {
             return callback(err);
           });
         } else {
@@ -198,15 +153,36 @@ AzureServiceClient.prototype.getPostOrDeleteOperationResult = function (resultOf
         }
       }, pollingState.getTimeout());
     },
+    //when done
     function (err) {
-      if (pollingState.status === LroStates.Succeeded ) {
-        return callback(null, pollingState.getOperationResponse());
+      if (pollingState.status === LroStates.Succeeded) {
+        if ((pollingState.azureAsyncOperationHeaderLink || !pollingState.resource) &&
+			(initialRequestMethod === 'PUT' || initialRequestMethod === 'PATCH')) {
+          self._updateStateFromGetResourceOperation(resourceUrl, pollingState, function(err) {
+            return callback(err, pollingState.getOperationResponse());
+          });
+        } else {
+          return callback(null, pollingState.getOperationResponse());
+        }
       } else {
         return callback(pollingState.getCloudError(err));
       }
     });
 };
 
+AzureServiceClient.prototype._checkResponseStatusCodeFailed = function (initialRequest) {
+  var statusCode = initialRequest.response.statusCode;
+  var method = initialRequest.request.method;
+  if (statusCode === 200 || statusCode === 202 ||
+    (statusCode === 201 && method === 'PUT') ||
+    (statusCode === 204 && (method === 'DELETE' || method === 'POST'))) {
+    return false;
+  } else {
+	  return true;
+  }
+};
+
+
 /**
  * Retrieve operation status by polling from 'azure-asyncoperation' header.
  * @param {object} [pollingState] - The object to persist current operation state.
@@ -236,8 +212,8 @@ AzureServiceClient.prototype._updateStateFromAzureAsyncOperationHeader = functio
  * Retrieve PUT operation status by polling from 'location' header.
  * @param {object} [pollingState] - The object to persist current operation state.
  */
-AzureServiceClient.prototype._updateStateFromLocationHeaderOnPut = function (pollingState, callback) {
-  this._getStatus(pollingState.locationHeaderLink, function (err, result) {
+AzureServiceClient.prototype._updateStateFromLocationHeader = function (method, pollingState, callback) {
+  this._getStatus(pollingState.locationHeaderLink, function(err, result) {
     if (err) return callback(err);
     
     pollingState.updateResponse(result.response);
@@ -246,54 +222,20 @@ AzureServiceClient.prototype._updateStateFromLocationHeaderOnPut = function (pol
     var statusCode = result.response.statusCode;
     if (statusCode === 202) {
       pollingState.status = LroStates.InProgress;
-    }
-    else if (statusCode === 200 ||
-             statusCode === 201) {
-      
-      if (!result.body) {
-        return callback(new Error('The response from long running operation does not contain a body.'));
-      }
-      
-      // In 202 pattern on PUT ProvisioningState may not be present in 
-      // the response. In that case the assumption is the status is Succeeded.
-      if (result.body.properties && result.body.properties.provisioningState) {
-        pollingState.status = result.body.properties.provisioningState;
-      }
-      else {
-        pollingState.status = LroStates.Succeeded;
-      }
-      
+    } else if (statusCode === 200 ||
+      (statusCode === 201 && method === 'PUT') ||
+      (statusCode === 204 && (method === 'DELETE' || method === 'POST'))) {
+
+      pollingState.status = LroStates.Succeeded;
+
       pollingState.error = {
         code: pollingState.Status,
         message: util.format('Long running operation failed with status \'%s\'.', pollingState.status)
       };
       pollingState.resource = result.body;
-    }
-    callback(null);
-  });
-};
-
-/**
- * Retrieve POST or DELETE operation status by polling from 'location' header.
- * @param {object} [pollingState] - The object to persist current operation state.
- */
-AzureServiceClient.prototype._updateStateFromLocationHeaderOnPostOrDelete = function (pollingState, callback) {
-  this._getStatus(pollingState.locationHeaderLink, function (err, result) {
-    if (err) return callback(err);
-    
-    pollingState.updateResponse(result.response);
-    pollingState.request = result.request;
-    
-    var statusCode = result.response.statusCode;
-    if (statusCode === 202) {
-      pollingState.status = LroStates.InProgress;
-    }
-    else if (statusCode === 200 ||
-             statusCode === 201 ||
-             statusCode === 204) {
-      pollingState.status = LroStates.Succeeded;
-      pollingState.resource = result.body;
-    }
+    } else {
+	  return callback(new Error('The response from long running operation does not have a valid status code.'));
+	}
     callback(null);
   });
 };
diff --git a/ClientRuntimes/NodeJS/ms-rest-azure/lib/credentials/applicationTokenCredentials.js b/ClientRuntimes/NodeJS/ms-rest-azure/lib/credentials/applicationTokenCredentials.js
index 0c4fe85033edf..e096edbff2049 100644
--- a/ClientRuntimes/NodeJS/ms-rest-azure/lib/credentials/applicationTokenCredentials.js
+++ b/ClientRuntimes/NodeJS/ms-rest-azure/lib/credentials/applicationTokenCredentials.js
@@ -65,10 +65,10 @@ function ApplicationTokenCredentials(clientId, domain, secret, options) {
 */
 ApplicationTokenCredentials.prototype.signRequest = function (webResource, callback) {
   var self = this;
-  var authorityUrl = self.environment.authenticationEndpoint + self.domain;
+  var authorityUrl = self.environment.activeDirectoryEndpointUrl + self.domain;
   var context = new adal.AuthenticationContext(authorityUrl, self.environment.validateAuthority, self.tokenCache);
   
-  context.acquireTokenWithClientCredentials(self.environment.tokenAudience, self.clientId, self.secret, function (err, result) {
+  context.acquireTokenWithClientCredentials(self.environment.activeDirectoryResourceId, self.clientId, self.secret, function (err, result) {
     if (err) {
       return callback(new Error('Failed to acquire token for application. \n' + err));
     }
diff --git a/ClientRuntimes/NodeJS/ms-rest-azure/lib/credentials/userTokenCredentials.js b/ClientRuntimes/NodeJS/ms-rest-azure/lib/credentials/userTokenCredentials.js
index ea25138765cd9..7b4f02cf720bf 100644
--- a/ClientRuntimes/NodeJS/ms-rest-azure/lib/credentials/userTokenCredentials.js
+++ b/ClientRuntimes/NodeJS/ms-rest-azure/lib/credentials/userTokenCredentials.js
@@ -78,10 +78,10 @@ function UserTokenCredentials(clientId, domain, username, password, clientRedire
 */
 UserTokenCredentials.prototype.signRequest = function (webResource, callback) {
   var self = this;
-  var authorityUrl = self.environment.authenticationEndpoint + self.domain;
+  var authorityUrl = self.environment.activeDirectoryEndpointUrl + self.domain;
   var context = new adal.AuthenticationContext(authorityUrl, self.environment.validateAuthority, self.tokenCache);
   
-  context.acquireTokenWithUsernamePassword(self.environment.tokenAudience, self.username, self.password, self.clientId, function (err, result) {
+  context.acquireTokenWithUsernamePassword(self.environment.activeDirectoryResourceId, self.username, self.password, self.clientId, function (err, result) {
     if (err) {
       return callback(new Error('Failed to acquire token. \n' + err));
     }
diff --git a/ClientRuntimes/NodeJS/ms-rest-azure/lib/index.d.ts b/ClientRuntimes/NodeJS/ms-rest-azure/lib/index.d.ts
index 818d584985ec7..ef4378cff4e40 100644
--- a/ClientRuntimes/NodeJS/ms-rest-azure/lib/index.d.ts
+++ b/ClientRuntimes/NodeJS/ms-rest-azure/lib/index.d.ts
@@ -1,22 +1,22 @@
 import * as msRest from 'ms-rest';
 
 export interface AzureServiceClientOptions extends msRest.ServiceClientOptions {
-	// TODO: Make this property have right type
-	// 	* @param {Array} [options.longRunningOperationRetryTimeout] - Retry timeout
-	longRunningOperationRetryTimeout?: any;
+  // TODO: Make this property have right type
+  //  * @param {Array} [options.longRunningOperationRetryTimeout] - Retry timeout
+  longRunningOperationRetryTimeout?: any;
 }
 
 export class AzureServiceClient extends msRest.ServiceClient {
-	/**
-	* @class
-	* Initializes a new instance of the AzureServiceClient class.
-	* @constructor
-	* @param {ServiceClientCredentials} credentials - ApplicationTokenCredentials or 
-	* UserTokenCredentials object used for authentication.  
-	* 
-	* @param {object} options - The parameter options used by ServiceClient
-	* 
-	* @param {string} [options.acceptLanguage] - Gets or sets the preferred language for the response. 
+  /**
+  * @class
+  * Initializes a new instance of the AzureServiceClient class.
+  * @constructor
+  * @param {ServiceClientCredentials} credentials - ApplicationTokenCredentials or 
+  * UserTokenCredentials object used for authentication.  
+  * 
+  * @param {object} options - The parameter options used by ServiceClient
+  * 
+  * @param {string} [options.acceptLanguage] - Gets or sets the preferred language for the response. 
     * Default value is: 'en-US'.
     *  
     * @param {boolean} [options.generateClientRequestId] - When set to true a unique x-ms-client-request-id value 
@@ -24,81 +24,165 @@ export class AzureServiceClient extends msRest.ServiceClient {
     * 
     * @param {number} [options.longRunningOperationRetryTimeout] - Gets or sets the retry timeout in seconds for 
     * Long Running Operations. Default value is 30.
-	*/
-	constructor(credentials: msRest.ServiceClientCredentials, options: AzureServiceClientOptions)
+  */
+  constructor(credentials: msRest.ServiceClientCredentials, options: AzureServiceClientOptions)
 }
 
 export class AzureEnvironment {
-	/**
-	* Initializes a new instance of the AzureEnvironment class.
-	* @param {string} authenticationEndpoint - ActiveDirectory Endpoint for the Azure Environment.
-	* @param {string} tokenAudience - Token audience for an endpoint.
-	* @param {bool} [validateAuthority] - Determines whether the authentication endpoint should 
-	* be validated with Azure AD. Default value is true.
-	*/
-	constructor(authenticationEndpoint: string, tokenAudience: string, validateAuthority: boolean);
-	
-	/**
-	 * ActiveDirectory Endpoint for the Azure Environment
-	 */
-	authenticationEndpoint: string;
-	
-	/**
-	 * Token audience for an endpoint.
-	 */
-	tokenAudience: string;
-	
-	/**
-	 * Determines whether the authentication endpoint should be validated with Azure AD. Default value is true.
-	 */
-	validateAuthority: boolean;
+  /**
+  * Initializes a new instance of the AzureEnvironment class.
+  * @param {string} parameters.name - The Environment name
+  * @param {string} parameters.portalUrl - The management portal URL
+  * @param {string} parameters.managementEndpointUrl - The management service endpoint
+  * @param {string} parameters.resourceManagerEndpointUrl - The resource management endpoint
+  * @param {string} parameters.activeDirectoryEndpointUrl - The Active Directory login endpoint
+  * @param {string} parameters.activeDirectoryResourceId - The resource ID to obtain AD tokens for (token audience)
+  * @param {string} [parameters.publishingProfileUrl] - The publish settings file URL
+  * @param {string} [parameters.sqlManagementEndpointUrl] - The sql server management endpoint for mobile commands
+  * @param {string} [parameters.sqlServerHostnameSuffix] - The dns suffix for sql servers
+  * @param {string} [parameters.galleryEndpointUrl] - The template gallery endpoint
+  * @param {string} [parameters.activeDirectoryGraphResourceId] - The Active Directory resource ID
+  * @param {string} [parameters.activeDirectoryGraphApiVersion] - The Active Directory api version
+  * @param {string} [parameters.storageEndpointSuffix] - The endpoint suffix for storage accounts
+  * @param {string} [parameters.keyVaultDnsSuffix] - The keyvault service dns suffix
+  * @param {string} [parameters.azureDataLakeStoreFileSystemEndpointSuffix] - The data lake store filesystem service dns suffix
+  * @param {string} [parameters.azureDataLakeAnalyticsCatalogAndJobEndpointSuffix] - The data lake analytics job and catalog service dns suffix
+  * @param {bool} [parameters.validateAuthority] - Determines whether the authentication endpoint should 
+  * be validated with Azure AD. Default value is true.
+  */
+  constructor(parameters: any);
+  
+  /**
+   * The Environment name.
+   */
+  name: string;
+  
+  /**
+   * The management portal URL.
+   */
+  portalUrl: string;
+  
+  /**
+   * The management service endpoint.
+   */
+  managementEndpointUrl: string;
+
+  /**
+   * The resource management endpoint.
+   */
+  resourceManagerEndpointUrl: string;
+
+  /**
+   * The Active Directory login endpoint.
+   */
+  activeDirectoryEndpointUrl: string;
+
+  /**
+   * The resource ID to obtain AD tokens for (token audience).
+   */
+  activeDirectoryResourceId: string;
+  
+  /**
+   * The publish settings file URL.
+   */
+  publishingProfileUrl: string;
+
+  /**
+   * The sql server management endpoint for mobile commands.
+   */
+  sqlManagementEndpointUrl: string;
+
+  /**
+   * The dns suffix for sql servers.
+   */
+  sqlServerHostnameSuffix: string;
+
+  /**
+   * The template gallery endpoint.
+   */
+  galleryEndpointUrl: string;
+
+  /**
+   * The Active Directory resource ID.
+   */
+  activeDirectoryGraphResourceId: string;
+  
+  /**
+   * The Active Directory api version.
+   */
+  activeDirectoryGraphApiVersion: string;
+  
+  /**
+   * The endpoint suffix for storage accounts.
+   */
+  storageEndpointSuffix: string;
+  
+  /**
+   * The keyvault service dns suffix.
+   */
+  keyVaultDnsSuffix: string;
+  
+  /**
+   * The data lake store filesystem service dns suffix.
+   */
+  azureDataLakeStoreFileSystemEndpointSuffix: string;
+
+  /**
+   * The data lake analytics job and catalog service dns suffix.
+   */
+  azureDataLakeAnalyticsCatalogAndJobEndpointSuffix: string;
+
+  /**
+   * Determines whether the authentication endpoint should be validated with Azure AD. Default value is true.
+   */
+  validateAuthority: boolean;
 }
 
 
 export interface AzureTokenCredentialsOptions {
-	/**
-	 * The Azure environment to authenticate with.
-	 */
-	environment?: AzureEnvironment;
-	
-	/**
-	 * The authorization scheme. Default value is 'Bearer'.
-	 */
-	authorizationScheme?: string;
-
-	// TODO: What type should this really have?   How is it used?
-	/**
-	 * The token cache. Default value is null.
-	 */
-	tokenCache?: any;
+  /**
+   * The Azure environment to authenticate with.
+   */
+  environment?: AzureEnvironment;
+  
+  /**
+   * The authorization scheme. Default value is 'Bearer'.
+   */
+  authorizationScheme?: string;
+
+  // TODO: What type should this really have?   How is it used?
+  /**
+   * The token cache. Default value is null.
+   */
+  tokenCache?: any;
 }
 
 export class ApplicationTokenCredentials extends msRest.ServiceClientCredentials {
-	/**
-	* Creates a new ApplicationTokenCredentials object.
-	* See {@link https://azure.microsoft.com/en-us/documentation/articles/active-directory-devquickstarts-dotnet/ Active Directory Quickstart for .Net} 
-	* for detailed instructions on creating an Azure Active Directory application.
-	* @param {string} clientId The active directory application client id. 
-	* @param {string} domain The domain or tenant id containing this application.
-	* @param {string} secret The authentication secret for the application.
-	* @param {AzureTokenCredentialsOptions} options Object representing optional parameters.
-	*/
-	constructor(clientId: string, domain: string, secret: string, options?: AzureTokenCredentialsOptions);
+  /**
+  * Creates a new ApplicationTokenCredentials object.
+  * See {@link https://azure.microsoft.com/en-us/documentation/articles/active-directory-devquickstarts-dotnet/ Active Directory Quickstart for .Net} 
+  * for detailed instructions on creating an Azure Active Directory application.
+  * @param {string} clientId The active directory application client id. 
+  * @param {string} domain The domain or tenant id containing this application.
+  * @param {string} secret The authentication secret for the application.
+  * @param {AzureTokenCredentialsOptions} options Object representing optional parameters.
+  */
+  constructor(clientId: string, domain: string, secret: string, options?: AzureTokenCredentialsOptions);
 }
 
 export class UserTokenCredentials extends msRest.ServiceClientCredentials {
-	/**
-	* Creates a new UserTokenCredentials object.
-	* See {@link https://azure.microsoft.com/en-us/documentation/articles/active-directory-devquickstarts-dotnet/ Active Directory Quickstart for .Net} 
-	* for an example.
-	* @param {string} clientId The active directory application client id. 
-	* @param {string} domain The domain or tenant id containing this application.
-	* @param {string} username The user name for the Organization Id account.
-	* @param {string} password The password for the Organization Id account.
-	* @param {string} clientRedirectUri The Uri where the user will be redirected after authenticating with AD.
-	* @param {AzureTokenCredentialsOptions} options Object representing optional parameters.
-	*/
-	constructor(clientId: string, domain: string, username: string, password: string, clientRedirectUri: string, options?: AzureTokenCredentialsOptions);
+  /**
+  * Creates a new UserTokenCredentials object.
+  * See {@link https://azure.microsoft.com/en-us/documentation/articles/active-directory-devquickstarts-dotnet/ Active Directory Quickstart for .Net} 
+  * for an example.
+  * @param {string} clientId The active directory application client id. 
+  * @param {string} domain The domain or tenant id containing this application.
+  * @param {string} username The user name for the Organization Id account.
+  * @param {string} password The password for the Organization Id account.
+  * @param {string} clientRedirectUri The Uri where the user will be redirected after authenticating with AD.
+  * @param {AzureTokenCredentialsOptions} options Object representing optional parameters.
+  */
+  constructor(clientId: string, domain: string, username: string, password: string, clientRedirectUri: string, options?: AzureTokenCredentialsOptions);
 }
 
 // TODO: WHAT SHOULD WE EXPOSE HERE?
diff --git a/ClientRuntimes/NodeJS/ms-rest-azure/lib/pollingState.js b/ClientRuntimes/NodeJS/ms-rest-azure/lib/pollingState.js
index 87a68bf6dfc25..114eedf25c573 100644
--- a/ClientRuntimes/NodeJS/ms-rest-azure/lib/pollingState.js
+++ b/ClientRuntimes/NodeJS/ms-rest-azure/lib/pollingState.js
@@ -40,24 +40,31 @@ function PollingState(resultOfInitialRequest, retryTimeout) {
     throw deserializationError;
   }
   
-  if (this.resource && this.resource.properties && this.resource.properties.provisioningState) {
-    this.status = this.resource.properties.provisioningState;
-  } else {
-    switch (this.response.statusCode) {
-      case 202:
-        this.status = LroStates.InProgress;
-        break;
+  switch (this.response.statusCode) {
+    case 202:
+      this.status = LroStates.InProgress;
+      break;
 
-      case 204:
-      case 201:
-      case 200:
+    case 204:
+      this.status = LroStates.Succeeded;
+      break;
+    case 201:
+      if (this.resource && this.resource.properties && this.resource.properties.provisioningState) {
+        this.status = this.resource.properties.provisioningState;
+      } else {
+        this.status = LroStates.InProgress;
+      }
+      break;
+    case 200:
+      if (this.resource && this.resource.properties && this.resource.properties.provisioningState) {
+        this.status = this.resource.properties.provisioningState;
+      } else {
         this.status = LroStates.Succeeded;
-        break;
-
-      default:
-        this.status = LroStates.Failed;
-        break;
-    }
+      }
+      break;
+    default:
+      this.status = LroStates.Failed;
+      break;
   }
 }
 
diff --git a/ClientRuntimes/NodeJS/ms-rest-azure/package.json b/ClientRuntimes/NodeJS/ms-rest-azure/package.json
index 0cb2731447104..cd4e61c7c9655 100644
--- a/ClientRuntimes/NodeJS/ms-rest-azure/package.json
+++ b/ClientRuntimes/NodeJS/ms-rest-azure/package.json
@@ -5,7 +5,7 @@
     "email": "azsdkteam@microsoft.com",
     "url": "https://github.com/Azure/AutoRest"
   },
-  "version": "1.12.0",
+  "version": "1.13.1",
   "description": "Client Runtime for Node.js Azure client libraries generated using AutoRest",
   "tags": [ "node", "microsoft", "autorest", "azure", "clientruntime" ],
   "keywords": [ "node", "microsoft", "autorest", "azure", "clientruntime" ],
@@ -13,24 +13,18 @@
   "engines": {
     "node": ">= 0.10.0"
   },
-  "licenses": [
-    {
-      "type": "MIT",
-      "url": "https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE"
-    }
-  ],
+  "license": "MIT",
   "dependencies": {
     "async": "0.2.7",
     "uuid": "2.0.1",
     "adal-node": "0.1.17",
-    "ms-rest": "^1.12.0",
-    "underscore": "^1.4.0",
+    "ms-rest": "^1.13.1",
     "moment": "^2.6.0"
   },
   "devDependencies": {
     "jshint": "2.6.3",
     "xunit-file": "0.0.5",
-    "mocha": "2.2.5",
+    "mocha": "2.4.5",
     "should": "5.2.0"
   },
   "homepage": "https://github.com/Azure/AutoRest",
diff --git a/ClientRuntimes/NodeJS/ms-rest-azure/test/azureEnvironmentTests.js b/ClientRuntimes/NodeJS/ms-rest-azure/test/azureEnvironmentTests.js
new file mode 100644
index 0000000000000..26f8db2e2e3e8
--- /dev/null
+++ b/ClientRuntimes/NodeJS/ms-rest-azure/test/azureEnvironmentTests.js
@@ -0,0 +1,91 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+var should = require('should');
+var msRestAzure = require('../lib/msRestAzure');
+
+describe('AzureEnvironment', function() {
+  it('can be properly required', function(done) {
+    var tempEnv = msRestAzure.AzureEnvironment;
+    tempEnv.validateAuthority.should.equal(true);
+    done();
+  });
+
+  it('should show the details of Azure Production environment correctly', function(done) {
+    var tempEnv = msRestAzure.AzureEnvironment.Azure;
+    tempEnv.name.should.equal('Azure');
+    tempEnv.activeDirectoryEndpointUrl.should.equal('https://login.microsoftonline.com/');
+    tempEnv.activeDirectoryResourceId.should.equal('https://management.core.windows.net/');
+    tempEnv.managementEndpointUrl.should.equal('https://management.core.windows.net');
+    tempEnv.resourceManagerEndpointUrl.should.equal('https://management.azure.com/');
+    tempEnv.portalUrl.should.equal('http://go.microsoft.com/fwlink/?LinkId=254433');
+    tempEnv.validateAuthority.should.equal(true);
+    done();
+  });
+
+  it('should show the details of Azure China environment correctly', function(done) {
+    var tempEnv = msRestAzure.AzureEnvironment.AzureChina;
+    tempEnv.name.should.equal('AzureChina');
+    tempEnv.activeDirectoryEndpointUrl.should.equal('https://login.chinacloudapi.cn/');
+    tempEnv.activeDirectoryResourceId.should.equal('https://management.core.chinacloudapi.cn/');
+    tempEnv.managementEndpointUrl.should.equal('https://management.core.chinacloudapi.cn');
+    tempEnv.resourceManagerEndpointUrl.should.equal('https://management.chinacloudapi.cn');
+    tempEnv.portalUrl.should.equal('http://go.microsoft.com/fwlink/?LinkId=301902');
+    tempEnv.validateAuthority.should.equal(true);
+    done();
+  });
+
+  it('should show the details of Azure USGovernment environment correctly', function(done) {
+    var tempEnv = msRestAzure.AzureEnvironment.AzureUSGovernment;
+    tempEnv.name.should.equal('AzureUSGovernment');
+    tempEnv.activeDirectoryEndpointUrl.should.equal('https://login.microsoftonline.com/');
+    tempEnv.activeDirectoryResourceId.should.equal('https://management.core.usgovcloudapi.net/');
+    tempEnv.managementEndpointUrl.should.equal('https://management.core.usgovcloudapi.net');
+    tempEnv.resourceManagerEndpointUrl.should.equal('https://management.usgovcloudapi.net');
+    tempEnv.portalUrl.should.equal('https://manage.windowsazure.us');
+    tempEnv.validateAuthority.should.equal(true);
+    done();
+  });
+
+  it('should show the details of Azure GermanCloud environment correctly', function(done) {
+    var tempEnv = msRestAzure.AzureEnvironment.AzureGermanCloud;
+    tempEnv.name.should.equal('AzureGermanCloud');
+    tempEnv.activeDirectoryEndpointUrl.should.equal('https://login.microsoftonline.de/');
+    tempEnv.activeDirectoryResourceId.should.equal('https://management.core.cloudapi.de/');
+    tempEnv.managementEndpointUrl.should.equal('https://management.core.cloudapi.de');
+    tempEnv.resourceManagerEndpointUrl.should.equal('https://management.microsoftazure.de');
+    tempEnv.portalUrl.should.equal('http://portal.microsoftazure.de/');
+    tempEnv.validateAuthority.should.equal(true);
+    done();
+  });
+
+  it('should be able to add a new environment', function(done) {
+    var df = {
+      name: 'Dogfood',
+      portalUrl: 'http://go.microsoft.com/fwlink/?LinkId=254433',
+      managementEndpointUrl: 'https://management.core.windows.net',
+      resourceManagerEndpointUrl: 'https://management.azure.com/',
+      activeDirectoryEndpointUrl: 'https://login.microsoftonline.com/',
+      activeDirectoryResourceId: 'https://management.core.windows.net/'
+    };
+    var tempEnv = msRestAzure.AzureEnvironment;
+    var dfood = tempEnv.add(df);
+    dfood.name.should.equal('Dogfood');
+    dfood.activeDirectoryEndpointUrl.should.equal('https://login.microsoftonline.com/');
+    dfood.activeDirectoryResourceId.should.equal('https://management.core.windows.net/');
+    dfood.managementEndpointUrl.should.equal('https://management.core.windows.net');
+    dfood.resourceManagerEndpointUrl.should.equal('https://management.azure.com/');
+    dfood.portalUrl.should.equal('http://go.microsoft.com/fwlink/?LinkId=254433');
+    dfood.validateAuthority.should.equal(true);
+
+    //Verify that the environment properly got added to the prototype
+    tempEnv.Dogfood.name.should.equal('Dogfood');
+    tempEnv.Dogfood.activeDirectoryEndpointUrl.should.equal('https://login.microsoftonline.com/');
+    tempEnv.Dogfood.activeDirectoryResourceId.should.equal('https://management.core.windows.net/');
+    tempEnv.Dogfood.managementEndpointUrl.should.equal('https://management.core.windows.net');
+    tempEnv.Dogfood.resourceManagerEndpointUrl.should.equal('https://management.azure.com/');
+    tempEnv.Dogfood.portalUrl.should.equal('http://go.microsoft.com/fwlink/?LinkId=254433');
+    tempEnv.Dogfood.validateAuthority.should.equal(true);
+    done();
+  });
+});
\ No newline at end of file
diff --git a/ClientRuntimes/NodeJS/ms-rest-azure/test/azureServiceClientTests.js b/ClientRuntimes/NodeJS/ms-rest-azure/test/azureServiceClientTests.js
index e28f44bf5ad68..8e11e689690b7 100644
--- a/ClientRuntimes/NodeJS/ms-rest-azure/test/azureServiceClientTests.js
+++ b/ClientRuntimes/NodeJS/ms-rest-azure/test/azureServiceClientTests.js
@@ -92,9 +92,10 @@ describe('AzureServiceClient', function () {
 
     describe('Put', function () {
       resultOfInitialRequest.response.statusCode = 201;
-     
+	  resultOfInitialRequest.request.method = 'PUT';
+	  
       it('throw on not Lro related status code', function (done) {
-        client.getPutOrPatchOperationResult({ response: {statusCode: 10000}, request: { url:"http://foo" }}, function (err, result) {
+        client.getPutOrPatchOperationResult({ response: {statusCode: 10000}, request: { url:"http://foo", method:'PUT' }}, function (err, result) {
           err.message.should.containEql('Unexpected polling status code from long running operation');
           done();
         });
@@ -156,11 +157,57 @@ describe('AzureServiceClient', function () {
       });
     });
     
+	describe('Patch', function () {
+	  resultOfInitialRequest.response.statusCode = 202;
+	  resultOfInitialRequest.body.properties.provisioningState = LroStates.Succeeded;
+	  resultOfInitialRequest.request.method = 'PATCH';
+	  
+	  it('works by polling from location header', function (done) {
+	    resultOfInitialRequest.response.headers['azure-asyncoperation'] = '';
+        resultOfInitialRequest.response.headers['location'] = urlFromLocationHeader_Return200;
+		client.getLongRunningOperationResult(resultOfInitialRequest, function (err, result) {
+          should.not.exist(err);
+          JSON.parse(result.body).name.should.equal(testResourceName);
+		  should.exist(result.response.randomFieldFromPollLocationHeader);
+          done();
+        });
+	  });
+	  
+	  it('works by polling from azure-asyncoperation header', function (done) {
+	    resultOfInitialRequest.response.headers['azure-asyncoperation'] = urlFromAzureAsyncOPHeader_Return200;
+		resultOfInitialRequest.response.headers['location'] = '';
+		client.getLongRunningOperationResult(resultOfInitialRequest, function (err, result) {
+          should.not.exist(err);
+          JSON.parse(result.body).name.should.equal(testResourceName);
+          done();
+        });
+	  });
+	  
+	  it('returns error if failed to poll from the azure-asyncoperation header', function (done) {
+        resultOfInitialRequest.response.headers['azure-asyncoperation'] = url_ReturnError;
+        resultOfInitialRequest.response.headers['location'] = '';
+        client.getLongRunningOperationResult(resultOfInitialRequest, function (err, result) {
+          err.message.should.containEql(testError);
+          done();
+        });
+      });
+	  
+	  it('returns error if failed to poll from the location header', function (done) {
+        resultOfInitialRequest.response.headers['azure-asyncoperation'] = '';
+        resultOfInitialRequest.response.headers['location'] = url_ReturnError;
+        client.getLongRunningOperationResult(resultOfInitialRequest, function (err, result) {
+          err.message.should.containEql(testError);
+          done();
+        });
+      });
+	});
+	
     describe('Post-or-Delete', function () {
       resultOfInitialRequest.response.statusCode = 202;
-      
+      resultOfInitialRequest.body.properties.provisioningState = LroStates.Succeeded;
+	  
       it('throw on not Lro related status code', function (done) {
-        client.getPostOrDeleteOperationResult({ response: { statusCode: 201 } }, function (err, result) {
+        client.getPostOrDeleteOperationResult({ response: { statusCode: 201 }, request: {url: url_resource, method: 'POST'}}, function (err, result) {
           err.message.should.containEql('Unexpected polling status code from long running operation');
           done();
         });
@@ -169,6 +216,7 @@ describe('AzureServiceClient', function () {
       it('works by polling from the azure-asyncoperation header', function (done) {
         resultOfInitialRequest.response.headers['azure-asyncoperation'] = urlFromAzureAsyncOPHeader_Return200;
         resultOfInitialRequest.response.headers['location'] = '';
+		resultOfInitialRequest.request.method = 'POST';
         client.getPostOrDeleteOperationResult(resultOfInitialRequest, function (err, result) {
           should.not.exist(err);
           should.exist(result.response.randomFieldFromPollAsyncOpHeader);
@@ -219,7 +267,7 @@ describe('AzureServiceClient', function () {
         negativeClient.addFilter(mockFilter({ statusCode: 200, body: badResponseBody }, badResponseBody));
         resultOfInitialRequest.response.headers['azure-asyncoperation'] = '';
         resultOfInitialRequest.response.headers['location'] = urlFromLocationHeader_Return200;
-        negativeClient.getPutOrPatchOperationResult(resultOfInitialRequest, function (err, result) {
+        negativeClient.getLongRunningOperationResult(resultOfInitialRequest, function (err, result) {
           should.exist(err);
           should.exist(err.response);
           should.exist(err.message);
@@ -234,7 +282,7 @@ describe('AzureServiceClient', function () {
         negativeClient.addFilter(mockFilter({ statusCode: 200, body: badResponseBody }, badResponseBody));
         resultOfInitialRequest.response.headers['azure-asyncoperation'] = '';
         resultOfInitialRequest.response.headers['location'] = urlFromLocationHeader_Return200;
-        negativeClient.getPutOrPatchOperationResult(resultOfInitialRequest, negativeClient._getStatus, function (err, result) {
+        negativeClient.getLongRunningOperationResult(resultOfInitialRequest, negativeClient._getStatus, function (err, result) {
           should.exist(err);
           should.exist(err.response);
           should.exist(err.message);
@@ -249,7 +297,7 @@ describe('AzureServiceClient', function () {
         negativeClient.addFilter(mockFilter({ statusCode: 203, body: badResponseBody }, badResponseBody));
         resultOfInitialRequest.response.headers['azure-asyncoperation'] = '';
         resultOfInitialRequest.response.headers['location'] = urlFromLocationHeader_Return200;
-        negativeClient.getPutOrPatchOperationResult(resultOfInitialRequest, function (err, result) {
+        negativeClient.getLongRunningOperationResult(resultOfInitialRequest, function (err, result) {
           should.exist(err);
           should.exist(err.response);
           should.exist(err.message);
diff --git a/ClientRuntimes/NodeJS/ms-rest-azure/test/package.json b/ClientRuntimes/NodeJS/ms-rest-azure/test/package.json
index a4970d007d2f2..248a41a8851c5 100644
--- a/ClientRuntimes/NodeJS/ms-rest-azure/test/package.json
+++ b/ClientRuntimes/NodeJS/ms-rest-azure/test/package.json
@@ -31,8 +31,7 @@
     "xunit-file": "0.0.5",
     "mocha": "2.2.5",
     "should": "5.2.0",
-    "moment":  "*",
-    "underscore": "*"
+    "moment":  "*"
   },
   "homepage": "https://github.com/Azure/AutoRest",
   "repository": {
diff --git a/ClientRuntimes/NodeJS/ms-rest-azure/test/testlist.txt b/ClientRuntimes/NodeJS/ms-rest-azure/test/testlist.txt
index 611875592179e..83a9769333bf7 100644
--- a/ClientRuntimes/NodeJS/ms-rest-azure/test/testlist.txt
+++ b/ClientRuntimes/NodeJS/ms-rest-azure/test/testlist.txt
@@ -1 +1,2 @@
-azureServiceClientTests.js
\ No newline at end of file
+azureServiceClientTests.js
+azureEnvironmentTests.js
\ No newline at end of file
diff --git a/ClientRuntimes/NodeJS/ms-rest/LICENSE b/ClientRuntimes/NodeJS/ms-rest/LICENSE
new file mode 100644
index 0000000000000..b8b569d7746d9
--- /dev/null
+++ b/ClientRuntimes/NodeJS/ms-rest/LICENSE
@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Microsoft
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
diff --git a/ClientRuntimes/NodeJS/ms-rest/README.md b/ClientRuntimes/NodeJS/ms-rest/README.md
index cb4aca73ab405..1da52bff1ac92 100644
--- a/ClientRuntimes/NodeJS/ms-rest/README.md
+++ b/ClientRuntimes/NodeJS/ms-rest/README.md
@@ -18,7 +18,7 @@ var msrest = require('ms-rest');
 ## Serialization/Deserialization
 Features
 - Type checking
-  - (String, Number, Boolean, ByteArray, Date, DateTime, Enum, TimeSpan, DateTimeRfc1123, Object, Stream, Sequence, Dictionary, Composite, Uuid(as a string))
+  - (String, Number, Boolean, ByteArray, Base64Url, Date, DateTime, Enum, TimeSpan, DateTimeRfc1123, UnixTime, Object, Stream, Sequence, Dictionary, Composite, Uuid(as a string))
 - Validation of specified constraints
   - ExclusiveMaximum, ExclusiveMinimum, InclusiveMaximum, InclusiveMinimum, MaxItems, MaxLength, MinItems, MinLength, MultipleOf, Pattern, UniqueItems
 - Flattening/Unflattening properties
@@ -26,6 +26,7 @@ Features
 - Model Properties marked as constant are set during serialization, irrespective of they being provided or not
 - Required check (If a model or property is marked required and is not provided in the object then an error is thrown)
 - Readonly check (If a model or property is marked readonly then it is not sent on the wire during, serialization)
+- Serializing Constant values
 
 - serialize an array of dictionary of primitive values
 ```javascript
diff --git a/ClientRuntimes/NodeJS/ms-rest/lib/serialization.js b/ClientRuntimes/NodeJS/ms-rest/lib/serialization.js
index de8d0778efd92..671292b9f43ba 100644
--- a/ClientRuntimes/NodeJS/ms-rest/lib/serialization.js
+++ b/ClientRuntimes/NodeJS/ms-rest/lib/serialization.js
@@ -74,7 +74,7 @@ exports.serialize = function (mapper, object, objectName) {
     payload = serializeBasicTypes.call(this, mapperType, objectName, object);
   } else if (mapperType.match(/^Enum$/ig) !== null) {
     payload = serializeEnumType.call(this, objectName, mapper.type.allowedValues, object);
-  } else if (mapperType.match(/^(Date|DateTime|TimeSpan|DateTimeRfc1123)$/ig) !== null) {
+  } else if (mapperType.match(/^(Date|DateTime|TimeSpan|DateTimeRfc1123|UnixTime)$/ig) !== null) {
     payload = serializeDateTypes.call(this, mapperType, object, objectName);
   } else if (mapperType.match(/^ByteArray$/ig) !== null) {
     payload = serializeBufferType.call(this, objectName, object);
@@ -370,6 +370,13 @@ function serializeDateTypes(typeName, value, objectName) {
         throw new Error(util.format('%s must be an instanceof Date or a string in RFC-1123 format.', objectName));
       }
       value = (value instanceof Date) ? value.toUTCString() :  new Date(value).toUTCString();
+    } else if (typeName.match(/^UnixTime$/ig) !== null) {
+      if (!(value instanceof Date || 
+        (typeof value.valueOf() === 'string' && !isNaN(Date.parse(value))))) {
+        throw new Error(util.format('%s must be an instanceof Date or a string in RFC-1123/ISO8601 format ' + 
+          'for it to be serialized in UnixTime/Epoch format.', objectName));
+      }
+      value = dateToUnixTime(value);
     } else if (typeName.match(/^TimeSpan$/ig) !== null) {
       if (!moment.isDuration(value)) {
         throw new Error(util.format('%s must be a TimeSpan/Duration.', objectName));
@@ -402,8 +409,10 @@ exports.deserialize = function (mapper, responseBody, objectName) {
     payload = responseBody;
   } else if (mapperType.match(/^(Date|DateTime|DateTimeRfc1123)$/ig) !== null) {
     payload = new Date(responseBody);
-  } else if (mapperType.match(/^(TimeSpan)$/ig) !== null) {
+  } else if (mapperType.match(/^TimeSpan$/ig) !== null) {
     payload = moment.duration(responseBody);
+  } else if (mapperType.match(/^UnixTime$/ig) !== null) {
+    payload = unixTimeToDate(responseBody);
   } else if (mapperType.match(/^ByteArray$/ig) !== null) {
     payload = new Buffer(responseBody, 'base64');
   } else if (mapperType.match(/^Base64Url$/ig) !== null) {
@@ -595,4 +604,21 @@ function base64UrlToBuffer(str) {
   return new Buffer(str, 'base64');
 }
 
+function dateToUnixTime(d) {
+  if (!d) {
+    return null;
+  }
+  if (typeof d.valueOf() === 'string') {
+    d = new Date(d);
+  }
+  return parseInt(d.getTime() / 1000);
+}
+
+function unixTimeToDate(n) {
+  if (!n) {
+    return null;
+  }
+  return new Date(n*1000);
+}
+
 exports = module.exports;
\ No newline at end of file
diff --git a/ClientRuntimes/NodeJS/ms-rest/package.json b/ClientRuntimes/NodeJS/ms-rest/package.json
index b21efcee2df2c..656299783e9f9 100644
--- a/ClientRuntimes/NodeJS/ms-rest/package.json
+++ b/ClientRuntimes/NodeJS/ms-rest/package.json
@@ -5,7 +5,7 @@
     "email": "azsdkteam@microsoft.com",
     "url": "https://github.com/Azure/AutoRest"
   },
-  "version": "1.12.0",
+  "version": "1.13.1",
   "description": "Client Runtime for Node.js client libraries generated using AutoRest",
   "tags": ["node", "microsoft", "autorest", "clientruntime"],
   "keywords": ["node", "microsoft", "autorest", "clientruntime"],
@@ -14,12 +14,7 @@
   "engines": {
     "node": ">= 0.10.0"
   },
-  "licenses": [
-    {
-      "type": "MIT",
-      "url": "https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE"
-    }
-  ],
+  "license": "MIT",
   "dependencies": {
     "underscore": "^1.4.0",
     "tunnel": "~0.0.2",
@@ -31,7 +26,7 @@
   "devDependencies": {
     "jshint": "2.6.3",
     "xunit-file": "0.0.5",
-    "mocha": "2.2.5",
+    "mocha": "2.4.5",
     "should": "5.2.0",
     "node-uuid": "*"
   },
diff --git a/ClientRuntimes/NodeJS/ms-rest/test/serializationTests.js b/ClientRuntimes/NodeJS/ms-rest/test/serializationTests.js
index d9be4bd39fba9..32c89671d37cf 100644
--- a/ClientRuntimes/NodeJS/ms-rest/test/serializationTests.js
+++ b/ClientRuntimes/NodeJS/ms-rest/test/serializationTests.js
@@ -195,6 +195,12 @@ describe('msrest', function () {
       serializedDateString.should.equal('+010000-01-01T11:59:59.000Z');
       done();
     });
+    it('should correctly serialize a Date object with max value and format UnixTime', function (done) {
+      mapper = { type : { name: 'UnixTime' } };
+      var serializedDate = msRest.serialize(mapper, new Date('9999-12-31T23:59:59-12:00'), 'dateTimeObj');
+      serializedDate.should.equal(253402343999);
+      done();
+    });
     it('should correctly serialize a string in DateTimeRfc1123', function (done) {
       mapper = { type : { name: 'DateTimeRfc1123' } };
       var rfc = new Date('Mon, 01 Jan 0001 00:00:00 GMT');
diff --git a/ClientRuntimes/Python/msrest/doc/conf.py b/ClientRuntimes/Python/msrest/doc/conf.py
index 1dfe56981ffc9..169d6053b55f8 100644
--- a/ClientRuntimes/Python/msrest/doc/conf.py
+++ b/ClientRuntimes/Python/msrest/doc/conf.py
@@ -57,9 +57,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.2.0'
+version = '0.3.0'
 # The full version, including alpha/beta/rc tags.
-release = '0.2.0'
+release = '0.3.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/ClientRuntimes/Python/msrest/msrest/http_logger.py b/ClientRuntimes/Python/msrest/msrest/http_logger.py
index b19405528cf96..5159a996a6e8f 100644
--- a/ClientRuntimes/Python/msrest/msrest/http_logger.py
+++ b/ClientRuntimes/Python/msrest/msrest/http_logger.py
@@ -81,8 +81,8 @@ def log_response(adapter, request, response, *args, **kwargs):
             _LOGGER.debug("Body contains binary data.")
         elif result.headers.get("content-type", "").startswith("image"):
             _LOGGER.debug("Body contains image data.")
-        # elif result.headers.get("transfer-encoding") == 'chunked':
-        #    LOGGER.debug("Body contains chunked data.")
+        elif result.headers.get("transfer-encoding") == 'chunked':
+            _LOGGER.debug("Body contains chunked data.")
         else:
             _LOGGER.debug(str(result.content))
         return result
diff --git a/ClientRuntimes/Python/msrest/msrest/serialization.py b/ClientRuntimes/Python/msrest/msrest/serialization.py
index 40f4c88578686..4675cd6aacee7 100644
--- a/ClientRuntimes/Python/msrest/msrest/serialization.py
+++ b/ClientRuntimes/Python/msrest/msrest/serialization.py
@@ -186,7 +186,8 @@ def _serialize(self, target_obj, data_type=None, **kwargs):
                     attr_type = map['type']
                     orig_attr = getattr(target_obj, attr)
                     validation = target_obj._validation.get(attr_name, {})
-                    self.validate(orig_attr, attr_name, **validation)
+                    orig_attr = self.validate(
+                        orig_attr, attr_name, **validation)
                     new_attr = self.serialize_data(
                         orig_attr, attr_type, **kwargs)
 
@@ -245,7 +246,7 @@ def url(self, name, data, data_type, **kwargs):
         :raises: TypeError if serialization fails.
         :raises: ValueError if data is None
         """
-        self.validate(data, name, required=True, **kwargs)
+        data = self.validate(data, name, required=True, **kwargs)
         try:
             output = self.serialize_data(data, data_type, **kwargs)
             if data_type == 'bool':
@@ -269,7 +270,7 @@ def query(self, name, data, data_type, **kwargs):
         :raises: TypeError if serialization fails.
         :raises: ValueError if data is None
         """
-        self.validate(data, name, required=True, **kwargs)
+        data = self.validate(data, name, required=True, **kwargs)
         try:
             if data_type in ['[str]']:
                 data = ["" if d is None else d for d in data]
@@ -295,7 +296,7 @@ def header(self, name, data, data_type, **kwargs):
         :raises: TypeError if serialization fails.
         :raises: ValueError if data is None
         """
-        self.validate(data, name, required=True, **kwargs)
+        data = self.validate(data, name, required=True, **kwargs)
         try:
             if data_type in ['[str]']:
                 data = ["" if d is None else d for d in data]
@@ -315,6 +316,8 @@ def validate(self, data, name, **kwargs):
             raise ValidationError("required", name, True)
         elif data is None:
             return
+        elif kwargs.get('readonly'):
+            return
 
         try:
             for key, value in kwargs.items():
@@ -323,6 +326,8 @@ def validate(self, data, name, **kwargs):
                     raise ValidationError(key, name, value)
         except TypeError:
             raise ValidationError("unknown", name)
+        else:
+            return data
 
     def serialize_data(self, data, data_type, **kwargs):
         """Serialize generic data according to supplied data type.
@@ -406,7 +411,8 @@ def serialize_iter(self, data, iter_type, div=None, **kwargs):
                 serialized.append(None)
 
         if div:
-            return div.join(serialized)
+            serialized = ['' if s is None else s for s in serialized]
+            serialized = div.join(serialized)
         return serialized
 
     def serialize_dict(self, attr, dict_type, **kwargs):
@@ -689,15 +695,14 @@ def _instantiate_model(self, response, attrs):
         if callable(response):
             subtype = response._get_subtype_map()
             try:
-                consts = [k for k, v in response._validation.items()
-                          if v.get('constant')]
+                readonly = [k for k, v in response._validation.items()
+                            if v.get('readonly')]
+                const = [k for k, v in response._validation.items()
+                         if v.get('constant')]
                 kwargs = {k: v for k, v in attrs.items()
-                          if k not in subtype and k not in consts}
+                          if k not in subtype and k not in readonly + const}
                 response_obj = response(**kwargs)
-
-                # We have to do this until we resolve the issue of complex
-                # constant attributes not being auto-instantiated.
-                for attr in consts:
+                for attr in readonly:
                     setattr(response_obj, attr, attrs.get(attr))
                 return response_obj
             except TypeError as err:
diff --git a/ClientRuntimes/Python/msrest/msrest/service_client.py b/ClientRuntimes/Python/msrest/msrest/service_client.py
index 523c6648582f1..a204089838ddc 100644
--- a/ClientRuntimes/Python/msrest/msrest/service_client.py
+++ b/ClientRuntimes/Python/msrest/msrest/service_client.py
@@ -146,7 +146,7 @@ def send_formdata(self, request, headers={}, content={}, **config):
         :param ClientRequest request: The request object to be sent.
         :param dict headers: Any headers to add to the request.
         :param dict content: Dictionary of the fields of the formdata.
-        :param config: Any specific config overrides
+        :param config: Any specific config overrides.
         """
         file_data = {f: self._format_data(d) for f, d in content.items()}
         try:
@@ -163,6 +163,7 @@ def send(self, request, headers=None, content=None, **config):
         :param content: Any body data to add to the request.
         :param config: Any specific config overrides
         """
+        response = None
         session = self.creds.signed_session()
         kwargs = self._configure_session(session, **config)
 
@@ -204,7 +205,8 @@ def send(self, request, headers=None, content=None, **config):
             msg = "Error occurred in request."
             raise_with_traceback(ClientRequestError, msg, err)
         finally:
-            session.close()
+            if not response or response._content_consumed:
+                session.close()
 
     def stream_download(self, data, callback):
         """Generator for streaming request body data.
@@ -229,6 +231,7 @@ def stream_download(self, data, callback):
                     callback(chunk, response=data)
                 yield chunk
         data.close()
+        self._adapter.close()
 
     def stream_upload(self, data, callback):
         """Generator for streaming request body data.
diff --git a/ClientRuntimes/Python/msrest/msrest/version.py b/ClientRuntimes/Python/msrest/msrest/version.py
index 11739ebc3606c..527b2a717c20b 100644
--- a/ClientRuntimes/Python/msrest/msrest/version.py
+++ b/ClientRuntimes/Python/msrest/msrest/version.py
@@ -25,4 +25,4 @@
 # --------------------------------------------------------------------------
 
 
-msrest_version = "0.2.0"
+msrest_version = "0.3.0"
diff --git a/ClientRuntimes/Python/msrest/readme.rst b/ClientRuntimes/Python/msrest/readme.rst
index 77e50e0da4bb2..b65e1bf5b13a5 100644
--- a/ClientRuntimes/Python/msrest/readme.rst
+++ b/ClientRuntimes/Python/msrest/readme.rst
@@ -15,6 +15,19 @@ To install:
 Release History
 ---------------
 
+2016-04-26 Version 0.3.0
+++++++++++++++++++++++++
+
+**Bugfixes**
+
+- Read only values are no longer in __init__ or sent to the server (https://github.com/Azure/autorest/pull/959)
+- Useless kwarg removed
+
+**Behaviour changes**
+
+- Needs Autorest > 0.16.0 Nightly 20160426
+
+
 2016-03-25 Version 0.2.0
 ++++++++++++++++++++++++
 
@@ -23,7 +36,7 @@ Release History
 - Manage integer enum values (https://github.com/Azure/autorest/pull/879)
 - Add missing application/json Accept HTTP header (https://github.com/Azure/azure-sdk-for-python/issues/553)
 
-**Beheviour changes**
+**Behaviour changes**
 
 - Needs Autorest > 0.16.0 Nightly 20160324
 
diff --git a/ClientRuntimes/Python/msrest/setup.py b/ClientRuntimes/Python/msrest/setup.py
index b3dca9089b534..02bdd49b71aab 100644
--- a/ClientRuntimes/Python/msrest/setup.py
+++ b/ClientRuntimes/Python/msrest/setup.py
@@ -28,7 +28,7 @@
 
 setup(
     name='msrest',
-    version='0.2.0',
+    version='0.3.0',
     author='Microsoft Corporation',
     packages=['msrest'],
     url=("https://github.com/xingwu1/autorest/tree/python/"
diff --git a/ClientRuntimes/Python/msrest/test/unittest_runtime.py b/ClientRuntimes/Python/msrest/test/unittest_runtime.py
index 7bb798d5af6d4..fbdad6791f772 100644
--- a/ClientRuntimes/Python/msrest/test/unittest_runtime.py
+++ b/ClientRuntimes/Python/msrest/test/unittest_runtime.py
@@ -101,7 +101,7 @@ def hook(aptr, req, *args, **kwargs):
     @mock.patch.object(requests, 'Session')
     def test_request_fail(self, mock_requests):
 
-        mock_requests.return_value.request.return_value = "test"
+        mock_requests.return_value.request.return_value = mock.Mock(_content_consumed=True)
 
         cfg = Configuration("https://my_service.com")
         creds = Authentication()
@@ -113,7 +113,7 @@ def test_request_fail(self, mock_requests):
 
         check = httpretty.last_request()
 
-        self.assertEqual(response, "test")
+        self.assertTrue(response._content_consumed)
 
         mock_requests.return_value.request.side_effect = requests.RequestException
         with self.assertRaises(ClientRequestError):
@@ -127,6 +127,8 @@ def test_request_proxy(self):
 
         def hook(adptr, request, *args, **kwargs):
             self.assertEqual(kwargs.get('proxies'), {"http://my_service.com":'http://localhost:57979'})
+            kwargs['result']._content_consumed = True
+            kwargs['result'].status_code = 200
             return kwargs['result']
 
         client = ServiceClient(creds, cfg)
@@ -139,6 +141,8 @@ def hook(adptr, request, *args, **kwargs):
 
         def hook2(adptr, request, *args, **kwargs):
             self.assertEqual(kwargs.get('proxies')['https'], "http://localhost:1987")
+            kwargs['result']._content_consumed = True
+            kwargs['result'].status_code = 200
             return kwargs['result']
 
         cfg = Configuration("http://my_service.com")
diff --git a/ClientRuntimes/Python/msrestazure/doc/conf.py b/ClientRuntimes/Python/msrestazure/doc/conf.py
index 9a76b3204d5c2..1225f72e6ec9d 100644
--- a/ClientRuntimes/Python/msrestazure/doc/conf.py
+++ b/ClientRuntimes/Python/msrestazure/doc/conf.py
@@ -58,9 +58,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.2.1'
+version = '0.3.0'
 # The full version, including alpha/beta/rc tags.
-release = '0.2.1'
+release = '0.3.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/ClientRuntimes/Python/msrestazure/msrestazure/version.py b/ClientRuntimes/Python/msrestazure/msrestazure/version.py
index 23c80b2514da3..edb859f0a87d2 100644
--- a/ClientRuntimes/Python/msrestazure/msrestazure/version.py
+++ b/ClientRuntimes/Python/msrestazure/msrestazure/version.py
@@ -24,4 +24,4 @@
 #
 # --------------------------------------------------------------------------
 
-msrestazure_version = "0.2.1"
+msrestazure_version = "0.3.0"
diff --git a/ClientRuntimes/Python/msrestazure/readme.rst b/ClientRuntimes/Python/msrestazure/readme.rst
index 18a49a8035f2b..7ba256b12c10a 100644
--- a/ClientRuntimes/Python/msrestazure/readme.rst
+++ b/ClientRuntimes/Python/msrestazure/readme.rst
@@ -15,6 +15,21 @@ To install:
 Release History
 ---------------
 
+2016-04-26 Version 0.3.0
+++++++++++++++++++++++++
+
+Update msrest dependency to 0.3.0
+
+**Bugfixes**
+
+- Read only values are no longer in __init__ or sent to the server (https://github.com/Azure/autorest/pull/959)
+- Useless kwarg removed
+
+**Behaviour changes**
+
+- Needs Autorest > 0.16.0 Nightly 20160426
+
+
 2016-03-31 Version 0.2.1
 ++++++++++++++++++++++++
 
diff --git a/ClientRuntimes/Python/msrestazure/setup.py b/ClientRuntimes/Python/msrestazure/setup.py
index d25ce47f33493..7778b0185d42b 100644
--- a/ClientRuntimes/Python/msrestazure/setup.py
+++ b/ClientRuntimes/Python/msrestazure/setup.py
@@ -28,7 +28,7 @@
 
 setup(
     name='msrestazure',
-    version='0.2.1',
+    version='0.3.0',
     author='Microsoft Corporation',
     packages=['msrestazure'],
     url=('https://github.com/xingwu1/autorest/tree/python/'
@@ -49,5 +49,5 @@
         'License :: OSI Approved :: MIT License',
         'Topic :: Software Development'],
     install_requires=[
-        "msrest>=0.2.0"],
+        "msrest>=0.3.0"],
 )
diff --git a/ClientRuntimes/Ruby/ms-rest-azure/lib/ms_rest_azure/azure_service_client.rb b/ClientRuntimes/Ruby/ms-rest-azure/lib/ms_rest_azure/azure_service_client.rb
index d80f556413c66..50f2da8a48b30 100644
--- a/ClientRuntimes/Ruby/ms-rest-azure/lib/ms_rest_azure/azure_service_client.rb
+++ b/ClientRuntimes/Ruby/ms-rest-azure/lib/ms_rest_azure/azure_service_client.rb
@@ -15,36 +15,35 @@ class AzureServiceClient < MsRest::ServiceClient
     attr_accessor :api_version
 
     #
-    # Retrieves the result of 'PUT' operation. Perfroms polling of required.
+    # Retrieves the result of 'POST','DELETE','PUT' or 'PATCH' operation. Performs polling of required.
     # @param azure_response [MsRestAzure::AzureOperationResponse] response from Azure service.
     # @param custom_deserialization_block [Proc] custom logic for response deserialization.
     #
     # @return [MsRest::HttpOperationResponse] the response.
-    def get_put_operation_result(azure_response, custom_deserialization_block)
-      fail MsRest::ValidationError, 'Azure response cannot be nil' if azure_response.nil?
+    def get_long_running_operation_result(azure_response, custom_deserialization_block)
+      check_for_status_code_failure(azure_response)
 
-      status_code = azure_response.response.status
-
-      if (status_code != 200 && status_code != 201 && status_code != 202)
-        fail AzureOperationError, "Unexpected polling status code from long running operation #{status_code}"
-      end
+      http_method = azure_response.request.method
 
       polling_state = PollingState.new(azure_response, @long_running_operation_retry_timeout)
       request = azure_response.request
 
-      if (!AsyncOperationStatus.is_terminal_status(polling_state.status))
+      if !AsyncOperationStatus.is_terminal_status(polling_state.status)
         task = Concurrent::TimerTask.new do
           begin
             if !polling_state.azure_async_operation_header_link.nil?
               update_state_from_azure_async_operation_header(polling_state.get_request(headers: request.headers, base_uri: request.base_uri), polling_state)
             elsif !polling_state.location_header_link.nil?
-              update_state_from_location_header_on_put(polling_state.get_request(headers: request.headers, base_uri: request.base_uri), polling_state, custom_deserialization_block)
-            else
+              update_state_from_location_header(polling_state.get_request(headers: request.headers, base_uri: request.base_uri), polling_state, custom_deserialization_block)
+            elsif http_method === :put
               get_request = MsRest::HttpOperationRequest.new(request.base_uri, request.build_path.to_s, 'get', query_params: request.query_params)
               update_state_from_get_resource_operation(get_request, polling_state, custom_deserialization_block)
+            else
+              task.shutdown
+              fail AzureOperationError, 'Location header is missing from long running operation'
             end
 
-            if (AsyncOperationStatus.is_terminal_status(polling_state.status))
+            if AsyncOperationStatus.is_terminal_status(polling_state.status)
               task.shutdown
             end
           rescue Exception => e
@@ -64,74 +63,52 @@ def get_put_operation_result(azure_response, custom_deserialization_block)
         fail polling_error if polling_error.is_a?(Exception)
       end
 
-      if (AsyncOperationStatus.is_successful_status(polling_state.status) && polling_state.resource.nil?)
+      if (http_method === :put || http_method === :patch) && AsyncOperationStatus.is_successful_status(polling_state.status) && polling_state.resource.nil?
         get_request = MsRest::HttpOperationRequest.new(request.base_uri, request.build_path.to_s, 'get', query_params: request.query_params)
         update_state_from_get_resource_operation(get_request, polling_state, custom_deserialization_block)
       end
 
-      if (AsyncOperationStatus.is_failed_status(polling_state.status))
+      if AsyncOperationStatus.is_failed_status(polling_state.status)
         fail polling_state.get_operation_error
       end
 
-      return polling_state.get_operation_response
+      polling_state.get_operation_response
+    end
+
+    # @TODO Update name of the method to get_put_or_patch_operation_result when introducing breaking change / updating major version of gem
+    # Retrieves the result of 'PUT' or 'PATCH' operation. Performs polling of required.
+    # @param azure_response [MsRestAzure::AzureOperationResponse] response from Azure service.
+    # @param custom_deserialization_block [Proc] custom logic for response deserialization.
+    #
+    # @return [MsRest::HttpOperationResponse] the response.
+    def get_put_operation_result(azure_response, custom_deserialization_block)
+      get_long_running_operation_result(azure_response, custom_deserialization_block)
     end
 
     #
-    # Retrieves the result of 'POST' or 'DELETE' operations. Perfroms polling of required.
+    # Retrieves the result of 'POST' or 'DELETE' operations. Performs polling of required.
     # @param azure_response [MsRestAzure::AzureOperationResponse] response from Azure service.
     # @param custom_deserialization_block [Proc] custom logic for response deserialization.
     #
     # @return [MsRest::HttpOperationResponse] the response.
     def get_post_or_delete_operation_result(azure_response, custom_deserialization_block)
+      get_long_running_operation_result(azure_response, custom_deserialization_block)
+    end
+
+    #
+    # Verifies for unexpected polling status code
+    # @param azure_response [MsRestAzure::AzureOperationResponse] response from Azure service.
+    def check_for_status_code_failure(azure_response)
       fail MsRest::ValidationError, 'Azure response cannot be nil' if azure_response.nil?
       fail MsRest::ValidationError, 'Azure response cannot have empty response object' if azure_response.response.nil?
+      fail MsRest::ValidationError, 'Azure response cannot have empty request object' if azure_response.request.nil?
 
       status_code = azure_response.response.status
+      http_method = azure_response.request.method
 
-      if (status_code != 200 && status_code != 202 && status_code != 204)
-        fail AzureOperationError, "Unexpected polling status code from long running operation #{status_code}"
-      end
-
-      polling_state = PollingState.new(azure_response, @long_running_operation_retry_timeout)
-      request = azure_response.request
-      
-      if (!AsyncOperationStatus.is_terminal_status(polling_state.status))
-        task = Concurrent::TimerTask.new do
-          begin
-            if !polling_state.azure_async_operation_header_link.nil?
-              update_state_from_azure_async_operation_header(polling_state.get_request(headers: request.headers, base_uri: request.base_uri), polling_state)
-            elsif !polling_state.location_header_link.nil?
-              update_state_from_location_header_on_post_or_delete(polling_state.get_request(headers: request.headers, base_uri: request.base_uri), polling_state, custom_deserialization_block)
-            else
-              task.shutdown
-              fail AzureOperationError, 'Location header is missing from long running operation'
-            end
-
-            if (AsyncOperationStatus.is_terminal_status(polling_state.status))
-              task.shutdown
-            end
-          rescue Exception => e
-            task.shutdown
-            e
-          end
-        end
-
-        polling_delay = polling_state.get_delay
-        polling_delay = 0.1 if polling_delay.nil? || polling_delay == 0
-
-        task.execution_interval = polling_delay
-        task.execute
-        task.wait_for_termination
-
-        polling_error = task.value
-        fail polling_error if polling_error.is_a?(Exception)
-      end
-
-      if (AsyncOperationStatus.is_failed_status(polling_state.status))
-        fail polling_state.get_operation_error
-      end
-
-      return polling_state.get_operation_response
+      fail AzureOperationError, "Unexpected polling status code from long running operation #{status_code}" unless status_code === 200 || status_code === 202 ||
+          (status_code === 201 && http_method === :put) ||
+          (status_code === 204 && (http_method === :delete || http_method === :post))
     end
 
     #
@@ -145,7 +122,7 @@ def update_state_from_get_resource_operation(request, polling_state, custom_dese
 
       fail AzureOperationError, 'The response from long running operation does not contain a body' if result.response.body.nil? || result.response.body.empty?
 
-      if (result.body.respond_to?(:properties) && result.body.properties.respond_to?(:provisioning_state) && !result.body.properties.provisioning_state.nil?)
+      if result.body.respond_to?(:properties) && result.body.properties.respond_to?(:provisioning_state) && !result.body.properties.provisioning_state.nil?
         polling_state.status = result.body.properties.provisioning_state
       else
         polling_state.status = AsyncOperationStatus::SUCCESS_STATUS
@@ -162,30 +139,23 @@ def update_state_from_get_resource_operation(request, polling_state, custom_dese
     end
 
     #
-    # Updates polling state based on location header for PUT HTTP requests.
+    # Updates polling state based on location header for HTTP requests.
     # @param request [MsRest::HttpOperationRequest] The url retrieve data from.
     # @param polling_state [MsRestAzure::PollingState] polling state to update.
     # @param custom_deserialization_block [Proc] custom deserialization method for parsing response.
-    def update_state_from_location_header_on_put(request, polling_state, custom_deserialization_block)
+    def update_state_from_location_header(request, polling_state, custom_deserialization_block)
       result = get_async_with_custom_deserialization(request, custom_deserialization_block)
 
       polling_state.update_response(result.response)
-      polling_state.request = result.response
-
+      polling_state.request = result.request
       status_code = result.response.status
+      http_method = request.method
 
-      if (status_code == 202)
+      if status_code === 202
         polling_state.status = AsyncOperationStatus::IN_PROGRESS_STATUS
-      elsif (status_code == 200 || status_code == 201)
-        fail AzureOperationError, 'The response from long running operation does not contain a body' if result.body.nil?
-
-        # In 202 pattern on PUT ProvisioningState may not be present in
-        # the response. In that case the assumption is the status is Succeeded.
-        if (result.body.respond_to?(:properties) && result.body.properties.respond_to?(:provisioning_state) && !result.body.properties.provisioning_state.nil?)
-          polling_state.status = result.body.properties.provisioning_state
-        else
-          polling_state.status = AsyncOperationStatus::SUCCESS_STATUS
-        end
+      elsif status_code === 200 || (status_code === 201 && http_method === :put) ||
+          (status_code === 204 && (http_method === :delete || http_method === :post))
+        polling_state.status = AsyncOperationStatus::SUCCESS_STATUS
 
         error_data = CloudErrorData.new
         error_data.code = polling_state.status
@@ -193,6 +163,8 @@ def update_state_from_location_header_on_put(request, polling_state, custom_dese
 
         polling_state.error_data = error_data
         polling_state.resource = result.body
+      else
+        fail AzureOperationError, 'The response from long running operation does not have a valid status code'
       end
     end
 
@@ -212,26 +184,7 @@ def update_state_from_azure_async_operation_header(request, polling_state)
     end
 
     #
-    # Updates polling state based on location header for POST and DELETE HTTP requests.
-    # @param polling_state [MsRest::HttpOperationRequest] [description]
-    # @param custom_deserialization_block [Proc] custom deserialization method for parsing response.
-    def update_state_from_location_header_on_post_or_delete(request, polling_state, custom_deserialization_block)
-      result = get_async_with_custom_deserialization(request, custom_deserialization_block)
-
-      polling_state.update_response(result.response)
-      polling_state.request = result.request
-      status_code = result.response.status
-
-      if (status_code == 202)
-        polling_state.status = AsyncOperationStatus::IN_PROGRESS_STATUS
-      elsif (status_code == 200 || status_code == 201 || status_code == 204)
-        polling_state.status = AsyncOperationStatus::SUCCESS_STATUS
-        polling_state.resource = result.body
-      end
-    end
-
-    #
-    # Retrives data by given URL.
+    # Retrieves data by given URL.
     # @param request [MsRest::HttpOperationRequest] the URL.
     # @param custom_deserialization_block [Proc] function to perform deserialization of the HTTP response.
     #
@@ -239,7 +192,7 @@ def update_state_from_location_header_on_post_or_delete(request, polling_state,
     def get_async_with_custom_deserialization(request, custom_deserialization_block)
       result = get_async_common(request)
 
-      if (!result.body.nil? && !custom_deserialization_block.nil?)
+      if !result.body.nil? && !custom_deserialization_block.nil?
         begin
           result.body = custom_deserialization_block.call(result.body)
         rescue Exception => e
@@ -251,7 +204,7 @@ def get_async_with_custom_deserialization(request, custom_deserialization_block)
     end
 
     #
-    # Retrives data by given URL.
+    # Retrieves data by given URL.
     # @param request [MsRest::HttpOperationRequest] the URL.
     #
     # @return [MsRest::HttpOperationResponse] the response.
@@ -263,13 +216,13 @@ def get_async_with_async_operation_deserialization(request)
     end
 
     #
-    # Retrives data by given URL.
+    # Retrieves data by given URL.
     # @param request [MsRest::HttpOperationRequest] the URL.
     #
     # @return [MsRest::HttpOperationResponse] the response.
     def get_async_common(request)
       fail ValidationError, 'Request cannot be nil' if request.nil?
-      
+
       request.middlewares = [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]]
       request.headers.merge!({'x-ms-client-request-id' => SecureRandom.uuid, 'Content-Type' => 'application/json'})
 
@@ -277,10 +230,10 @@ def get_async_common(request)
       http_response = request.run_promise do |req|
         @credentials.sign_request(req) unless @credentials.nil?
       end.execute.value!
-      
+
       status_code = http_response.status
 
-      if (status_code != 200 && status_code != 201 && status_code != 202 && status_code != 204)
+      if status_code != 200 && status_code != 201 && status_code != 202 && status_code != 204
         json_error_data = JSON.load(http_response.body)
         error_data = CloudErrorData.deserialize_object(json_error_data)
 
diff --git a/ClientRuntimes/Ruby/ms-rest-azure/spec/azure_service_client_spec.rb b/ClientRuntimes/Ruby/ms-rest-azure/spec/azure_service_client_spec.rb
index 18fec9a77b12d..e3c0eee6afe5f 100644
--- a/ClientRuntimes/Ruby/ms-rest-azure/spec/azure_service_client_spec.rb
+++ b/ClientRuntimes/Ruby/ms-rest-azure/spec/azure_service_client_spec.rb
@@ -9,25 +9,30 @@
 module MsRestAzure
 
   describe AzureServiceClient do
+    before(:all) do
+      @methods = ['put', 'post', 'delete', 'patch']
+    end
+
     it 'should throw error in case provided azure response is nil' do
       azure_service_client = AzureServiceClient.new nil
-      expect { azure_service_client.get_put_operation_result(nil, nil) }.to raise_error(MsRest::ValidationError)
+      expect { azure_service_client.get_long_running_operation_result(nil, nil) }.to raise_error(MsRest::ValidationError)
     end
 
     it 'should throw error if unexpected polling state is passed' do
       azure_service_client = AzureServiceClient.new nil
 
       response = double('response', :status => 404)
+      request = double('request', headers: {}, base_uri: '', method: @methods[0])
 
       azure_response = double('azure_response',
-                              :request => nil,
+                              :request => request,
                               :response => response,
                               :body => nil)
 
-      expect { azure_service_client.get_put_operation_result(azure_response, nil) }.to raise_error(AzureOperationError)
+      expect { azure_service_client.get_long_running_operation_result(azure_response, nil) }.to raise_error(AzureOperationError)
     end
 
-    it 'should use async operation header for getting PUT result' do
+    it 'should use async operation header when async_operation_header present' do
       azure_service_client = AzureServiceClient.new nil
       azure_service_client.long_running_operation_retry_timeout = 0
 
@@ -36,46 +41,43 @@ module MsRestAzure
         polling_state.resource = 'resource'
       end
 
-      response = double('response', headers:
-                                      { 'Azure-AsyncOperation' => 'async_operation_header',
-                                        'Location' => 'location_header'},
+      response = double('response',
+                        :headers =>
+                            { 'Azure-AsyncOperation' => 'async_operation_header',
+                              'Location' => 'location_header'},
                         :status => 202)
-
-      request = double('request', headers: {}, base_uri: '')
-
-      azure_response = double('azure_response',
-                              :request => request,
-                              :response => response,
-                              :body => nil)
-
       expect(azure_service_client).to receive(:update_state_from_azure_async_operation_header)
 
-      azure_service_client.get_put_operation_result(azure_response, nil)
+      @methods.each do |method|
+        request = double('request', headers: {}, base_uri: '', method: method)
+        azure_response = double('azure_response',
+                                :request => request,
+                                :response => response,
+                                :body => nil)
+        azure_service_client.get_long_running_operation_result(azure_response, nil)
+      end
     end
 
-    it 'should use location operation header for getting PUT result' do
+    it 'should use location operation header when location_header present' do
       azure_service_client = AzureServiceClient.new nil
       azure_service_client.long_running_operation_retry_timeout = 0
 
-      allow(azure_service_client).to receive(:update_state_from_location_header_on_put) do |request, polling_state|
+      allow(azure_service_client).to receive(:update_state_from_location_header) do |request, polling_state|
         polling_state.status = AsyncOperationStatus::SUCCESS_STATUS
         polling_state.resource = 'resource'
       end
 
-      response = double('response', :headers =>
-                                      { 'Location' => 'location_header'},
-                                    :status => 202)
-
-      request = double('request', headers: {}, base_uri: '')
+      response = double('response', :headers => { 'Location' => 'location_header'}, :status => 202)
+      expect(azure_service_client).to receive(:update_state_from_location_header)
 
-      azure_response = double('azure_response',
-                              :request => request,
-                              :response => response,
-                              :body => nil)
-
-      expect(azure_service_client).to receive(:update_state_from_location_header_on_put)
-
-      azure_service_client.get_put_operation_result(azure_response, nil)
+      @methods.each do |method|
+        request = double('request', headers: {}, base_uri: '', method: method)
+        azure_response = double('azure_response',
+                                :request => request,
+                                :response => response,
+                                :body => nil)
+        azure_service_client.get_long_running_operation_result(azure_response, nil)
+      end
     end
 
     it 'should throw error in case LRO ends up with failed status' do
@@ -90,15 +92,14 @@ module MsRestAzure
                                       { 'Azure-AsyncOperation' => 'async_operation_header' },
                                     :status => 202)
 
-      request = double('request', headers: {}, base_uri: '')
-
-      azure_response = double('azure_response',
-                              :request => request,
-                              :response => response,
-                              :body => nil)
-
-      expect { azure_service_client.get_put_operation_result(azure_response, nil) }.to raise_error(AzureOperationError)
+      @methods.each do |method|
+        request = double('request', headers: {}, base_uri: '', method: method)
+        azure_response = double('azure_response',
+                                :request => request,
+                                :response => response,
+                                :body => nil)
+        expect { azure_service_client.get_long_running_operation_result(azure_response, nil) }.to raise_error(AzureOperationError)
+      end
     end
   end
-
-end
\ No newline at end of file
+end
diff --git a/CodeGenerator.sln b/CodeGenerator.sln
index d7d8afd26af03..2e1b839e94d3f 100644
--- a/CodeGenerator.sln
+++ b/CodeGenerator.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoRest.Core", "AutoRest\AutoRest.Core\AutoRest.Core.csproj", "{C876085F-9DC3-41F0-B7B4-17022CD84684}"
 EndProject
@@ -103,6 +103,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoRest.Modeler.CompositeS
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoRest.Modeler.CompositeSwagger.Tests", "AutoRest\Modelers\CompositeSwagger.Tests\AutoRest.Modeler.CompositeSwagger.Tests.csproj", "{DA37E6A9-5D59-45A3-A809-ABA85031C369}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AzureResourceSchema", "AzureResourceSchema", "{B6A1FC1E-0779-4900-84EE-262DD0E53FF4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoRest.Generator.AzureResourceSchema", "AutoRest\Generators\AzureResourceSchema\AzureResourceSchema\AutoRest.Generator.AzureResourceSchema.csproj", "{654344A5-0556-49C7-BFB3-59676D7440D3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoRest.Generator.AzureResourceSchema.Tests", "AutoRest\Generators\AzureResourceSchema\AzureResourceSchema.Tests\AutoRest.Generator.AzureResourceSchema.Tests.csproj", "{1C3B4A33-E045-4C8F-9202-1B651A686567}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Net45-Debug|Any CPU = Net45-Debug|Any CPU
@@ -311,6 +317,22 @@ Global
 		{DA37E6A9-5D59-45A3-A809-ABA85031C369}.Portable-Debug|Any CPU.Build.0 = Portable-Debug|Any CPU
 		{DA37E6A9-5D59-45A3-A809-ABA85031C369}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU
 		{DA37E6A9-5D59-45A3-A809-ABA85031C369}.Portable-Release|Any CPU.Build.0 = Portable-Release|Any CPU
+		{654344A5-0556-49C7-BFB3-59676D7440D3}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU
+		{654344A5-0556-49C7-BFB3-59676D7440D3}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU
+		{654344A5-0556-49C7-BFB3-59676D7440D3}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU
+		{654344A5-0556-49C7-BFB3-59676D7440D3}.Net45-Release|Any CPU.Build.0 = Net45-Release|Any CPU
+		{654344A5-0556-49C7-BFB3-59676D7440D3}.Portable-Debug|Any CPU.ActiveCfg = Portable-Debug|Any CPU
+		{654344A5-0556-49C7-BFB3-59676D7440D3}.Portable-Debug|Any CPU.Build.0 = Portable-Debug|Any CPU
+		{654344A5-0556-49C7-BFB3-59676D7440D3}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU
+		{654344A5-0556-49C7-BFB3-59676D7440D3}.Portable-Release|Any CPU.Build.0 = Portable-Release|Any CPU
+		{1C3B4A33-E045-4C8F-9202-1B651A686567}.Net45-Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1C3B4A33-E045-4C8F-9202-1B651A686567}.Net45-Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1C3B4A33-E045-4C8F-9202-1B651A686567}.Net45-Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1C3B4A33-E045-4C8F-9202-1B651A686567}.Net45-Release|Any CPU.Build.0 = Release|Any CPU
+		{1C3B4A33-E045-4C8F-9202-1B651A686567}.Portable-Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1C3B4A33-E045-4C8F-9202-1B651A686567}.Portable-Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1C3B4A33-E045-4C8F-9202-1B651A686567}.Portable-Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1C3B4A33-E045-4C8F-9202-1B651A686567}.Portable-Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -346,5 +368,8 @@ Global
 		{3BA8DBC9-AF2B-4CE8-A180-803E055B2FEB} = {75E67F44-A8F8-4B4F-BEB0-0A9F8E65006C}
 		{31AEC9B5-35C9-4FEA-8420-4C34D3FEAAC8} = {02144BF6-4489-4AFC-9B2D-0306C3DD3C19}
 		{DA37E6A9-5D59-45A3-A809-ABA85031C369} = {02144BF6-4489-4AFC-9B2D-0306C3DD3C19}
+		{B6A1FC1E-0779-4900-84EE-262DD0E53FF4} = {EF9E346D-70C6-45F5-8FF9-9B734F4A1298}
+		{654344A5-0556-49C7-BFB3-59676D7440D3} = {B6A1FC1E-0779-4900-84EE-262DD0E53FF4}
+		{1C3B4A33-E045-4C8F-9202-1B651A686567} = {B6A1FC1E-0779-4900-84EE-262DD0E53FF4}
 	EndGlobalSection
 EndGlobal
diff --git a/Documentation/README.md b/Documentation/README.md
index 890f11b09d4bf..6b77f525787bb 100644
--- a/Documentation/README.md
+++ b/Documentation/README.md
@@ -18,6 +18,7 @@
     - Code Generators
     - Modelers
 5. [Building AutoRest](building-code.md)
-6. Contributing to the code
+6. [Writing Tests](writing-tests.md)
+7. Contributing to the code
 
 [Swagger2.0]:https://github.com/swagger-api/swagger-spec/blob/master/versions/2.0.md
diff --git a/Documentation/swagger-extensions.md b/Documentation/swagger-extensions.md
index cb3bed17ab585..1fbf0efe46d71 100644
--- a/Documentation/swagger-extensions.md
+++ b/Documentation/swagger-extensions.md
@@ -389,13 +389,19 @@ When used, replaces the standard Swagger "host" attribute with a host that conta
 Field Name | Type | Description
 ---|:---:|---
 hostTemplate | `string` | **Required**. Specifies the parameterized template for the host.
-parameters | [Array of Parameter Objects](https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#parameterObject) | The list of parameters that are used within the hostTemplate. This can include both reference parameters as well as explicit parameters. Note that "in" is **required** and **must be** set to "path"
+useSchemePrefix | `boolean` | **Optional, Default: true**. Specifes whether to prepend the default scheme a.k.a protocol to the base uri of client.
+positionInOperation | `string` | **Optional, Default: first**. Specifies whether the list of parameters will appear in the beginning or in the end, in the method signature for every operation. The order within the parameters provided in the below mentioned array will be preserved. Either the array of parameters will be prepended or appended, based on the value provided over here. Valid values are **"first", "last"**. Every method/operation in any programming language has parameters categorized into two buckets **"required"** and **"optional"**. It is natural for optional paramaters to appear in the end in a method signature. **This aspect will be preserved, while prepending(first) or appending(last) hostTemplate parameters .** 
+parameters | [Array of Parameter Objects](https://github.com/OAI/OpenAPI-Specification/blob/master/versions/2.0.md#parameterObject) | The list of parameters that are used within the hostTemplate. This can include both reference parameters as well as explicit parameters. Note that "in" is **required** and **must be** set to **"path"**. The reference parameters will be treated as **global parameters** and will end up as property of the client.
 
 **Example**:
-Using both explicit and reference parameters
+- Using both explicit and reference parameters.
+   - Since "useSchemePrefix" is not specified, it's default value true will be applied. The user is expected to provide only the value of accountName. The generated code will fit it as a part of the url.
+   - Since "positionInOperation" with value "last" is specified, "accountName" will be the last required parameter in every method. "adlaJobDnsSuffixInPath" will be a property on the client as it is defined in the global parameters section and is referenced here.
+
 ```js
 "x-ms-parameterized-host": {
     "hostTemplate": "{accountName}.{adlaJobDnsSuffix}",
+    "positionInOperation": "last",
     "parameters": [
       {
         "name": "accountName",
@@ -421,10 +427,13 @@ Using both explicit and reference parameters
       "description": "Gets the DNS suffix used as the base for all Azure Data Lake Analytics Job service requests."
     }
 ```
-Using only explicit parameters
+- Using explicit parameters and specifying the positionInOperation and schemePrefix. 
+   - This means that accountName will be the first required parameter in all the methods and the user is expected to provide a url (protocol + accountName), since "useSchemePrfix" is set to false.
 ```js
 "x-ms-parameterized-host": {
     "hostTemplate": "{accountName}.mystaticsuffix.com",
+    "useSchemePrefix": false,
+    "positionInOperation": "first",
     "parameters": [
       {
         "name": "accountName",
diff --git a/Documentation/writing-tests.md b/Documentation/writing-tests.md
new file mode 100644
index 0000000000000..7712f32f74753
--- /dev/null
+++ b/Documentation/writing-tests.md
@@ -0,0 +1,52 @@
+# Writing Tests
+
+## Build Prerequisites
+To test AutoRest in each language, you must set up your machine according to the requirements on the [Building Code](building-code.md) page.
+
+## Architecture
+Tests are split into unit and acceptance tests. Unit tests validate the AutoRest application itself and how it interprets Swagger documents. Acceptance tests validate the generated code in each language and are written in those languages.
+
+### Unit tests
+Unit tests need to be updated when core parts of AutoRest change, not when the language-specific generator code changes. Unit tests are located in:
+<dl>
+  <dt><a href="../AutoRest/AutoRest.Core.Tests/">\AutoRest\AutoRest.Core.Tests</a></dt>
+  <dd>These need to be updated when the command-line AutoRest application itself changes</dd>
+  <dt><a href="../AutoRest/Modelers/Swagger.Tests">\AutoRest\Modelers\Swagger.Tests</a><br>
+      <a href="../AutoRest/Modelers/CompositeSwagger.Tests">\AutoRest\Modelers\Swagger.Composite.Tests</a></dt>
+  <dd>These need to be updated when there are changes to how AutoRest processes Swagger files</dd>
+</dl>
+
+### Acceptance tests (and test server)
+Acceptance tests are run against a Node.js test server (which uses [Express framework](http://expressjs.com/)). The code for the test server is checked in to the [\\AutoRest\\TestServer](../AutoRest/TestServer/) folder in the repository.
+
+There are two main components to the test server: the Swagger definitions that describe the server and the code that handles requests to the server and responds with the appropriate status code, payload, etc. if the request is constructed correctly.
+
+## How to add acceptance tests for scenarios
+1. Add your scenarios to the Swagger files that describe the test server (located in the [\\AutoRest\\TestServer\\swagger](../AutoRest/TestServer/swagger/) folder).
+2. Update the test server
+   - Update the routes to generate appropriate responses for your scenarios at paths specified in the Swagger files in step 1. This code is located in the [\\AutoRest\\TestServer\\server\\routes\\*.js](../AutoRest/TestServer/server/routes) files.
+   - For each scenario, the `coverage` dictionary needs to be incremented for the name of your scenario. This name will be used in the test report coverage. 
+   - Update the `coverage` dictionary in [\\AutoRest\\TestServer\\server\\app.js](../AutoRest/TestServer/server/app.js) to include the names of your new scenarios. This lets the final test report include your scenarios when reporting on the coverage for each language.
+3. Regenerate the expected code using `gulp regenerate` (this will use the Swagger files to generate client libraries for the test server).
+4. In each language, write tests that cover your scenarios (for example, in C#, you must update [\\AutoRest\\Generators\\CSharp\CSharp.Tests\\AcceptanceTests.cs](../AutoRest/Generators/CSharp/CSharp.Tests/AcceptanceTests.cs) or [\\AutoRest\\Generators\\CSharp\\Azure.CSharp.Tests\\AcceptanceTests.cs](../AutoRest/Generators/CSharp/Azure.CSharp.Tests/AcceptanceTests.cs)). You will make calls to the test server using the generated code from step 3.
+5. [Run the tests](#running-tests)
+
+## Running Tests
+When you run tests, the test server is automatically started and the code that is generated for the test server Swagger files will correctly target this new instance.
+
+### Command Line
+Tests can be run with `gulp test`. You can run tests for each language individually with `gulp:test:[language name]`. Use `gulp -T` to find the correct names.
+
+### Visual Studio
+In Visual Studio, you can run tests for all languages using Task Runner Explorer. C# tests can also be run and debugged in Test Explorer.
+
+## Debugging the test server
+When updating the test server code to return the appropriate responses for your scenarios, it can be useful to debug the code to make sure the test code calls the paths that you are expecting.
+
+### Visual Studio
+1. Install [Node.js Tools for Visual Studio](https://www.visualstudio.com/en-us/features/node-js-vs.aspx) solution.
+2. Open the [\\AutoRest\\TestServer\\server\\SwaggerBATServer.sln](../AutoRest/TestServer/server/SwaggerBATServer.sln).
+3. Run the [SwaggerBATServer project](../AutoRest/TestServer/server/SwaggerBATServer.njsproj).
+4. Make sure that the port that the test server is using matches the port that is used by the tests when you run them.
+  - For Node.js, this is straightforward because the server and tests both use port 3000 by default.
+  - For C#, the infrastructure is set up to use a random port to avoid conflicts. You must change the logic in [\\AutoRest\\Generators\\CSharp\\CSharp.Tests\\Utilities\\ServiceController.cs](../AutoRest/Generators/CSharp/CSharp.Tests/Utilities/ServiceController.cs).`GetRandomPort()` to use the same port as the test server.
\ No newline at end of file
diff --git a/Samples/azure-storage/Azure.CSharp/Models/CheckNameAvailabilityResult.cs b/Samples/azure-storage/Azure.CSharp/Models/CheckNameAvailabilityResult.cs
index c2a6c4848934b..086e8b5169ec2 100644
--- a/Samples/azure-storage/Azure.CSharp/Models/CheckNameAvailabilityResult.cs
+++ b/Samples/azure-storage/Azure.CSharp/Models/CheckNameAvailabilityResult.cs
@@ -32,23 +32,26 @@ public CheckNameAvailabilityResult(bool? nameAvailable = default(bool?), Reason?
         }
 
         /// <summary>
-        /// Gets a boolean value that indicates whether the name is available
-        /// for you to use. If true, the name is available. If false, the
-        /// name has already been taken or invalid and cannot be used.
+        /// Gets or sets gets a boolean value that indicates whether the name
+        /// is available for you to use. If true, the name is available. If
+        /// false, the name has already been taken or invalid and cannot be
+        /// used.
         /// </summary>
         [JsonProperty(PropertyName = "nameAvailable")]
         public bool? NameAvailable { get; set; }
 
         /// <summary>
-        /// Gets the reason that a storage account name could not be used. The
-        /// Reason element is only returned if NameAvailable is false.
-        /// Possible values include: 'AccountNameInvalid', 'AlreadyExists'
+        /// Gets or sets gets the reason that a storage account name could not
+        /// be used. The Reason element is only returned if NameAvailable is
+        /// false. Possible values include: 'AccountNameInvalid',
+        /// 'AlreadyExists'
         /// </summary>
         [JsonProperty(PropertyName = "reason")]
         public Reason? Reason { get; set; }
 
         /// <summary>
-        /// Gets an error message explaining the Reason value in more detail.
+        /// Gets or sets gets an error message explaining the Reason value in
+        /// more detail.
         /// </summary>
         [JsonProperty(PropertyName = "message")]
         public string Message { get; set; }
diff --git a/Samples/azure-storage/Azure.CSharp/Models/CustomDomain.cs b/Samples/azure-storage/Azure.CSharp/Models/CustomDomain.cs
index d783381ad39d1..5ada788894a57 100644
--- a/Samples/azure-storage/Azure.CSharp/Models/CustomDomain.cs
+++ b/Samples/azure-storage/Azure.CSharp/Models/CustomDomain.cs
@@ -30,14 +30,16 @@ public CustomDomain(string name, bool? useSubDomain = default(bool?))
         }
 
         /// <summary>
-        /// Gets or sets the custom domain name. Name is the CNAME source.
+        /// Gets or sets gets or sets the custom domain name. Name is the
+        /// CNAME source.
         /// </summary>
         [JsonProperty(PropertyName = "name")]
         public string Name { get; set; }
 
         /// <summary>
-        /// Indicates whether indirect CName validation is enabled. Default
-        /// value is false. This should only be set on updates
+        /// Gets or sets indicates whether indirect CName validation is
+        /// enabled. Default value is false. This should only be set on
+        /// updates
         /// </summary>
         [JsonProperty(PropertyName = "useSubDomain")]
         public bool? UseSubDomain { get; set; }
diff --git a/Samples/azure-storage/Azure.CSharp/Models/Endpoints.cs b/Samples/azure-storage/Azure.CSharp/Models/Endpoints.cs
index 892510076c3e5..f9b8d67d127d3 100644
--- a/Samples/azure-storage/Azure.CSharp/Models/Endpoints.cs
+++ b/Samples/azure-storage/Azure.CSharp/Models/Endpoints.cs
@@ -32,25 +32,25 @@ public Endpoints(string blob = default(string), string queue = default(string),
         }
 
         /// <summary>
-        /// Gets the blob endpoint.
+        /// Gets or sets gets the blob endpoint.
         /// </summary>
         [JsonProperty(PropertyName = "blob")]
         public string Blob { get; set; }
 
         /// <summary>
-        /// Gets the queue endpoint.
+        /// Gets or sets gets the queue endpoint.
         /// </summary>
         [JsonProperty(PropertyName = "queue")]
         public string Queue { get; set; }
 
         /// <summary>
-        /// Gets the table endpoint.
+        /// Gets or sets gets the table endpoint.
         /// </summary>
         [JsonProperty(PropertyName = "table")]
         public string Table { get; set; }
 
         /// <summary>
-        /// Gets the file endpoint.
+        /// Gets or sets gets the file endpoint.
         /// </summary>
         [JsonProperty(PropertyName = "file")]
         public string File { get; set; }
diff --git a/Samples/azure-storage/Azure.CSharp/Models/Resource.cs b/Samples/azure-storage/Azure.CSharp/Models/Resource.cs
index 4bdc3976317e8..fbf994880b942 100644
--- a/Samples/azure-storage/Azure.CSharp/Models/Resource.cs
+++ b/Samples/azure-storage/Azure.CSharp/Models/Resource.cs
@@ -29,31 +29,31 @@ public Resource(string id = default(string), string name = default(string), stri
         }
 
         /// <summary>
-        /// Resource Id
+        /// Gets resource Id
         /// </summary>
         [JsonProperty(PropertyName = "id")]
         public string Id { get; private set; }
 
         /// <summary>
-        /// Resource name
+        /// Gets resource name
         /// </summary>
         [JsonProperty(PropertyName = "name")]
         public string Name { get; private set; }
 
         /// <summary>
-        /// Resource type
+        /// Gets resource type
         /// </summary>
         [JsonProperty(PropertyName = "type")]
         public string Type { get; private set; }
 
         /// <summary>
-        /// Resource location
+        /// Gets or sets resource location
         /// </summary>
         [JsonProperty(PropertyName = "location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Resource tags
+        /// Gets or sets resource tags
         /// </summary>
         [JsonProperty(PropertyName = "tags")]
         public IDictionary<string, string> Tags { get; set; }
diff --git a/Samples/azure-storage/Azure.CSharp/Models/StorageAccountCreateParameters.cs b/Samples/azure-storage/Azure.CSharp/Models/StorageAccountCreateParameters.cs
index c9b194c878b09..1c23f83ac300c 100644
--- a/Samples/azure-storage/Azure.CSharp/Models/StorageAccountCreateParameters.cs
+++ b/Samples/azure-storage/Azure.CSharp/Models/StorageAccountCreateParameters.cs
@@ -32,13 +32,13 @@ public StorageAccountCreateParameters(string location, IDictionary<string, strin
         }
 
         /// <summary>
-        /// Resource location
+        /// Gets or sets resource location
         /// </summary>
         [JsonProperty(PropertyName = "location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Resource tags
+        /// Gets or sets resource tags
         /// </summary>
         [JsonProperty(PropertyName = "tags")]
         public IDictionary<string, string> Tags { get; set; }
diff --git a/Samples/azure-storage/Azure.CSharp/Models/StorageAccountKeys.cs b/Samples/azure-storage/Azure.CSharp/Models/StorageAccountKeys.cs
index ce80a21921515..823fee32250f7 100644
--- a/Samples/azure-storage/Azure.CSharp/Models/StorageAccountKeys.cs
+++ b/Samples/azure-storage/Azure.CSharp/Models/StorageAccountKeys.cs
@@ -29,13 +29,13 @@ public StorageAccountKeys(string key1 = default(string), string key2 = default(s
         }
 
         /// <summary>
-        /// Gets the value of key 1.
+        /// Gets or sets gets the value of key 1.
         /// </summary>
         [JsonProperty(PropertyName = "key1")]
         public string Key1 { get; set; }
 
         /// <summary>
-        /// Gets the value of key 2.
+        /// Gets or sets gets the value of key 2.
         /// </summary>
         [JsonProperty(PropertyName = "key2")]
         public string Key2 { get; set; }
diff --git a/Samples/azure-storage/Azure.CSharp/Models/StorageAccountProperties.cs b/Samples/azure-storage/Azure.CSharp/Models/StorageAccountProperties.cs
index e5af974c69344..8282d7cc49c8d 100644
--- a/Samples/azure-storage/Azure.CSharp/Models/StorageAccountProperties.cs
+++ b/Samples/azure-storage/Azure.CSharp/Models/StorageAccountProperties.cs
@@ -35,87 +35,89 @@ public StorageAccountProperties(ProvisioningState? provisioningState = default(P
         }
 
         /// <summary>
-        /// Gets the status of the storage account at the time the operation
-        /// was called. Possible values include: 'Creating', 'ResolvingDNS',
-        /// 'Succeeded'
+        /// Gets or sets gets the status of the storage account at the time
+        /// the operation was called. Possible values include: 'Creating',
+        /// 'ResolvingDNS', 'Succeeded'
         /// </summary>
         [JsonProperty(PropertyName = "provisioningState")]
         public ProvisioningState? ProvisioningState { get; set; }
 
         /// <summary>
-        /// Gets the type of the storage account. Possible values include:
-        /// 'Standard_LRS', 'Standard_ZRS', 'Standard_GRS', 'Standard_RAGRS',
-        /// 'Premium_LRS'
+        /// Gets or sets gets the type of the storage account. Possible values
+        /// include: 'Standard_LRS', 'Standard_ZRS', 'Standard_GRS',
+        /// 'Standard_RAGRS', 'Premium_LRS'
         /// </summary>
         [JsonProperty(PropertyName = "accountType")]
         public AccountType? AccountType { get; set; }
 
         /// <summary>
-        /// Gets the URLs that are used to perform a retrieval of a public
-        /// blob, queue or table object.Note that StandardZRS and PremiumLRS
-        /// accounts only return the blob endpoint.
+        /// Gets or sets gets the URLs that are used to perform a retrieval of
+        /// a public blob, queue or table object.Note that StandardZRS and
+        /// PremiumLRS accounts only return the blob endpoint.
         /// </summary>
         [JsonProperty(PropertyName = "primaryEndpoints")]
         public Endpoints PrimaryEndpoints { get; set; }
 
         /// <summary>
-        /// Gets the location of the primary for the storage account.
+        /// Gets or sets gets the location of the primary for the storage
+        /// account.
         /// </summary>
         [JsonProperty(PropertyName = "primaryLocation")]
         public string PrimaryLocation { get; set; }
 
         /// <summary>
-        /// Gets the status indicating whether the primary location of the
-        /// storage account is available or unavailable. Possible values
-        /// include: 'Available', 'Unavailable'
+        /// Gets or sets gets the status indicating whether the primary
+        /// location of the storage account is available or unavailable.
+        /// Possible values include: 'Available', 'Unavailable'
         /// </summary>
         [JsonProperty(PropertyName = "statusOfPrimary")]
         public AccountStatus? StatusOfPrimary { get; set; }
 
         /// <summary>
-        /// Gets the timestamp of the most recent instance of a failover to
-        /// the secondary location. Only the most recent timestamp is
-        /// retained. This element is not returned if there has never been a
-        /// failover instance. Only available if the accountType is
-        /// StandardGRS or StandardRAGRS.
+        /// Gets or sets gets the timestamp of the most recent instance of a
+        /// failover to the secondary location. Only the most recent
+        /// timestamp is retained. This element is not returned if there has
+        /// never been a failover instance. Only available if the accountType
+        /// is StandardGRS or StandardRAGRS.
         /// </summary>
         [JsonProperty(PropertyName = "lastGeoFailoverTime")]
         public DateTime? LastGeoFailoverTime { get; set; }
 
         /// <summary>
-        /// Gets the location of the geo replicated secondary for the storage
-        /// account. Only available if the accountType is StandardGRS or
-        /// StandardRAGRS.
+        /// Gets or sets gets the location of the geo replicated secondary for
+        /// the storage account. Only available if the accountType is
+        /// StandardGRS or StandardRAGRS.
         /// </summary>
         [JsonProperty(PropertyName = "secondaryLocation")]
         public string SecondaryLocation { get; set; }
 
         /// <summary>
-        /// Gets the status indicating whether the secondary location of the
-        /// storage account is available or unavailable. Only available if
-        /// the accountType is StandardGRS or StandardRAGRS. Possible values
-        /// include: 'Available', 'Unavailable'
+        /// Gets or sets gets the status indicating whether the secondary
+        /// location of the storage account is available or unavailable. Only
+        /// available if the accountType is StandardGRS or StandardRAGRS.
+        /// Possible values include: 'Available', 'Unavailable'
         /// </summary>
         [JsonProperty(PropertyName = "statusOfSecondary")]
         public AccountStatus? StatusOfSecondary { get; set; }
 
         /// <summary>
-        /// Gets the creation date and time of the storage account in UTC.
+        /// Gets or sets gets the creation date and time of the storage
+        /// account in UTC.
         /// </summary>
         [JsonProperty(PropertyName = "creationTime")]
         public DateTime? CreationTime { get; set; }
 
         /// <summary>
-        /// Gets the user assigned custom domain assigned to this storage
-        /// account.
+        /// Gets or sets gets the user assigned custom domain assigned to this
+        /// storage account.
         /// </summary>
         [JsonProperty(PropertyName = "customDomain")]
         public CustomDomain CustomDomain { get; set; }
 
         /// <summary>
-        /// Gets the URLs that are used to perform a retrieval of a public
-        /// blob, queue or table object from the secondary location of the
-        /// storage account. Only available if the accountType is
+        /// Gets or sets gets the URLs that are used to perform a retrieval of
+        /// a public blob, queue or table object from the secondary location
+        /// of the storage account. Only available if the accountType is
         /// StandardRAGRS.
         /// </summary>
         [JsonProperty(PropertyName = "secondaryEndpoints")]
diff --git a/Samples/azure-storage/Azure.CSharp/Models/StorageAccountPropertiesCreateParameters.cs b/Samples/azure-storage/Azure.CSharp/Models/StorageAccountPropertiesCreateParameters.cs
index bc0824cb9d80e..0c2a98e26f0b0 100644
--- a/Samples/azure-storage/Azure.CSharp/Models/StorageAccountPropertiesCreateParameters.cs
+++ b/Samples/azure-storage/Azure.CSharp/Models/StorageAccountPropertiesCreateParameters.cs
@@ -27,9 +27,9 @@ public StorageAccountPropertiesCreateParameters(AccountType accountType)
         }
 
         /// <summary>
-        /// Gets or sets the account type. Possible values include:
-        /// 'Standard_LRS', 'Standard_ZRS', 'Standard_GRS', 'Standard_RAGRS',
-        /// 'Premium_LRS'
+        /// Gets or sets gets or sets the account type. Possible values
+        /// include: 'Standard_LRS', 'Standard_ZRS', 'Standard_GRS',
+        /// 'Standard_RAGRS', 'Premium_LRS'
         /// </summary>
         [JsonProperty(PropertyName = "accountType")]
         public AccountType AccountType { get; set; }
diff --git a/Samples/azure-storage/Azure.CSharp/Models/StorageAccountPropertiesUpdateParameters.cs b/Samples/azure-storage/Azure.CSharp/Models/StorageAccountPropertiesUpdateParameters.cs
index 4808f3439b039..22ca07468f62a 100644
--- a/Samples/azure-storage/Azure.CSharp/Models/StorageAccountPropertiesUpdateParameters.cs
+++ b/Samples/azure-storage/Azure.CSharp/Models/StorageAccountPropertiesUpdateParameters.cs
@@ -28,9 +28,9 @@ public StorageAccountPropertiesUpdateParameters(AccountType? accountType = defau
         }
 
         /// <summary>
-        /// Gets or sets the account type. Note that StandardZRS and
-        /// PremiumLRS accounts cannot be changed to other account types, and
-        /// other account types cannot be changed to StandardZRS or
+        /// Gets or sets gets or sets the account type. Note that StandardZRS
+        /// and PremiumLRS accounts cannot be changed to other account types,
+        /// and other account types cannot be changed to StandardZRS or
         /// PremiumLRS. Possible values include: 'Standard_LRS',
         /// 'Standard_ZRS', 'Standard_GRS', 'Standard_RAGRS', 'Premium_LRS'
         /// </summary>
@@ -38,10 +38,10 @@ public StorageAccountPropertiesUpdateParameters(AccountType? accountType = defau
         public AccountType? AccountType { get; set; }
 
         /// <summary>
-        /// User domain assigned to the storage account. Name is the CNAME
-        /// source. Only one custom domain is supported per storage account
-        /// at this time. To clear the existing custom domain, use an empty
-        /// string for the custom domain name property.
+        /// Gets or sets user domain assigned to the storage account. Name is
+        /// the CNAME source. Only one custom domain is supported per storage
+        /// account at this time. To clear the existing custom domain, use an
+        /// empty string for the custom domain name property.
         /// </summary>
         [JsonProperty(PropertyName = "customDomain")]
         public CustomDomain CustomDomain { get; set; }
diff --git a/Samples/azure-storage/Azure.CSharp/Models/StorageAccountUpdateParameters.cs b/Samples/azure-storage/Azure.CSharp/Models/StorageAccountUpdateParameters.cs
index 768e0fe7fbe4c..3346aab6e2f10 100644
--- a/Samples/azure-storage/Azure.CSharp/Models/StorageAccountUpdateParameters.cs
+++ b/Samples/azure-storage/Azure.CSharp/Models/StorageAccountUpdateParameters.cs
@@ -31,7 +31,7 @@ public StorageAccountUpdateParameters(IDictionary<string, string> tags = default
         }
 
         /// <summary>
-        /// Resource tags
+        /// Gets or sets resource tags
         /// </summary>
         [JsonProperty(PropertyName = "tags")]
         public IDictionary<string, string> Tags { get; set; }
diff --git a/Samples/azure-storage/Azure.CSharp/Models/Usage.cs b/Samples/azure-storage/Azure.CSharp/Models/Usage.cs
index 338a900b30ddb..4499cc0487999 100644
--- a/Samples/azure-storage/Azure.CSharp/Models/Usage.cs
+++ b/Samples/azure-storage/Azure.CSharp/Models/Usage.cs
@@ -31,28 +31,29 @@ public Usage(UsageUnit unit, int currentValue, int limit, UsageName name)
         }
 
         /// <summary>
-        /// Gets the unit of measurement. Possible values include: 'Count',
-        /// 'Bytes', 'Seconds', 'Percent', 'CountsPerSecond', 'BytesPerSecond'
+        /// Gets or sets gets the unit of measurement. Possible values
+        /// include: 'Count', 'Bytes', 'Seconds', 'Percent',
+        /// 'CountsPerSecond', 'BytesPerSecond'
         /// </summary>
         [JsonProperty(PropertyName = "unit")]
         public UsageUnit Unit { get; set; }
 
         /// <summary>
-        /// Gets the current count of the allocated resources in the
-        /// subscription.
+        /// Gets or sets gets the current count of the allocated resources in
+        /// the subscription.
         /// </summary>
         [JsonProperty(PropertyName = "currentValue")]
         public int CurrentValue { get; set; }
 
         /// <summary>
-        /// Gets the maximum count of the resources that can be allocated in
-        /// the subscription.
+        /// Gets or sets gets the maximum count of the resources that can be
+        /// allocated in the subscription.
         /// </summary>
         [JsonProperty(PropertyName = "limit")]
         public int Limit { get; set; }
 
         /// <summary>
-        /// Gets the name of the type of usage.
+        /// Gets or sets gets the name of the type of usage.
         /// </summary>
         [JsonProperty(PropertyName = "name")]
         public UsageName Name { get; set; }
diff --git a/Samples/azure-storage/Azure.CSharp/Models/UsageName.cs b/Samples/azure-storage/Azure.CSharp/Models/UsageName.cs
index 694332c58b21b..9acc8b5e30d4e 100644
--- a/Samples/azure-storage/Azure.CSharp/Models/UsageName.cs
+++ b/Samples/azure-storage/Azure.CSharp/Models/UsageName.cs
@@ -29,13 +29,13 @@ public UsageName(string value = default(string), string localizedValue = default
         }
 
         /// <summary>
-        /// Gets a string describing the resource name.
+        /// Gets or sets gets a string describing the resource name.
         /// </summary>
         [JsonProperty(PropertyName = "value")]
         public string Value { get; set; }
 
         /// <summary>
-        /// Gets a localized string describing the resource name.
+        /// Gets or sets gets a localized string describing the resource name.
         /// </summary>
         [JsonProperty(PropertyName = "localizedValue")]
         public string LocalizedValue { get; set; }
diff --git a/Samples/azure-storage/Azure.NodeJS/operations/storageAccounts.js b/Samples/azure-storage/Azure.NodeJS/operations/storageAccounts.js
index 1cd198259f23d..c1b4897711661 100644
--- a/Samples/azure-storage/Azure.NodeJS/operations/storageAccounts.js
+++ b/Samples/azure-storage/Azure.NodeJS/operations/storageAccounts.js
@@ -248,7 +248,7 @@ StorageAccounts.prototype.create = function (resourceGroupName, accountName, par
     initialResult.request = httpRequest;
     initialResult.response = response;
     initialResult.body = response.body;
-    client.getPutOrPatchOperationResult(initialResult, options, function (err, pollingResult) {
+    client.getLongRunningOperationResult(initialResult, options, function (err, pollingResult) {
       if (err) return callback(err);
 
       // Create Result
diff --git a/Samples/azure-storage/Azure.Python/setup.py b/Samples/azure-storage/Azure.Python/setup.py
index b9fe5db7a8f35..3260175533423 100644
--- a/Samples/azure-storage/Azure.Python/setup.py
+++ b/Samples/azure-storage/Azure.Python/setup.py
@@ -15,7 +15,7 @@
 # prerequisite: setuptools
 # http://pypi.python.org/pypi/setuptools
 
-REQUIRES = ["msrest>=0.2.0", "msrestazure>=0.2.1"]
+REQUIRES = ["msrest>=0.3.0", "msrestazure>=0.3.0"]
 
 setup(
     name=NAME,
diff --git a/Samples/azure-storage/Azure.Python/storagemanagementclient/models/resource.py b/Samples/azure-storage/Azure.Python/storagemanagementclient/models/resource.py
index e784f717664d9..87763cb25e4b4 100644
--- a/Samples/azure-storage/Azure.Python/storagemanagementclient/models/resource.py
+++ b/Samples/azure-storage/Azure.Python/storagemanagementclient/models/resource.py
@@ -8,18 +8,27 @@
 class Resource(Model):
     """Resource
 
-    :param id: Resource Id
-    :type id: str
-    :param name: Resource name
-    :type name: str
-    :param type: Resource type
-    :type type: str
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Resource Id
+    :vartype id: str
+    :ivar name: Resource name
+    :vartype name: str
+    :ivar type: Resource type
+    :vartype type: str
     :param location: Resource location
     :type location: str
     :param tags: Resource tags
     :type tags: dict
     """ 
 
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+    }
+
     _attribute_map = {
         'id': {'key': 'id', 'type': 'str'},
         'name': {'key': 'name', 'type': 'str'},
@@ -28,9 +37,9 @@ class Resource(Model):
         'tags': {'key': 'tags', 'type': '{str}'},
     }
 
-    def __init__(self, id=None, name=None, type=None, location=None, tags=None):
-        self.id = id
-        self.name = name
-        self.type = type
+    def __init__(self, location=None, tags=None):
+        self.id = None
+        self.name = None
+        self.type = None
         self.location = location
         self.tags = tags
diff --git a/Samples/azure-storage/Azure.Python/storagemanagementclient/models/storage_account.py b/Samples/azure-storage/Azure.Python/storagemanagementclient/models/storage_account.py
index 274af1b58793d..1aeaa6bc9f22d 100644
--- a/Samples/azure-storage/Azure.Python/storagemanagementclient/models/storage_account.py
+++ b/Samples/azure-storage/Azure.Python/storagemanagementclient/models/storage_account.py
@@ -9,12 +9,15 @@ class StorageAccount(Resource):
     """
     The storage account.
 
-    :param id: Resource Id
-    :type id: str
-    :param name: Resource name
-    :type name: str
-    :param type: Resource type
-    :type type: str
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Resource Id
+    :vartype id: str
+    :ivar name: Resource name
+    :vartype name: str
+    :ivar type: Resource type
+    :vartype type: str
     :param location: Resource location
     :type location: str
     :param tags: Resource tags
@@ -24,6 +27,12 @@ class StorageAccount(Resource):
      <petstore.models.StorageAccountProperties>`
     """ 
 
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+    }
+
     _attribute_map = {
         'id': {'key': 'id', 'type': 'str'},
         'name': {'key': 'name', 'type': 'str'},
@@ -33,6 +42,6 @@ class StorageAccount(Resource):
         'properties': {'key': 'properties', 'type': 'StorageAccountProperties'},
     }
 
-    def __init__(self, id=None, name=None, type=None, location=None, tags=None, properties=None):
-        super(StorageAccount, self).__init__(id=id, name=name, type=type, location=location, tags=tags)
+    def __init__(self, location=None, tags=None, properties=None):
+        super(StorageAccount, self).__init__(location=location, tags=tags)
         self.properties = properties
diff --git a/Samples/azure-storage/Azure.Python/storagemanagementclient/storage_management_client.py b/Samples/azure-storage/Azure.Python/storagemanagementclient/storage_management_client.py
index 732eb30e70fb2..00031c87fca75 100644
--- a/Samples/azure-storage/Azure.Python/storagemanagementclient/storage_management_client.py
+++ b/Samples/azure-storage/Azure.Python/storagemanagementclient/storage_management_client.py
@@ -43,9 +43,15 @@ def __init__(
             self, credentials, subscription_id, api_version='2015-06-15', accept_language='en-US', long_running_operation_retry_timeout=30, generate_client_request_id=True, base_url=None, filepath=None):
 
         if credentials is None:
-            raise ValueError('credentials must not be None.')
+            raise ValueError("Parameter 'credentials' must not be None.")
         if subscription_id is None:
-            raise ValueError('subscription_id must not be None.')
+            raise ValueError("Parameter 'subscription_id' must not be None.")
+        if not isinstance(subscription_id, str):
+            raise TypeError("Parameter 'subscription_id' must be str.")
+        if api_version is not None and not isinstance(api_version, str):
+            raise TypeError("Optional parameter 'api_version' must be str.")
+        if accept_language is not None and not isinstance(accept_language, str):
+            raise TypeError("Optional parameter 'accept_language' must be str.")
         if not base_url:
             base_url = 'https://management.azure.com'
 
diff --git a/Samples/azure-storage/Azure.Ruby/azure_storage/storage_accounts.rb b/Samples/azure-storage/Azure.Ruby/azure_storage/storage_accounts.rb
index d81d3ec1045df..771307fb0945d 100644
--- a/Samples/azure-storage/Azure.Ruby/azure_storage/storage_accounts.rb
+++ b/Samples/azure-storage/Azure.Ruby/azure_storage/storage_accounts.rb
@@ -89,7 +89,10 @@ def check_name_availability_async(account_name, custom_headers = nil)
           body: request_content,
           headers: request_headers.merge(custom_headers || {})
       }
-      request = MsRest::HttpOperationRequest.new(@base_url || @client.base_url, path_template, :post, options)
+
+      request_url = @base_url || @client.base_url
+
+      request = MsRest::HttpOperationRequest.new(request_url, path_template, :post, options)
       promise = request.run_promise do |req|
         @client.credentials.sign_request(req) unless @client.credentials.nil?
       end
@@ -161,7 +164,7 @@ def create(resource_group_name, account_name, parameters, custom_headers = nil)
         end
 
         # Waiting for response.
-        @client.get_put_operation_result(response, deserialize_method)
+        @client.get_long_running_operation_result(response, deserialize_method)
       end
 
       promise
@@ -260,7 +263,10 @@ def begin_create_async(resource_group_name, account_name, parameters, custom_hea
           body: request_content,
           headers: request_headers.merge(custom_headers || {})
       }
-      request = MsRest::HttpOperationRequest.new(@base_url || @client.base_url, path_template, :put, options)
+
+      request_url = @base_url || @client.base_url
+
+      request = MsRest::HttpOperationRequest.new(request_url, path_template, :put, options)
       promise = request.run_promise do |req|
         @client.credentials.sign_request(req) unless @client.credentials.nil?
       end
@@ -359,7 +365,10 @@ def delete_async(resource_group_name, account_name, custom_headers = nil)
           query_params: {'api-version' => @client.api_version},
           headers: request_headers.merge(custom_headers || {})
       }
-      request = MsRest::HttpOperationRequest.new(@base_url || @client.base_url, path_template, :delete, options)
+
+      request_url = @base_url || @client.base_url
+
+      request = MsRest::HttpOperationRequest.new(request_url, path_template, :delete, options)
       promise = request.run_promise do |req|
         @client.credentials.sign_request(req) unless @client.credentials.nil?
       end
@@ -453,7 +462,10 @@ def get_properties_async(resource_group_name, account_name, custom_headers = nil
           query_params: {'api-version' => @client.api_version},
           headers: request_headers.merge(custom_headers || {})
       }
-      request = MsRest::HttpOperationRequest.new(@base_url || @client.base_url, path_template, :get, options)
+
+      request_url = @base_url || @client.base_url
+
+      request = MsRest::HttpOperationRequest.new(request_url, path_template, :get, options)
       promise = request.run_promise do |req|
         @client.credentials.sign_request(req) unless @client.credentials.nil?
       end
@@ -605,7 +617,10 @@ def update_async(resource_group_name, account_name, parameters, custom_headers =
           body: request_content,
           headers: request_headers.merge(custom_headers || {})
       }
-      request = MsRest::HttpOperationRequest.new(@base_url || @client.base_url, path_template, :patch, options)
+
+      request_url = @base_url || @client.base_url
+
+      request = MsRest::HttpOperationRequest.new(request_url, path_template, :patch, options)
       promise = request.run_promise do |req|
         @client.credentials.sign_request(req) unless @client.credentials.nil?
       end
@@ -696,7 +711,10 @@ def list_keys_async(resource_group_name, account_name, custom_headers = nil)
           query_params: {'api-version' => @client.api_version},
           headers: request_headers.merge(custom_headers || {})
       }
-      request = MsRest::HttpOperationRequest.new(@base_url || @client.base_url, path_template, :post, options)
+
+      request_url = @base_url || @client.base_url
+
+      request = MsRest::HttpOperationRequest.new(request_url, path_template, :post, options)
       promise = request.run_promise do |req|
         @client.credentials.sign_request(req) unless @client.credentials.nil?
       end
@@ -782,7 +800,10 @@ def list_async(custom_headers = nil)
           query_params: {'api-version' => @client.api_version},
           headers: request_headers.merge(custom_headers || {})
       }
-      request = MsRest::HttpOperationRequest.new(@base_url || @client.base_url, path_template, :get, options)
+
+      request_url = @base_url || @client.base_url
+
+      request = MsRest::HttpOperationRequest.new(request_url, path_template, :get, options)
       promise = request.run_promise do |req|
         @client.credentials.sign_request(req) unless @client.credentials.nil?
       end
@@ -878,7 +899,10 @@ def list_by_resource_group_async(resource_group_name, custom_headers = nil)
           query_params: {'api-version' => @client.api_version},
           headers: request_headers.merge(custom_headers || {})
       }
-      request = MsRest::HttpOperationRequest.new(@base_url || @client.base_url, path_template, :get, options)
+
+      request_url = @base_url || @client.base_url
+
+      request = MsRest::HttpOperationRequest.new(request_url, path_template, :get, options)
       promise = request.run_promise do |req|
         @client.credentials.sign_request(req) unless @client.credentials.nil?
       end
@@ -994,7 +1018,10 @@ def regenerate_key_async(resource_group_name, account_name, regenerate_key, cust
           body: request_content,
           headers: request_headers.merge(custom_headers || {})
       }
-      request = MsRest::HttpOperationRequest.new(@base_url || @client.base_url, path_template, :post, options)
+
+      request_url = @base_url || @client.base_url
+
+      request = MsRest::HttpOperationRequest.new(request_url, path_template, :post, options)
       promise = request.run_promise do |req|
         @client.credentials.sign_request(req) unless @client.credentials.nil?
       end
diff --git a/Samples/azure-storage/Azure.Ruby/azure_storage/usage_operations.rb b/Samples/azure-storage/Azure.Ruby/azure_storage/usage_operations.rb
index 54a4173ea263f..7ac968267e69c 100644
--- a/Samples/azure-storage/Azure.Ruby/azure_storage/usage_operations.rb
+++ b/Samples/azure-storage/Azure.Ruby/azure_storage/usage_operations.rb
@@ -70,7 +70,10 @@ def list_async(custom_headers = nil)
           query_params: {'api-version' => @client.api_version},
           headers: request_headers.merge(custom_headers || {})
       }
-      request = MsRest::HttpOperationRequest.new(@base_url || @client.base_url, path_template, :get, options)
+
+      request_url = @base_url || @client.base_url
+
+      request = MsRest::HttpOperationRequest.new(request_url, path_template, :get, options)
       promise = request.run_promise do |req|
         @client.credentials.sign_request(req) unless @client.credentials.nil?
       end
diff --git a/Samples/petstore/CSharp/Models/Order.cs b/Samples/petstore/CSharp/Models/Order.cs
index b0c9e5ab6d146..23e3155fa2f51 100644
--- a/Samples/petstore/CSharp/Models/Order.cs
+++ b/Samples/petstore/CSharp/Models/Order.cs
@@ -49,8 +49,8 @@ public Order(long? id = default(long?), long? petId = default(long?), int? quant
         public DateTime? ShipDate { get; set; }
 
         /// <summary>
-        /// Order Status. Possible values include: 'placed', 'approved',
-        /// 'delivered'
+        /// Gets or sets order Status. Possible values include: 'placed',
+        /// 'approved', 'delivered'
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
diff --git a/Samples/petstore/CSharp/Models/Pet.cs b/Samples/petstore/CSharp/Models/Pet.cs
index c4e0286deb254..672c2aad64087 100644
--- a/Samples/petstore/CSharp/Models/Pet.cs
+++ b/Samples/petstore/CSharp/Models/Pet.cs
@@ -54,8 +54,8 @@ public Pet(string name, IList<string> photoUrls, long? id = default(long?), Cate
         public IList<Tag> Tags { get; set; }
 
         /// <summary>
-        /// pet status in the store. Possible values include: 'available',
-        /// 'pending', 'sold'
+        /// Gets or sets pet status in the store. Possible values include:
+        /// 'available', 'pending', 'sold'
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; set; }
diff --git a/Samples/petstore/CSharp/Models/User.cs b/Samples/petstore/CSharp/Models/User.cs
index d30dd443ac789..acdc7b1824011 100644
--- a/Samples/petstore/CSharp/Models/User.cs
+++ b/Samples/petstore/CSharp/Models/User.cs
@@ -66,7 +66,7 @@ public User(long? id = default(long?), string username = default(string), string
         public string Phone { get; set; }
 
         /// <summary>
-        /// User Status
+        /// Gets or sets user Status
         /// </summary>
         [JsonProperty(PropertyName = "userStatus")]
         public int? UserStatus { get; set; }
diff --git a/Samples/petstore/Python/swaggerpetstore/models/order.py b/Samples/petstore/Python/swaggerpetstore/models/order.py
index 8b7b27a2bbe96..6e1f3c0aac504 100644
--- a/Samples/petstore/Python/swaggerpetstore/models/order.py
+++ b/Samples/petstore/Python/swaggerpetstore/models/order.py
@@ -8,8 +8,11 @@
 class Order(Model):
     """Order
 
-    :param id:
-    :type id: long
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id:
+    :vartype id: long
     :param pet_id:
     :type pet_id: long
     :param quantity:
@@ -23,6 +26,10 @@ class Order(Model):
     :type complete: bool
     """ 
 
+    _validation = {
+        'id': {'readonly': True},
+    }
+
     _attribute_map = {
         'id': {'key': 'id', 'type': 'long'},
         'pet_id': {'key': 'petId', 'type': 'long'},
@@ -32,8 +39,8 @@ class Order(Model):
         'complete': {'key': 'complete', 'type': 'bool'},
     }
 
-    def __init__(self, id=None, pet_id=None, quantity=None, ship_date=None, status=None, complete=None):
-        self.id = id
+    def __init__(self, pet_id=None, quantity=None, ship_date=None, status=None, complete=None):
+        self.id = None
         self.pet_id = pet_id
         self.quantity = quantity
         self.ship_date = ship_date
diff --git a/Samples/petstore/Ruby/petstore/swagger_petstore.rb b/Samples/petstore/Ruby/petstore/swagger_petstore.rb
index 9584898cad19a..d1ebfee575938 100644
--- a/Samples/petstore/Ruby/petstore/swagger_petstore.rb
+++ b/Samples/petstore/Ruby/petstore/swagger_petstore.rb
@@ -75,7 +75,10 @@ def add_pet_using_byte_array_async(body = nil, custom_headers = nil)
           body: request_content,
           headers: request_headers.merge(custom_headers || {})
       }
-      request = MsRest::HttpOperationRequest.new(@base_url || self.base_url, path_template, :post, options)
+
+      request_url = @base_url || self.base_url
+
+      request = MsRest::HttpOperationRequest.new(request_url, path_template, :post, options)
       promise = request.run_promise do |req|
         self.credentials.sign_request(req) unless self.credentials.nil?
       end
@@ -148,7 +151,10 @@ def add_pet_async(body = nil, custom_headers = nil)
           body: request_content,
           headers: request_headers.merge(custom_headers || {})
       }
-      request = MsRest::HttpOperationRequest.new(@base_url || self.base_url, path_template, :post, options)
+
+      request_url = @base_url || self.base_url
+
+      request = MsRest::HttpOperationRequest.new(request_url, path_template, :post, options)
       promise = request.run_promise do |req|
         self.credentials.sign_request(req) unless self.credentials.nil?
       end
@@ -221,7 +227,10 @@ def update_pet_async(body = nil, custom_headers = nil)
           body: request_content,
           headers: request_headers.merge(custom_headers || {})
       }
-      request = MsRest::HttpOperationRequest.new(@base_url || self.base_url, path_template, :put, options)
+
+      request_url = @base_url || self.base_url
+
+      request = MsRest::HttpOperationRequest.new(request_url, path_template, :put, options)
       promise = request.run_promise do |req|
         self.credentials.sign_request(req) unless self.credentials.nil?
       end
@@ -294,10 +303,13 @@ def find_pets_by_status_async(status = nil, custom_headers = nil)
       path_template = '/pet/findByStatus'
       options = {
           middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
-          query_params: {'status' => status},
+          query_params: {'status' => status.join(',')},
           headers: request_headers.merge(custom_headers || {})
       }
-      request = MsRest::HttpOperationRequest.new(@base_url || self.base_url, path_template, :get, options)
+
+      request_url = @base_url || self.base_url
+
+      request = MsRest::HttpOperationRequest.new(request_url, path_template, :get, options)
       promise = request.run_promise do |req|
         self.credentials.sign_request(req) unless self.credentials.nil?
       end
@@ -389,10 +401,13 @@ def find_pets_by_tags_async(tags = nil, custom_headers = nil)
       path_template = '/pet/findByTags'
       options = {
           middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
-          query_params: {'tags' => tags},
+          query_params: {'tags' => tags.join(',')},
           headers: request_headers.merge(custom_headers || {})
       }
-      request = MsRest::HttpOperationRequest.new(@base_url || self.base_url, path_template, :get, options)
+
+      request_url = @base_url || self.base_url
+
+      request = MsRest::HttpOperationRequest.new(request_url, path_template, :get, options)
       promise = request.run_promise do |req|
         self.credentials.sign_request(req) unless self.credentials.nil?
       end
@@ -484,10 +499,13 @@ def find_pets_with_byte_array_async(pet_id, custom_headers = nil)
       path_template = '/pet/{petId}'
       options = {
           middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
-          path_params: {'petId' => pet_id},
+          path_params: {'petId' => pet_id.to_s},
           headers: request_headers.merge(custom_headers || {})
       }
-      request = MsRest::HttpOperationRequest.new(@base_url || self.base_url, path_template, :get, options)
+
+      request_url = @base_url || self.base_url
+
+      request = MsRest::HttpOperationRequest.new(request_url, path_template, :get, options)
       promise = request.run_promise do |req|
         self.credentials.sign_request(req) unless self.credentials.nil?
       end
@@ -569,10 +587,13 @@ def get_pet_by_id_async(pet_id, custom_headers = nil)
       path_template = '/pet/{petId}'
       options = {
           middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
-          path_params: {'petId' => pet_id},
+          path_params: {'petId' => pet_id.to_s},
           headers: request_headers.merge(custom_headers || {})
       }
-      request = MsRest::HttpOperationRequest.new(@base_url || self.base_url, path_template, :get, options)
+
+      request_url = @base_url || self.base_url
+
+      request = MsRest::HttpOperationRequest.new(request_url, path_template, :get, options)
       promise = request.run_promise do |req|
         self.credentials.sign_request(req) unless self.credentials.nil?
       end
@@ -656,7 +677,10 @@ def update_pet_with_form_async(pet_id, name = nil, status = nil, custom_headers
           path_params: {'petId' => pet_id},
           headers: request_headers.merge(custom_headers || {})
       }
-      request = MsRest::HttpOperationRequest.new(@base_url || self.base_url, path_template, :post, options)
+
+      request_url = @base_url || self.base_url
+
+      request = MsRest::HttpOperationRequest.new(request_url, path_template, :post, options)
       promise = request.run_promise do |req|
         self.credentials.sign_request(req) unless self.credentials.nil?
       end
@@ -725,10 +749,13 @@ def delete_pet_async(pet_id, api_key = nil, custom_headers = nil)
       path_template = '/pet/{petId}'
       options = {
           middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
-          path_params: {'petId' => pet_id},
+          path_params: {'petId' => pet_id.to_s},
           headers: request_headers.merge(custom_headers || {})
       }
-      request = MsRest::HttpOperationRequest.new(@base_url || self.base_url, path_template, :delete, options)
+
+      request_url = @base_url || self.base_url
+
+      request = MsRest::HttpOperationRequest.new(request_url, path_template, :delete, options)
       promise = request.run_promise do |req|
         self.credentials.sign_request(req) unless self.credentials.nil?
       end
@@ -797,10 +824,13 @@ def upload_file_async(pet_id, additional_metadata = nil, file = nil, custom_head
       path_template = '/pet/{petId}/uploadImage'
       options = {
           middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
-          path_params: {'petId' => pet_id},
+          path_params: {'petId' => pet_id.to_s},
           headers: request_headers.merge(custom_headers || {})
       }
-      request = MsRest::HttpOperationRequest.new(@base_url || self.base_url, path_template, :post, options)
+
+      request_url = @base_url || self.base_url
+
+      request = MsRest::HttpOperationRequest.new(request_url, path_template, :post, options)
       promise = request.run_promise do |req|
         self.credentials.sign_request(req) unless self.credentials.nil?
       end
@@ -868,7 +898,10 @@ def get_inventory_async(custom_headers = nil)
           middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
           headers: request_headers.merge(custom_headers || {})
       }
-      request = MsRest::HttpOperationRequest.new(@base_url || self.base_url, path_template, :get, options)
+
+      request_url = @base_url || self.base_url
+
+      request = MsRest::HttpOperationRequest.new(request_url, path_template, :get, options)
       promise = request.run_promise do |req|
         self.credentials.sign_request(req) unless self.credentials.nil?
       end
@@ -957,7 +990,10 @@ def place_order_async(body = nil, custom_headers = nil)
           body: request_content,
           headers: request_headers.merge(custom_headers || {})
       }
-      request = MsRest::HttpOperationRequest.new(@base_url || self.base_url, path_template, :post, options)
+
+      request_url = @base_url || self.base_url
+
+      request = MsRest::HttpOperationRequest.new(request_url, path_template, :post, options)
       promise = request.run_promise do |req|
         self.credentials.sign_request(req) unless self.credentials.nil?
       end
@@ -1045,7 +1081,10 @@ def get_order_by_id_async(order_id, custom_headers = nil)
           path_params: {'orderId' => order_id},
           headers: request_headers.merge(custom_headers || {})
       }
-      request = MsRest::HttpOperationRequest.new(@base_url || self.base_url, path_template, :get, options)
+
+      request_url = @base_url || self.base_url
+
+      request = MsRest::HttpOperationRequest.new(request_url, path_template, :get, options)
       promise = request.run_promise do |req|
         self.credentials.sign_request(req) unless self.credentials.nil?
       end
@@ -1132,7 +1171,10 @@ def delete_order_async(order_id, custom_headers = nil)
           path_params: {'orderId' => order_id},
           headers: request_headers.merge(custom_headers || {})
       }
-      request = MsRest::HttpOperationRequest.new(@base_url || self.base_url, path_template, :delete, options)
+
+      request_url = @base_url || self.base_url
+
+      request = MsRest::HttpOperationRequest.new(request_url, path_template, :delete, options)
       promise = request.run_promise do |req|
         self.credentials.sign_request(req) unless self.credentials.nil?
       end
@@ -1211,7 +1253,10 @@ def create_user_async(body = nil, custom_headers = nil)
           body: request_content,
           headers: request_headers.merge(custom_headers || {})
       }
-      request = MsRest::HttpOperationRequest.new(@base_url || self.base_url, path_template, :post, options)
+
+      request_url = @base_url || self.base_url
+
+      request = MsRest::HttpOperationRequest.new(request_url, path_template, :post, options)
       promise = request.run_promise do |req|
         self.credentials.sign_request(req) unless self.credentials.nil?
       end
@@ -1291,7 +1336,10 @@ def create_users_with_array_input_async(body = nil, custom_headers = nil)
           body: request_content,
           headers: request_headers.merge(custom_headers || {})
       }
-      request = MsRest::HttpOperationRequest.new(@base_url || self.base_url, path_template, :post, options)
+
+      request_url = @base_url || self.base_url
+
+      request = MsRest::HttpOperationRequest.new(request_url, path_template, :post, options)
       promise = request.run_promise do |req|
         self.credentials.sign_request(req) unless self.credentials.nil?
       end
@@ -1371,7 +1419,10 @@ def create_users_with_list_input_async(body = nil, custom_headers = nil)
           body: request_content,
           headers: request_headers.merge(custom_headers || {})
       }
-      request = MsRest::HttpOperationRequest.new(@base_url || self.base_url, path_template, :post, options)
+
+      request_url = @base_url || self.base_url
+
+      request = MsRest::HttpOperationRequest.new(request_url, path_template, :post, options)
       promise = request.run_promise do |req|
         self.credentials.sign_request(req) unless self.credentials.nil?
       end
@@ -1440,7 +1491,10 @@ def login_user_async(username = nil, password = nil, custom_headers = nil)
           query_params: {'username' => username,'password' => password},
           headers: request_headers.merge(custom_headers || {})
       }
-      request = MsRest::HttpOperationRequest.new(@base_url || self.base_url, path_template, :get, options)
+
+      request_url = @base_url || self.base_url
+
+      request = MsRest::HttpOperationRequest.new(request_url, path_template, :get, options)
       promise = request.run_promise do |req|
         self.credentials.sign_request(req) unless self.credentials.nil?
       end
@@ -1510,7 +1564,10 @@ def logout_user_async(custom_headers = nil)
           middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
           headers: request_headers.merge(custom_headers || {})
       }
-      request = MsRest::HttpOperationRequest.new(@base_url || self.base_url, path_template, :get, options)
+
+      request_url = @base_url || self.base_url
+
+      request = MsRest::HttpOperationRequest.new(request_url, path_template, :get, options)
       promise = request.run_promise do |req|
         self.credentials.sign_request(req) unless self.credentials.nil?
       end
@@ -1580,7 +1637,10 @@ def get_user_by_name_async(username, custom_headers = nil)
           path_params: {'username' => username},
           headers: request_headers.merge(custom_headers || {})
       }
-      request = MsRest::HttpOperationRequest.new(@base_url || self.base_url, path_template, :get, options)
+
+      request_url = @base_url || self.base_url
+
+      request = MsRest::HttpOperationRequest.new(request_url, path_template, :get, options)
       promise = request.run_promise do |req|
         self.credentials.sign_request(req) unless self.credentials.nil?
       end
@@ -1676,7 +1736,10 @@ def update_user_async(username, body = nil, custom_headers = nil)
           body: request_content,
           headers: request_headers.merge(custom_headers || {})
       }
-      request = MsRest::HttpOperationRequest.new(@base_url || self.base_url, path_template, :put, options)
+
+      request_url = @base_url || self.base_url
+
+      request = MsRest::HttpOperationRequest.new(request_url, path_template, :put, options)
       promise = request.run_promise do |req|
         self.credentials.sign_request(req) unless self.credentials.nil?
       end
@@ -1748,7 +1811,10 @@ def delete_user_async(username, custom_headers = nil)
           path_params: {'username' => username},
           headers: request_headers.merge(custom_headers || {})
       }
-      request = MsRest::HttpOperationRequest.new(@base_url || self.base_url, path_template, :delete, options)
+
+      request_url = @base_url || self.base_url
+
+      request = MsRest::HttpOperationRequest.new(request_url, path_template, :delete, options)
       promise = request.run_promise do |req|
         self.credentials.sign_request(req) unless self.credentials.nil?
       end
diff --git a/Tools/dockerfiles/Dockerfile b/Tools/dockerfiles/Dockerfile
index dd223ea348932..a7b67824690b7 100644
--- a/Tools/dockerfiles/Dockerfile
+++ b/Tools/dockerfiles/Dockerfile
@@ -10,8 +10,8 @@ RUN apt-get -qqy update && \
 RUN bash -c "\
 	mkdir /opt/autorest && \
 	cd /opt/autorest && \
-	wget https://github.com/Azure/autorest/releases/download/AutoRest-0.15.0/autorest.0.15.0.zip && \
-	unzip autorest.0.15.0.zip"
+	wget https://github.com/Azure/autorest/releases/download/AutoRest-0.16.0/autorest.0.16.0.zip && \
+	unzip autorest.0.16.0.zip"
 
 ADD autorest /opt/autorest/autorest
 
diff --git a/gulpfile.js b/gulpfile.js
index 942ac3a898b84..0200a15c8c7f6 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,4 +1,4 @@
-/// <binding />
+/// <binding Clean='clean' />
 var gulp = require('gulp'),
 msbuild = require('gulp-msbuild'),
 debug = require('gulp-debug'),
@@ -63,7 +63,8 @@ var defaultMappings = {
   'AcceptanceTests/Url': '../../../TestServer/swagger/url.json',
   'AcceptanceTests/Validation': '../../../TestServer/swagger/validation.json',
   'AcceptanceTests/CustomBaseUri': '../../../TestServer/swagger/custom-baseUrl.json',
-  'AcceptanceTests/ModelFlattening': '../../../TestServer/swagger/model-flattening.json',
+  'AcceptanceTests/CustomBaseUriMoreOptions': '../../../TestServer/swagger/custom-baseUrl-more-options.json',
+  'AcceptanceTests/ModelFlattening': '../../../TestServer/swagger/model-flattening.json'
 };
 
 var rubyMappings = {
@@ -127,6 +128,8 @@ var rubyAzureMappings = {
   'azure_url':['../../../TestServer/swagger/subscriptionId-apiVersion.json', 'AzureUrlModule'],
   'azure_special_properties': ['../../../TestServer/swagger/azure-special-properties.json', 'AzureSpecialPropertiesModule'],
   'azure_report':['../../../TestServer/swagger/azure-report.json', 'AzureReportModule'],
+  'custom_base_uri':['../../../TestServer/swagger/custom-baseUrl.json', 'CustomBaseUriModule'],
+  'custom_base_uri_more':['../../../TestServer/swagger/custom-baseUrl-more-options.json', 'CustomBaseUriMoreModule'],
 };
 
 gulp.task('regenerate:expected', function(cb){
diff --git a/schema/swagger-extensions.json b/schema/swagger-extensions.json
index 199078f32eee3..6e6476c56dbf0 100644
--- a/schema/swagger-extensions.json
+++ b/schema/swagger-extensions.json
@@ -1540,6 +1540,15 @@
         "hostTemplate": {
           "type": "string"
         },
+        "useSchemePrefix": {
+          "type": "boolean",
+          "default": true
+        },
+        "positionInOperation": {
+          "type": "string",
+          "default": "first",
+          "pattern": "^(fir|la)st$"
+        },
         "parameters": {
           "$ref": "#/definitions/xmsHostParametersList"
         }