huangpf · huangpf · Jan 20, 2016 · Jan 13, 2016 · Jan 15, 2016 · Jan 15, 2016
diff --git a/clu-getstart.md b/clu-getstart.md
@@ -1,4 +1,4 @@
-# Work on CLU cmdlets
+# Work on CLU cmdlets
 
 ## Prerequsites
 
@@ -25,7 +25,7 @@ CLUPackages require some additional files to direct generation of indexing, and
     | ------------- |:-------------:|
     | CommandAssemblies      | File name of cmdlets assembly(ies) |
     | NounPrefix      | ‘AzureRm’  The part of the cmdlet noun to remove in clu commands|
-    | NounFirst       | if true, the verb comes at the end of the command (e.g. az resource get)|
+    | NounFirst       | if true, the verb comes at the end of the command (e.g. az resource ls)|
 
 * \<modulename\>.nuspec.template, which contains nuspec format metadata about the package – the base temaplate is in tools\clu\Microsoft.Azure.Commands.nuspec.template.  Here are the special fields defined in this template:
    * %PackageId% - replace with the module name (Microsoft.Azure.Commands.\<rp-name\>)
@@ -63,16 +63,16 @@ To test on osx/linux boxes, do #1, open `<repo-root>\drop\clurun`, copy the flav
 (All of those are subject to change, contact yugangw or adxsdkdev for any questions)
 
 ## Quick introductions on cmdlets
-  *  Run commands using the ‘az’ prefix, cmdlet nouns, and cmdlet verbs, for example, `az env get` maps to the cmdlet `Get-AzureRmEnvironment`
-  *  Cmdlet parameters use the double dash (--) so for example, getting a subscription with a particular name would be: `az subscription get –-SubscriptionName “name of subscription"`
+  *  Run commands using the ‘az’ prefix, cmdlet nouns, and cmdlet verbs, for example, `az env ls` maps to the cmdlet `Get-AzureRmEnvironment`
+  *  Cmdlet parameters use the double dash (--) so for example, getting a subscription with a particular name would be: `az subscription ls –-SubscriptionName “name of subscription"`
   * To log in, 3 options
-    * login interactively using device flow, this is the only option for msa account or any org-id with 2fa enforced, example: `az account add`
-    * login with user and password, this works on org-id w/o 2fa enforced, example: `az account add --Username [email protected]  --Password password1`
-    * login as service principal. Example: `az account add --ServicePrincipal --TenantId <tenant> --ApplicationId <id> --Secret <secret>`
+    * login interactively using device flow, this is the only option for msa account or any org-id with 2fa enforced, example: `az login`
+    * login with user and password, this works on org-id w/o 2fa enforced, example: `az login --Username [email protected]  --Password password1`
+    * login as service principal. Example: `az login --ServicePrincipal --TenantId <tenant> --ApplicationId <id> --Secret <secret>`
   * Piping between cmdlets should work the same way that Powerhell piping works
-    ```az subscription get --SubscriptionName | az context set```
+    ```az subscription ls --SubscriptionName | az context set```
   * You can capture piped output using redirection to a file - the result will be the json serialization of the output object.
-    ```az subscription get > subscriptions.json```
+    ```az subscription ls > subscriptions.json```
   * You can use file input to a parameter using '@' notation:
     ```az command --param1 @file1.json```
     Reads input from file1.json and attempts to deserialize the .net object that is the Parameter type for ```param1```

diff --git a/dockerfiles/latest-trusty/Dockerfile b/dockerfiles/latest-trusty/Dockerfile
@@ -0,0 +1,19 @@
+FROM ubuntu:14.04
+
+# all in one RUN to produce less, smaller layers
+RUN bash -c "\
+	sudo apt-get -qqy update && \
+	sudo apt-get -qqy upgrade && \
+	sudo apt-get -qqy install wget libicu-dev libunwind8-dev libcurl3 libcurl4-gnutls-dev && \
+	sudo apt-get clean && \
+	sudo rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*"
+
+RUN bash -c "\
+	mkdir /opt/az && \
+	cd /opt/az && \
+	wget https://azurecludrops.blob.core.windows.net/drops/ubuntu.14.04-x64.latest.tar.gz && \
+	tar xvzf ubuntu.14.04-x64.latest.tar.gz"
+
+ENV PATH "$PATH:/opt/az/ubuntu.14.04-x64/"
+
+WORKDIR /opt/az/ubuntu.14.04-x64/
diff --git a/src/CLU/CLUCoreCLR.sln b/src/CLU/CLUCoreCLR.sln
@@ -66,6 +66,8 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Sync", "Sync\Sync.xproj", "
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Azure.Commands.Network", "Microsoft.Azure.Commands.Network\Microsoft.Azure.Commands.Network.xproj", "{C4DCF4EA-62E7-431E-ADB5-16FD6CFEA5D6}"
 EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.CLU.Test", "Microsoft.CLU.Test\Microsoft.CLU.Test.xproj", "{13C34370-51A4-4726-81B8-BE0996FC9CF0}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -166,6 +168,10 @@ Global
 		{C4DCF4EA-62E7-431E-ADB5-16FD6CFEA5D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C4DCF4EA-62E7-431E-ADB5-16FD6CFEA5D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C4DCF4EA-62E7-431E-ADB5-16FD6CFEA5D6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{13C34370-51A4-4726-81B8-BE0996FC9CF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{13C34370-51A4-4726-81B8-BE0996FC9CF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{13C34370-51A4-4726-81B8-BE0996FC9CF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{13C34370-51A4-4726-81B8-BE0996FC9CF0}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/...licationGateway/BackendAddressPool/AddAzureApplicationGatewayBackendAddressPoolCommand.cs b/...licationGateway/BackendAddressPool/AddAzureApplicationGatewayBackendAddressPoolCommand.cs
@@ -21,7 +21,7 @@
 namespace Microsoft.Azure.Commands.Network
 {
     [Cmdlet(VerbsCommon.Add, "AzureRmApplicationGatewayBackendAddressPool"), OutputType(typeof(PSApplicationGateway))]
-    [CliCommandAlias("applicationgateway backendaddress pool add")]
+    [CliCommandAlias("network app gateway backend address pool add")]
     public class AddAzureApplicationGatewayBackendAddressPoolCommand : AzureApplicationGatewayBackendAddressPoolBase
     {
         [Parameter(

diff --git a/...licationGateway/BackendAddressPool/GetAzureApplicationGatewayBackendAddressPoolCommand.cs b/...licationGateway/BackendAddressPool/GetAzureApplicationGatewayBackendAddressPoolCommand.cs
@@ -21,7 +21,7 @@ namespace Microsoft.Azure.Commands.Network
 {
     [Cmdlet(VerbsCommon.Get, "AzureRmApplicationGatewayBackendAddressPool"),
         OutputType(typeof(PSApplicationGatewayBackendAddressPool), typeof(IEnumerable<PSApplicationGatewayBackendAddressPool>))]
-    [CliCommandAlias("applicationgateway backendaddress pool ls")]
+    [CliCommandAlias("network app gateway backend address pool ls")]
     public class GetAzureApplicationGatewayBackendAddressPoolCommand : NetworkBaseCmdlet
     {
         [Parameter(

diff --git a/...licationGateway/BackendAddressPool/NewAzureApplicationGatewayBackendAddressPoolCommand.cs b/...licationGateway/BackendAddressPool/NewAzureApplicationGatewayBackendAddressPoolCommand.cs
@@ -19,7 +19,7 @@
 namespace Microsoft.Azure.Commands.Network
 {
     [Cmdlet(VerbsCommon.New, "AzureRmApplicationGatewayBackendAddressPool"), OutputType(typeof(PSApplicationGatewayBackendAddressPool))]
-    [CliCommandAlias("applicationgateway backendaddress pool new")]
+    [CliCommandAlias("network app gateway backend address pool create")]
     public class NewAzureApplicationGatewayBackendAddressPoolCommand : AzureApplicationGatewayBackendAddressPoolBase
     {
         public override void ExecuteCmdlet()

diff --git a/...ationGateway/BackendAddressPool/RemoveAzureApplicationGatewayBackendAddressPoolCommand.cs b/...ationGateway/BackendAddressPool/RemoveAzureApplicationGatewayBackendAddressPoolCommand.cs
@@ -19,7 +19,7 @@
 namespace Microsoft.Azure.Commands.Network
 {
     [Cmdlet(VerbsCommon.Remove, "AzureRmApplicationGatewayBackendAddressPool"), OutputType(typeof(PSApplicationGatewayBackendAddressPool))]
-    [CliCommandAlias("applicationgateway backendaddress pool rm")]
+    [CliCommandAlias("network app gateway backend address pool rm")]
     public class RemoveAzureApplicationGatewayBackendAddressPoolCommand : NetworkBaseCmdlet
     {
         [Parameter(

diff --git a/...licationGateway/BackendAddressPool/SetAzureApplicationGatewayBackendAddressPoolCommand.cs b/...licationGateway/BackendAddressPool/SetAzureApplicationGatewayBackendAddressPoolCommand.cs
@@ -21,7 +21,7 @@
 namespace Microsoft.Azure.Commands.Network
 {
     [Cmdlet(VerbsCommon.Set, "AzureRmApplicationGatewayBackendAddressPool"), OutputType(typeof(PSApplicationGateway))]
-    [CliCommandAlias("applicationgateway backendaddress pool set")]
+    [CliCommandAlias("network app gateway backend address pool set")]
     public class SetAzureApplicationGatewayBackendAddressPoolCommand : AzureApplicationGatewayBackendAddressPoolBase
     {
         [Parameter(

diff --git a/...cationGateway/BackendHttpSettings/AddAzureApplicationGatewayBackendHttpSettingsCommand.cs b/...cationGateway/BackendHttpSettings/AddAzureApplicationGatewayBackendHttpSettingsCommand.cs
@@ -21,7 +21,7 @@
 namespace Microsoft.Azure.Commands.Network
 {
     [Cmdlet(VerbsCommon.Add, "AzureRmApplicationGatewayBackendHttpSettings"), OutputType(typeof(PSApplicationGateway))]
-    [CliCommandAlias("applicationgateway backend http settings add")]
+    [CliCommandAlias("network app gateway backend http settings add")]
     public class AddAzureApplicationGatewayBackendHttpSettingsCommand : AzureApplicationGatewayBackendHttpSettingsBase
     {
         [Parameter(

diff --git a/...cationGateway/BackendHttpSettings/GetAzureApplicationGatewayBackendHttpSettingsCommand.cs b/...cationGateway/BackendHttpSettings/GetAzureApplicationGatewayBackendHttpSettingsCommand.cs
@@ -21,7 +21,7 @@ namespace Microsoft.Azure.Commands.Network
 {
     [Cmdlet(VerbsCommon.Get, "AzureRmApplicationGatewayBackendHttpSettings"),
         OutputType(typeof(PSApplicationGatewayBackendHttpSettings), typeof(IEnumerable<PSApplicationGatewayBackendHttpSettings>))]
-    [CliCommandAlias("applicationgateway backend http settings ls")]
+    [CliCommandAlias("network app gateway backend http settings ls")]
     public class GetAzureApplicationGatewayBackendHttpSettings : NetworkBaseCmdlet
     {
         [Parameter(

diff --git a/...cationGateway/BackendHttpSettings/NewAzureApplicationGatewayBackendHttpSettingsCommand.cs b/...cationGateway/BackendHttpSettings/NewAzureApplicationGatewayBackendHttpSettingsCommand.cs
@@ -19,7 +19,7 @@
 namespace Microsoft.Azure.Commands.Network
 {
     [Cmdlet(VerbsCommon.New, "AzureRmApplicationGatewayBackendHttpSettings"), OutputType(typeof(PSApplicationGatewayBackendHttpSettings))]
-    [CliCommandAlias("applicationgateway backend http settings new")]
+    [CliCommandAlias("network app gateway backend http settings create")]
     public class NewAzureApplicationGatewayBackendHttpSettingsCommand : AzureApplicationGatewayBackendHttpSettingsBase
     {
         public override void ExecuteCmdlet()

diff --git a/...ionGateway/BackendHttpSettings/RemoveAzureApplicationGatewayBackendHttpSettingsCommand.cs b/...ionGateway/BackendHttpSettings/RemoveAzureApplicationGatewayBackendHttpSettingsCommand.cs
@@ -19,7 +19,7 @@
 namespace Microsoft.Azure.Commands.Network
 {
     [Cmdlet(VerbsCommon.Remove, "AzureRmApplicationGatewayBackendHttpSettings"), OutputType(typeof(PSApplicationGateway))]
-    [CliCommandAlias("applicationgateway backend http settings rm")]
+    [CliCommandAlias("network app gateway backend http settings rm")]
     public class RemoveAzureApplicationGatewayBackendHttpSettingsCommand : NetworkBaseCmdlet
     {
         [Parameter(

diff --git a/...cationGateway/BackendHttpSettings/SetAzureApplicationGatewayBackendHttpSettingsCommand.cs b/...cationGateway/BackendHttpSettings/SetAzureApplicationGatewayBackendHttpSettingsCommand.cs
@@ -21,7 +21,7 @@
 namespace Microsoft.Azure.Commands.Network
 {
     [Cmdlet(VerbsCommon.Set, "AzureRmApplicationGatewayBackendHttpSettings"), OutputType(typeof(PSApplicationGateway))]
-    [CliCommandAlias("applicationgateway backend http settings set")]
+    [CliCommandAlias("network app gateway backend http settings set")]
     public class SetAzureApplicationGatewayBackendHttpSettingsCommand : AzureApplicationGatewayBackendHttpSettingsBase
     {
         [Parameter(

diff --git a/...ationGateway/FrontendIPConfiguration/AddAzureApplicationGatewayFrontendIPConfigCommand.cs b/...ationGateway/FrontendIPConfiguration/AddAzureApplicationGatewayFrontendIPConfigCommand.cs
@@ -20,7 +20,7 @@
 namespace Microsoft.Azure.Commands.Network
 {
     [Cmdlet(VerbsCommon.Add, "AzureRmApplicationGatewayFrontendIPConfig"), OutputType(typeof(PSApplicationGateway))]
-    [CliCommandAlias("applicationgateway frontend port add")]
+    [CliCommandAlias("network app gateway frontend ipconfig add")]
     public class AddAzureApplicationGatewayFrontendIPConfigCommand : AzureApplicationGatewayFrontendIPConfigBase
     {
         [Parameter(

diff --git a/...ationGateway/FrontendIPConfiguration/GetAzureApplicationGatewayFrontendIPConfigCommand.cs b/...ationGateway/FrontendIPConfiguration/GetAzureApplicationGatewayFrontendIPConfigCommand.cs
@@ -21,7 +21,7 @@ namespace Microsoft.Azure.Commands.Network
 {
     [Cmdlet(VerbsCommon.Get, "AzureRmApplicationGatewayFrontendIPConfig"),
         OutputType(typeof(PSApplicationGatewayFrontendIPConfiguration), typeof(IEnumerable<PSApplicationGatewayFrontendIPConfiguration>))]
-    [CliCommandAlias("applicationgateway frontend port ls")]
+    [CliCommandAlias("network app gateway frontend ipconfig ls")]
     public class GetAzureApplicationGatewayFrontendIPConfigCommand : NetworkBaseCmdlet
     {
         [Parameter(

diff --git a/...ationGateway/FrontendIPConfiguration/NewAzureApplicationGatewayFrontendIPConfigCommand.cs b/...ationGateway/FrontendIPConfiguration/NewAzureApplicationGatewayFrontendIPConfigCommand.cs
@@ -18,7 +18,7 @@
 namespace Microsoft.Azure.Commands.Network
 {
     [Cmdlet(VerbsCommon.New, "AzureRmApplicationGatewayFrontendIPConfig"), OutputType(typeof(PSApplicationGatewayFrontendIPConfiguration))]
-    [CliCommandAlias("applicationgateway frontend port new")]
+    [CliCommandAlias("network app gateway frontend ipconfig create")]
     public class NewAzureApplicationGatewayFrontendIPConfigCommand : AzureApplicationGatewayFrontendIPConfigBase
     {
         public override void ExecuteCmdlet()

diff --git a/...onGateway/FrontendIPConfiguration/RemoveAzureApplicationGatewayFrontendIPConfigCommand.cs b/...onGateway/FrontendIPConfiguration/RemoveAzureApplicationGatewayFrontendIPConfigCommand.cs
@@ -19,7 +19,7 @@
 namespace Microsoft.Azure.Commands.Network
 {
     [Cmdlet(VerbsCommon.Remove, "AzureRmApplicationGatewayFrontendIPConfig"), OutputType(typeof(PSApplicationGateway))]
-    [CliCommandAlias("applicationgateway frontend port rm")]
+    [CliCommandAlias("network app gateway frontend ipconfig rm")]
     public class RemoveAzureApplicationGatewayFrontendIPConfigCommand : NetworkBaseCmdlet
     {
         [Parameter(

diff --git a/...ationGateway/FrontendIPConfiguration/SetAzureApplicationGatewayFrontendIPConfigCommand.cs b/...ationGateway/FrontendIPConfiguration/SetAzureApplicationGatewayFrontendIPConfigCommand.cs
@@ -20,7 +20,7 @@
 namespace Microsoft.Azure.Commands.Network
 {
     [Cmdlet(VerbsCommon.Set, "AzureRmApplicationGatewayFrontendIPConfig"), OutputType(typeof(PSApplicationGateway))]
-    [CliCommandAlias("applicationgateway frontend port set")]
+    [CliCommandAlias("network app gateway frontend ipconfig set")]
     public class SetAzureApplicationGatewayFrontendIPConfigCommand : AzureApplicationGatewayFrontendIPConfigBase
     {
         [Parameter(

diff --git a/....Network/ApplicationGateway/FrontendPort/AddAzureApplicationGatewayFrontendPortCommand.cs b/....Network/ApplicationGateway/FrontendPort/AddAzureApplicationGatewayFrontendPortCommand.cs
@@ -21,7 +21,7 @@
 namespace Microsoft.Azure.Commands.Network
 {
     [Cmdlet(VerbsCommon.Add, "AzureRmApplicationGatewayFrontendPort"), OutputType(typeof(PSApplicationGateway))]
-    [CliCommandAlias("applicationgateway frontendipconfig add")]
+    [CliCommandAlias("network app gateway frontend port add")]
     public class AddAzureApplicationGatewayFrontendPortCommand : AzureApplicationGatewayFrontendPortBase
     {
         [Parameter(

diff --git a/....Network/ApplicationGateway/FrontendPort/GetAzureApplicationGatewayFrontendPortCommand.cs b/....Network/ApplicationGateway/FrontendPort/GetAzureApplicationGatewayFrontendPortCommand.cs
@@ -21,7 +21,7 @@ namespace Microsoft.Azure.Commands.Network
 {
     [Cmdlet(VerbsCommon.Get, "AzureRmApplicationGatewayFrontendPort"), 
         OutputType(typeof(PSApplicationGatewayFrontendPort), typeof(IEnumerable<PSApplicationGatewayFrontendPort>))]
-    [CliCommandAlias("applicationgateway frontendipconfig ls")]
+    [CliCommandAlias("network app gateway frontend port ls")]
     public class GetAzureApplicationGatewayFrontendPortCommand : NetworkBaseCmdlet
     {
         [Parameter(

diff --git a/....Network/ApplicationGateway/FrontendPort/NewAzureApplicationGatewayFrontendPortCommand.cs b/....Network/ApplicationGateway/FrontendPort/NewAzureApplicationGatewayFrontendPortCommand.cs
@@ -19,7 +19,7 @@
 namespace Microsoft.Azure.Commands.Network
 {
     [Cmdlet(VerbsCommon.New, "AzureRmApplicationGatewayFrontendPort"), OutputType(typeof(PSApplicationGatewayFrontendPort))]
-    [CliCommandAlias("applicationgateway frontendipconfig new")]
+    [CliCommandAlias("network app gateway frontend port create")]
     public class NewAzureApplicationGatewayFrontendPortCommand : AzureApplicationGatewayFrontendPortBase
     {
         public override void ExecuteCmdlet()

diff --git a/...twork/ApplicationGateway/FrontendPort/RemoveAzureApplicationGatewayFrontendPortCommand.cs b/...twork/ApplicationGateway/FrontendPort/RemoveAzureApplicationGatewayFrontendPortCommand.cs
@@ -19,7 +19,7 @@
 namespace Microsoft.Azure.Commands.Network
 {
     [Cmdlet(VerbsCommon.Remove, "AzureRmApplicationGatewayFrontendPort"), OutputType(typeof(PSApplicationGateway))]
-    [CliCommandAlias("applicationgateway frontendipconfig rm")]
+    [CliCommandAlias("network app gateway frontend port rm")]
     public class RemoveAzureApplicationGatewayFrontendPortCommand : NetworkBaseCmdlet
     {
         [Parameter(

diff --git a/....Network/ApplicationGateway/FrontendPort/SetAzureApplicationGatewayFrontendPortCommand.cs b/....Network/ApplicationGateway/FrontendPort/SetAzureApplicationGatewayFrontendPortCommand.cs
@@ -21,7 +21,7 @@
 namespace Microsoft.Azure.Commands.Network
 {
     [Cmdlet(VerbsCommon.Set, "AzureRmApplicationGatewayFrontendPort"), OutputType(typeof(PSApplicationGateway))]
-    [CliCommandAlias("applicationgateway frontendipconfig set")]
+    [CliCommandAlias("network app gateway frontend port set")]
     public class SetAzureApplicationGatewayFrontendPortCommand : AzureApplicationGatewayFrontendPortBase
     {
 

diff --git a/...icationGateway/GatewayIPConfiguration/AddAzureApplicationGatewayIPConfigurationCommand.cs b/...icationGateway/GatewayIPConfiguration/AddAzureApplicationGatewayIPConfigurationCommand.cs
@@ -21,7 +21,7 @@
 namespace Microsoft.Azure.Commands.Network
 {
     [Cmdlet(VerbsCommon.Add, "AzureRmApplicationGatewayIPConfiguration"), OutputType(typeof(PSApplicationGateway))]
-    [CliCommandAlias("applicationgateway ipconfiguration add")]
+    [CliCommandAlias("network app gateway ipconfig add")]
     public class AddAzureApplicationGatewayIPConfigurationCommand : AzureApplicationGatewayIPConfigurationBase
     {
         [Parameter(

diff --git a/...icationGateway/GatewayIPConfiguration/GetAzureApplicationGatewayIPConfigurationCommand.cs b/...icationGateway/GatewayIPConfiguration/GetAzureApplicationGatewayIPConfigurationCommand.cs
@@ -21,7 +21,7 @@ namespace Microsoft.Azure.Commands.Network
 {
     [Cmdlet(VerbsCommon.Get, "AzureRmApplicationGatewayIPConfiguration"),
         OutputType(typeof(PSApplicationGatewayIPConfiguration), typeof(IEnumerable<PSApplicationGatewayIPConfiguration>))]
-    [CliCommandAlias("applicationgateway ipconfiguration ls")]
+    [CliCommandAlias("network app gateway ipconfig ls")]
     public class GetAzureApplicationGatewayIPConfigurationCommand : NetworkBaseCmdlet
     {
         [Parameter(

diff --git a/...icationGateway/GatewayIPConfiguration/NewAzureApplicationGatewayIPConfigurationCommand.cs b/...icationGateway/GatewayIPConfiguration/NewAzureApplicationGatewayIPConfigurationCommand.cs
@@ -19,7 +19,7 @@
 namespace Microsoft.Azure.Commands.Network
 {
     [Cmdlet(VerbsCommon.New, "AzureRmApplicationGatewayIPConfiguration"), OutputType(typeof(PSApplicationGatewayIPConfiguration))]
-    [CliCommandAlias("applicationgateway ipconfiguration new")]
+    [CliCommandAlias("network app gateway ipconfig create")]
     public class NewAzureApplicationGatewayIPConfigurationCommand : AzureApplicationGatewayIPConfigurationBase
     {
         public override void ExecuteCmdlet()

diff --git a/...tionGateway/GatewayIPConfiguration/RemoveAzureApplicationGatewayIPConfigurationCommand.cs b/...tionGateway/GatewayIPConfiguration/RemoveAzureApplicationGatewayIPConfigurationCommand.cs
@@ -19,7 +19,7 @@
 namespace Microsoft.Azure.Commands.Network
 {
     [Cmdlet(VerbsCommon.Remove, "AzureRmApplicationGatewayIPConfiguration"), OutputType(typeof(PSApplicationGateway))]
-    [CliCommandAlias("applicationgateway ipconfiguration rm")]
+    [CliCommandAlias("network app gateway ipconfig rm")]
     public class RemoveAzureApplicationGatewayIPConfigurationCommand : NetworkBaseCmdlet
     {
         [Parameter(

diff --git a/...icationGateway/GatewayIPConfiguration/SetAzureApplicationGatewayIPConfigurationCommand.cs b/...icationGateway/GatewayIPConfiguration/SetAzureApplicationGatewayIPConfigurationCommand.cs
@@ -21,7 +21,7 @@
 namespace Microsoft.Azure.Commands.Network
 {
     [Cmdlet(VerbsCommon.Set, "AzureRmApplicationGatewayIPConfiguration"), OutputType(typeof(PSApplicationGateway))]
-    [CliCommandAlias("applicationgateway ipconfiguration set")]
+    [CliCommandAlias("network app gateway ipconfig set")]
     public class SetAzureApplicationGatewayIPConfigurationCommand : AzureApplicationGatewayIPConfigurationBase
     {
         [Parameter(

diff --git a/.../Microsoft.Azure.Commands.Network/ApplicationGateway/GetAzureApplicationGatewayCommand.cs b/.../Microsoft.Azure.Commands.Network/ApplicationGateway/GetAzureApplicationGatewayCommand.cs
@@ -21,7 +21,7 @@
 namespace Microsoft.Azure.Commands.Network
 {
     [Cmdlet(VerbsCommon.Get, "AzureRmApplicationGateway"), OutputType(typeof(PSApplicationGateway), typeof(IEnumerable<PSApplicationGateway>))]
-    [CliCommandAlias("applicationgateway ls")]
+    [CliCommandAlias("network app gateway ls")]
     public class GetAzureApplicationGatewayCommand : ApplicationGatewayBaseCmdlet
     {
         [Alias("ResourceName")]

diff --git a/....Network/ApplicationGateway/HttpListener/AddAzureApplicationGatewayHttpListenerCommand.cs b/....Network/ApplicationGateway/HttpListener/AddAzureApplicationGatewayHttpListenerCommand.cs
@@ -21,7 +21,7 @@
 namespace Microsoft.Azure.Commands.Network
 {
     [Cmdlet(VerbsCommon.Add, "AzureRmApplicationGatewayHttpListener"), OutputType(typeof(PSApplicationGateway))]
-    [CliCommandAlias("applicationgateway httplistener add")]
+    [CliCommandAlias("network app gateway http listener add")]
     public class AddAzureApplicationGatewayHttpListenerCommand : AzureApplicationGatewayHttpListenerBase
     {
         [Parameter(

diff --git a/....Network/ApplicationGateway/HttpListener/GetAzureApplicationGatewayHttpListenerCommand.cs b/....Network/ApplicationGateway/HttpListener/GetAzureApplicationGatewayHttpListenerCommand.cs
@@ -21,7 +21,7 @@ namespace Microsoft.Azure.Commands.Network
 {
     [Cmdlet(VerbsCommon.Get, "AzureRmApplicationGatewayHttpListener"), 
         OutputType(typeof(PSApplicationGatewayHttpListener), typeof(IEnumerable<PSApplicationGatewayHttpListener>))]
-    [CliCommandAlias("applicationgateway httplistener ls")]
+    [CliCommandAlias("network app gateway http listener ls")]
     public class GetAzureApplicationGatewayHttpListenerCommand : NetworkBaseCmdlet
     {
         [Parameter(

diff --git a/....Network/ApplicationGateway/HttpListener/NewAzureApplicationGatewayHttpListenerCommand.cs b/....Network/ApplicationGateway/HttpListener/NewAzureApplicationGatewayHttpListenerCommand.cs
@@ -19,7 +19,7 @@
 namespace Microsoft.Azure.Commands.Network
 {
     [Cmdlet(VerbsCommon.New, "AzureRmApplicationGatewayHttpListener"), OutputType(typeof(PSApplicationGatewayHttpListener))]
-    [CliCommandAlias("applicationgateway httplistener new")]
+    [CliCommandAlias("network app gateway http listener create")]
     public class NewAzureApplicationGatewayHttpListenerCommand : AzureApplicationGatewayHttpListenerBase
     {
         public override void ExecuteCmdlet()

diff --git a/...twork/ApplicationGateway/HttpListener/RemoveAzureApplicationGatewayHttpListenerCommand.cs b/...twork/ApplicationGateway/HttpListener/RemoveAzureApplicationGatewayHttpListenerCommand.cs
@@ -19,7 +19,7 @@
 namespace Microsoft.Azure.Commands.Network
 {
     [Cmdlet(VerbsCommon.Remove, "AzureRmApplicationGatewayHttpListener"), OutputType(typeof(PSApplicationGatewayHttpListener))]
-    [CliCommandAlias("applicationgateway httplistener rm")]
+    [CliCommandAlias("network app gateway http listener rm")]
     public class RemoveAzureApplicationGatewayHttpListenerCommand : NetworkBaseCmdlet
     {
         [Parameter(

diff --git a/....Network/ApplicationGateway/HttpListener/SetAzureApplicationGatewayHttpListenerCommand.cs b/....Network/ApplicationGateway/HttpListener/SetAzureApplicationGatewayHttpListenerCommand.cs
@@ -21,7 +21,7 @@
 namespace Microsoft.Azure.Commands.Network
 {
     [Cmdlet(VerbsCommon.Set, "AzureRmApplicationGatewayHttpListener"), OutputType(typeof(PSApplicationGateway))]
-    [CliCommandAlias("applicationgateway httplistener set")]
+    [CliCommandAlias("network app gateway http listener set")]
     public class SetAzureApplicationGatewayHttpListenerCommand : AzureApplicationGatewayHttpListenerBase
     {
         [Parameter(

diff --git a/.../Microsoft.Azure.Commands.Network/ApplicationGateway/NewAzureApplicationGatewayCommand.cs b/.../Microsoft.Azure.Commands.Network/ApplicationGateway/NewAzureApplicationGatewayCommand.cs
@@ -24,7 +24,7 @@
 namespace Microsoft.Azure.Commands.Network
 {
     [Cmdlet(VerbsCommon.New, "AzureRmApplicationGateway"), OutputType(typeof(PSApplicationGateway))]
-    [CliCommandAlias("applicationgateway new")]
+    [CliCommandAlias("network app gateway create")]
     public class NewAzureApplicationGatewayCommand : ApplicationGatewayBaseCmdlet
     {
         [Alias("ResourceName")]