Merge branch 'dev' of https://github.com/huangpf/azure-powershell into vmss

Author: huangpf

src/ResourceManager/Network/AzureRM.Network.psd1

@@ -1,90 +1,90 @@
-#  
-# Module manifest for module 'Microsoft.Azure.Commands.Network'  
-#  
-# Generated by: Microsoft Corporation  
-#  
+#
+# Module manifest for module 'Microsoft.Azure.Commands.Network'
+#
+# Generated by: Microsoft Corporation
+#
 # Generated on: 9/19/2015
-#  
-  
-@{  
-  
-# Version number of this module.  
-ModuleVersion = '0.10.0' 
-  
-# ID used to uniquely identify this module  
-GUID = 'eb75c732-e274-4a20-b502-e9958e63484a'  
-  
-# Author of this module  
-Author = 'Microsoft Corporation'  
-  
-# Company or vendor of this module  
-CompanyName = 'Microsoft Corporation'  
-  
-# Copyright statement for this module  
-Copyright = 'Microsoft Corporation. All rights reserved.'    
-  
-# Description of the functionality provided by this module  
-Description = 'Microsoft Azure PowerShell - Network service cmdlets for Azure Resource Manager'  
-  
-# Minimum version of the Windows PowerShell engine required by this module  
-PowerShellVersion = '3.0'  
-  
-# Name of the Windows PowerShell host required by this module  
-PowerShellHostName = ''  
-  
-# Minimum version of the Windows PowerShell host required by this module  
-PowerShellHostVersion = ''  
-  
-# Minimum version of the .NET Framework required by this module  
-DotNetFrameworkVersion = '4.0'  
-  
-# Minimum version of the common language runtime (CLR) required by this module  
-CLRVersion='4.0'  
-  
-# Processor architecture (None, X86, Amd64, IA64) required by this module  
-ProcessorArchitecture = 'None'  
-  
-# Modules that must be imported into the global environment prior to importing this module  
+#
+
+@{
+
+# Version number of this module.
+ModuleVersion = '0.10.1' 
+
+# ID used to uniquely identify this module
+GUID = 'eb75c732-e274-4a20-b502-e9958e63484a'
+
+# Author of this module
+Author = 'Microsoft Corporation'
+
+# Company or vendor of this module
+CompanyName = 'Microsoft Corporation'
+
+# Copyright statement for this module
+Copyright = 'Microsoft Corporation. All rights reserved.'
+
+# Description of the functionality provided by this module
+Description = 'Microsoft Azure PowerShell - Network service cmdlets for Azure Resource Manager'
+
+# Minimum version of the Windows PowerShell engine required by this module
+PowerShellVersion = '3.0'
+
+# Name of the Windows PowerShell host required by this module
+PowerShellHostName = ''
+
+# Minimum version of the Windows PowerShell host required by this module
+PowerShellHostVersion = ''
+
+# Minimum version of the .NET Framework required by this module
+DotNetFrameworkVersion = '4.0'
+
+# Minimum version of the common language runtime (CLR) required by this module
+CLRVersion='4.0'
+
+# Processor architecture (None, X86, Amd64, IA64) required by this module
+ProcessorArchitecture = 'None'
+
+# Modules that must be imported into the global environment prior to importing this module
 RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '0.10.0'})
-  
-# Assemblies that must be loaded prior to importing this module  
-RequiredAssemblies = @()  
-  
-# Script files (.ps1) that are run in the caller's environment prior to importing this module  
-ScriptsToProcess = @()  
-  
-# Type files (.ps1xml) to be loaded when importing this module  
+
+# Assemblies that must be loaded prior to importing this module
+RequiredAssemblies = @()
+
+# Script files (.ps1) that are run in the caller's environment prior to importing this module
+ScriptsToProcess = @()
+
+# Type files (.ps1xml) to be loaded when importing this module
 TypesToProcess = @()
-  
-# Format files (.ps1xml) to be loaded when importing this module  
+
+# Format files (.ps1xml) to be loaded when importing this module
 FormatsToProcess = @(
 	'.\Microsoft.Azure.Commands.Network.format.ps1xml'
 )
-  
-# Modules to import as nested modules of the module specified in ModuleToProcess  
-NestedModules = @(  
+
+# Modules to import as nested modules of the module specified in ModuleToProcess
+NestedModules = @(
     '.\Microsoft.Azure.Commands.Network.dll'
 )
-  
-# Functions to export from this module  
-FunctionsToExport = '*'  
-  
-# Cmdlets to export from this module  
-CmdletsToExport = '*'  
-  
-# Variables to export from this module  
-VariablesToExport = '*'  
-  
-# Aliases to export from this module  
+
+# Functions to export from this module
+FunctionsToExport = '*'
+
+# Cmdlets to export from this module
+CmdletsToExport = '*'
+
+# Variables to export from this module
+VariablesToExport = '*'
+
+# Aliases to export from this module
 AliasesToExport = @()
-  
-# List of all modules packaged with this module  
-ModuleList = @()  
-  
-# List of all files packaged with this module  
-FileList =  @()  
-  
-# Private data to pass to the module specified in ModuleToProcess  
-PrivateData = ''  
-
-} 
+
+# List of all modules packaged with this module
+ModuleList = @()
+
+# List of all files packaged with this module
+FileList =  @()
+
+# Private data to pass to the module specified in ModuleToProcess
+PrivateData = ''
+
+}

src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/Peering/AddAzureExpressRouteCircuitPeeringConfigCommand.cs

@@ -52,7 +52,6 @@ protected override void ProcessRecord()
             peering.PeeringType = this.PeeringType;
             peering.PrimaryPeerAddressPrefix = this.PrimaryPeerAddressPrefix;
             peering.SecondaryPeerAddressPrefix = this.SecondaryPeerAddressPrefix;
-            peering.AzureASN = this.AzureASN;
             peering.PeerASN = this.PeerASN;
             peering.VlanId = this.VlanId;
 

src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/Peering/AzureExpressRouteCircuitPeeringConfigBase.cs

@@ -44,12 +44,6 @@ public class AzureExpressRouteCircuitPeeringConfigBase : NetworkBaseCmdlet
         [ValidateNotNullOrEmpty]
         public int PeerASN { get; set; }
 
-        [Parameter(
-            Mandatory = false,
-            HelpMessage = "The AzureASN")]
-        [ValidateNotNullOrEmpty]
-        public int AzureASN { get; set; }
-
         [Parameter(
             Mandatory = true,
             HelpMessage = "The PrimaryPeerAddressPrefix")]

src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/Peering/NewAzureExpressRouteCircuitPeeringConfigCommand.cs

@@ -38,7 +38,6 @@ protected override void ProcessRecord()
             peering.PeeringType = this.PeeringType;
             peering.PrimaryPeerAddressPrefix = this.PrimaryPeerAddressPrefix;
             peering.SecondaryPeerAddressPrefix = this.SecondaryPeerAddressPrefix;
-            peering.AzureASN = this.AzureASN;
             peering.PeerASN = this.PeerASN;
             peering.VlanId = this.VlanId;
 

src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/Peering/SetAzureExpressRouteCircuitPeeringConfigCommand.cs

@@ -50,7 +50,6 @@ protected override void ProcessRecord()
             peering.PeeringType = this.PeeringType;
             peering.PrimaryPeerAddressPrefix = this.PrimaryPeerAddressPrefix;
             peering.SecondaryPeerAddressPrefix = this.SecondaryPeerAddressPrefix;
-            peering.AzureASN = this.AzureASN;
             peering.PeerASN = this.PeerASN;
             peering.VlanId = this.VlanId;
 

src/ResourceManager/Network/Commands.Network/ExpressRouteCircuit/SetAzureExpressRouteCircuitCommand.cs

@@ -41,12 +41,12 @@ protected override void ProcessRecord()
             }
 
             // Map to the sdk object
-            var erModel = Mapper.Map<MNM.ExpressRouteCircuit>(this.ExpressRouteCircuit);
-            erModel.Type = Microsoft.Azure.Commands.Network.Properties.Resources.ExpressRouteCircuitType;
-            erModel.Tags = TagsConversionHelper.CreateTagDictionary(this.ExpressRouteCircuit.Tag, validate: true);
+            var circuitModel = Mapper.Map<MNM.ExpressRouteCircuit>(this.ExpressRouteCircuit);
+            circuitModel.Type = Microsoft.Azure.Commands.Network.Properties.Resources.ExpressRouteCircuitType;
+            circuitModel.Tags = TagsConversionHelper.CreateTagDictionary(this.ExpressRouteCircuit.Tag, validate: true);
 
             // Execute the Create ExpressRouteCircuit call
-            this.ExpressRouteCircuitClient.CreateOrUpdate(this.ExpressRouteCircuit.ResourceGroupName, this.ExpressRouteCircuit.Name, erModel);
+            this.ExpressRouteCircuitClient.CreateOrUpdate(this.ExpressRouteCircuit.ResourceGroupName, this.ExpressRouteCircuit.Name, circuitModel);
 
             var getExpressRouteCircuit = this.GetExpressRouteCircuit(this.ExpressRouteCircuit.ResourceGroupName, this.ExpressRouteCircuit.Name);
             WriteObject(getExpressRouteCircuit);

src/ResourceManager/Network/Commands.Network/Microsoft.Azure.Commands.Network.dll-Help.psd1

@@ -9,7 +9,7 @@
 @{
 
 # Version number of this module.
-ModuleVersion = '0.9.10'
+ModuleVersion = '0.10.1'
 
 # ID used to uniquely identify this module
 GUID = 'B37DCEB6-F8A8-4C76-B1FC-9C35DFE08977'
@@ -21,7 +21,7 @@ Author = 'Microsoft Corporation'
 CompanyName = 'Microsoft Corporation'
 
 # Copyright statement for this module
-Copyright = 'Microsoft Corporation. All rights reserved.'  
+Copyright = 'Microsoft Corporation. All rights reserved.'
 
 # Description of the functionality provided by this module
 Description = ''

src/ResourceManager/Network/Commands.Network/Properties/AssemblyInfo.cs

@@ -25,10 +25,10 @@
 [assembly: ComVisible(false)]
 [assembly: CLSCompliant(false)]
 [assembly: Guid("be2ca022-590c-48ba-b465-9ab61d6e2ea0")]
-[assembly: AssemblyVersion(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyVersion)]
-[assembly: AssemblyFileVersion(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyFileVersion)]
+[assembly: AssemblyVersion("0.10.1")]
+[assembly: AssemblyFileVersion("0.10.1")]
 #if SIGN
 [assembly: InternalsVisibleTo("Microsoft.Azure.Commands.Network.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
 #else
 [assembly: InternalsVisibleTo("Microsoft.Azure.Commands.Network.Test")]
-#endif
+#endif

src/ResourceManager/Network/Commands.Network/VirtualNetworkGatewayConnection/NewAzureVirtualNetworkGatewayConnectionCommand.cs

@@ -24,7 +24,7 @@
 
 namespace Microsoft.Azure.Commands.Network
 {
-    [Cmdlet(VerbsCommon.New, "AzureRmVirtualNetworkGatewayConnection"), OutputType(typeof(PSVirtualNetworkGatewayConnection))]
+    [Cmdlet(VerbsCommon.New, "AzureRmVirtualNetworkGatewayConnection", DefaultParameterSetName = "SetByResource"), OutputType(typeof(PSVirtualNetworkGatewayConnection))]
     public class NewAzureVirtualNetworkGatewayConnectionCommand : VirtualNetworkGatewayConnectionBaseCmdlet
     {
         [Alias("ResourceName")]

src/ServiceManagement/RemoteApp/Commands.RemoteApp/TemplateImage/NewAzureRemoteAppTemplateImage.cs

@@ -249,8 +249,9 @@ private string GetAzureVmSasUri(string vmImageName)
             pageBlob = new CloudPageBlob(uri, credentials);
 
             accessPolicy.Permissions = SharedAccessBlobPermissions.Read;
-            accessPolicy.SharedAccessStartTime = DateTime.Now;
-            accessPolicy.SharedAccessExpiryTime = DateTime.Now.AddHours(12);
+            // Sometimes the clocks are 2-3 seconds fast and the SAS is not yet valid when the service tries to use it.
+            accessPolicy.SharedAccessStartTime = DateTime.UtcNow.AddMinutes(-5);
+            accessPolicy.SharedAccessExpiryTime = DateTime.UtcNow.AddHours(12);
 
             sas = pageBlob.GetSharedAccessSignature(accessPolicy);