Skip to content

Commit 69728ec

Browse files
gandhinirajgandhiniraj
committed
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
2 parents e8d13a2 + 9826270 commit 69728ec

File tree

318 files changed

+43851
-19274
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

318 files changed

+43851
-19274
lines changed

‎ChangeLog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 2016.09.16 version 2.2.0
2+
* Network
3+
- New switch parameter added for network interface to enable/Disable accelerated networking -New-AzureRmNetworkInterface -EnableAcceleratedNetworking
4+
15
## 2016.09.08 version 2.1.0
26
* Compute
37
* Add support for querying encryption status from the AzureDiskEncryptionForLinux extension

‎build.proj

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,11 @@
5858
<StaticAnalysis Include=".\tools\StaticAnalysis\StaticAnalysis.sln" />
5959
</ItemGroup>
6060

61+
<!-- Tasks -->
62+
<UsingTask TaskName="ValidateStrongNameSignatureTask" AssemblyFile="$(LibraryToolsFolder)\Microsoft.Azure.Build.Tasks.dll" />
63+
<UsingTask TaskName="FilterOutAutoRestLibraries" AssemblyFile="$(LibraryToolsFolder)\Microsoft.Azure.Build.Tasks.dll" />
64+
<UsingTask TaskName="DebugTask" AssemblyFile="$(LibraryToolsFolder)\Microsoft.Azure.Build.Tasks.dll" />
65+
6166
<!--
6267
CI build related
6368
-->
@@ -143,7 +148,7 @@
143148
<Exec Command="$(NuGetCommand) restore %(CmdletSolutionsToBuild.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetRestorePackageSetting)"
144149
ContinueOnError="false" />
145150
<!-- Restore packages for static analysis-->
146-
<Exec Command="$(NuGetCommand) restore %(StaticAnalysis.FullPath) $(NuGetRestoreConfigSwitch)"
151+
<Exec Command="$(NuGetCommand) restore %(StaticAnalysis.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetRestorePackageSetting)"
147152
ContinueOnError="false" />
148153

149154
<!--Restore the xunit runner needed to run unit tests-->
@@ -161,7 +166,7 @@
161166
Properties="Configuration=$(Configuration);Platform=Any CPU"
162167
BuildInParallel="$(BuildInParallel)"
163168
ContinueOnError="false" />
164-
169+
165170
<CallTarget Targets="CodeSignBinaries" Condition=" '$(CodeSign)' == 'true' " />
166171

167172
<MSBuild
@@ -193,9 +198,6 @@
193198
Targets="Build" Properties="Configuration=Debug;Platform=AnyCPU" />
194199
</Target>
195200

196-
<UsingTask TaskName="ValidateStrongNameSignatureTask" AssemblyFile="$(LibraryToolsFolder)\Microsoft.Azure.Build.Tasks.dll" />
197-
<UsingTask TaskName="FilterOutAutoRestLibraries" AssemblyFile="$(LibraryToolsFolder)\Microsoft.Azure.Build.Tasks.dll" />
198-
199201
<Target Name="CodeSignBinaries">
200202
<PropertyGroup>
201203
<!--public token associated with MSSharedLibKey.snk-->
@@ -221,7 +223,7 @@
221223

222224
<Message Importance="high" Text="$(LibrarySourceFolder)\Package\$(Configuration) does not contains any files to sign. Code sign will skip."
223225
Condition="'@(DelaySignedAssembliesToSign)' == ''" />
224-
226+
225227
<ValidateStrongNameSignatureTask
226228
WindowsSdkPath="$(WindowsSdkPath)"
227229
Assembly="%(DelaySignedAssembliesToSign.Identity)"
@@ -259,7 +261,7 @@
259261
ExpectedDelaySigned="false"
260262
ContinueOnError="false"
261263
Condition="!$(DelaySign) and '@(DelaySignedAssembliesToSign)' != ''"/>
262-
264+
263265
<Exec Command="$(PowerShellCommand) -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\CheckStrongNameSignature.ps1 &quot;"/>
264266

265267
<!-- Copying signed shortcut back -->

‎src/ResourceManager/ApiManagement/AzureRM.ApiManagement.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ PrivateData = @{
8989
PSData = @{
9090

9191
# Tags applied to this module. These help with module discovery in online galleries.
92-
# Tags = @()
92+
Tags = @("Azure", "ResourceManager", "ARM", "ApiManagement")
9393

9494
# A URL to the license for this module.
9595
LicenseUri = 'https://raw.githubusercontent.com/Azure/azure-powershell/dev/LICENSE.txt'

‎src/ResourceManager/Automation/AzureRM.Automation.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ PrivateData = @{
8888
PSData = @{
8989

9090
# Tags applied to this module. These help with module discovery in online galleries.
91-
# Tags = @()
91+
Tags = @("Azure", "ResourceManager", "ARM", "Automation")
9292

9393
# A URL to the license for this module.
9494
LicenseUri = 'https://raw.githubusercontent.com/Azure/azure-powershell/dev/LICENSE.txt'

‎src/ResourceManager/Automation/Commands.Automation.Test/UnitTests/RegisterAzureAutomationScheduledRunbookTest.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,10 @@ public void RegisterAzureAutomationScheduledRunbookSuccessfull()
5050
string accountName = "automation";
5151
string runbookName = "runbook";
5252
string scheduleName = "schedule";
53+
string runOn = "hybridWorkerGroup";
5354

5455
this.mockAutomationClient.Setup(
55-
f => f.RegisterScheduledRunbook(resourceGroupName, accountName, runbookName, scheduleName, null));
56+
f => f.RegisterScheduledRunbook(resourceGroupName, accountName, runbookName, scheduleName, null, runOn));
5657

5758
// Test
5859
this.cmdlet.ResourceGroupName = resourceGroupName;
@@ -62,7 +63,7 @@ public void RegisterAzureAutomationScheduledRunbookSuccessfull()
6263
this.cmdlet.ExecuteCmdlet();
6364

6465
// Assert
65-
this.mockAutomationClient.Verify(f => f.RegisterScheduledRunbook(resourceGroupName, accountName, runbookName, scheduleName, null), Times.Once());
66+
this.mockAutomationClient.Verify(f => f.RegisterScheduledRunbook(resourceGroupName, accountName, runbookName, scheduleName, null, runOn), Times.Once());
6667
}
6768
}
6869
}

‎src/ResourceManager/Automation/Commands.Automation/Cmdlet/RegisterAzureAutomationScheduledRunbook.cs

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,23 @@ public class RegisterAzureAutomationScheduledRunbook : AzureAutomationBaseCmdlet
5151
HelpMessage = "The runbook parameters.")]
5252
public IDictionary Parameters { get; set; }
5353

54+
/// <summary>
55+
/// Gets or sets the optional hybrid agent friendly name upon which the runbook should be executed.
56+
/// </summary>
57+
[Alias("HybridWorker")]
58+
[Parameter(ParameterSetName = AutomationCmdletParameterSets.ByRunbookNameAndScheduleName, Mandatory = false, ValueFromPipelineByPropertyName = true,
59+
HelpMessage = "The name of the hybrid runbook worker group.")]
60+
public string RunOn { get; set; }
61+
5462
/// <summary>
5563
/// Execute this cmdlet.
5664
/// </summary>
5765
[PermissionSet(SecurityAction.Demand, Name = "FullTrust")]
5866
protected override void AutomationProcessRecord()
59-
{
60-
JobSchedule jobSchedule;
61-
62-
jobSchedule = this.AutomationClient.RegisterScheduledRunbook(
63-
this.ResourceGroupName, this.AutomationAccountName, this.RunbookName, this.ScheduleName, this.Parameters);
64-
67+
{
68+
var jobSchedule = this.AutomationClient.RegisterScheduledRunbook(
69+
this.ResourceGroupName, this.AutomationAccountName, this.RunbookName, this.ScheduleName, this.Parameters, this.RunOn);
70+
6571
this.WriteObject(jobSchedule);
6672
}
6773
}

‎src/ResourceManager/Automation/Commands.Automation/Common/AutomationClient.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1507,7 +1507,7 @@ public IEnumerable<JobSchedule> ListJobSchedulesByScheduleName(string resourceGr
15071507
}
15081508

15091509
public JobSchedule RegisterScheduledRunbook(string resourceGroupName, string automationAccountName, string runbookName,
1510-
string scheduleName, IDictionary parameters)
1510+
string scheduleName, IDictionary parameters, string runOn)
15111511
{
15121512
var processedParameters = this.ProcessRunbookParameters(resourceGroupName, automationAccountName, runbookName, parameters);
15131513
var sdkJobSchedule = this.automationManagementClient.JobSchedules.Create(
@@ -1519,7 +1519,8 @@ public JobSchedule RegisterScheduledRunbook(string resourceGroupName, string aut
15191519
{
15201520
Schedule = new ScheduleAssociationProperty { Name = scheduleName },
15211521
Runbook = new RunbookAssociationProperty { Name = runbookName },
1522-
Parameters = processedParameters
1522+
Parameters = processedParameters,
1523+
RunOn = runOn
15231524
}
15241525
}).JobSchedule;
15251526

‎src/ResourceManager/Automation/Commands.Automation/Common/IAutomationClient.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,8 +291,8 @@ IEnumerable<JobStream> GetJobStream(string resourceGroupName, string automationA
291291
IEnumerable<JobSchedule> ListJobSchedulesByRunbookName(string resourceGroupName, string automationAccountName, string runbookName);
292292

293293
IEnumerable<JobSchedule> ListJobSchedulesByScheduleName(string resourceGroupName, string automationAccountName, string scheduleName);
294-
295-
JobSchedule RegisterScheduledRunbook(string resourceGroupName, string automationAccountName, string runbookName, string scheduleName, IDictionary parameters);
294+
295+
JobSchedule RegisterScheduledRunbook(string resourceGroupName, string automationAccountName, string runbookName, string scheduleName, IDictionary parameters, string RunOn);
296296

297297
void UnregisterScheduledRunbook(string resourceGroupName, string automationAccountName, Guid jobScheduleId);
298298

‎src/ResourceManager/Automation/Commands.Automation/Model/JobSchedule.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ public JobSchedule(string resourceGroupName, string automationAccountName, Azure
4646
this.RunbookName = jobSchedule.Properties.Runbook.Name;
4747
this.ScheduleName = jobSchedule.Properties.Schedule.Name;
4848
this.Parameters = new Hashtable(StringComparer.InvariantCultureIgnoreCase);
49+
this.RunOn = jobSchedule.Properties.RunOn;
4950
foreach (var kvp in jobSchedule.Properties.Parameters.Where(kvp => 0 != String.Compare(kvp.Key, Constants.JobStartedByParameterName, CultureInfo.InvariantCulture,
5051
CompareOptions.IgnoreCase)))
5152
{
@@ -65,6 +66,8 @@ public JobSchedule()
6566
/// </summary>
6667
public string ResourceGroupName { get; set; }
6768

69+
public string RunOn { get; set; }
70+
6871
/// <summary>
6972
/// Gets or sets the automation account name.
7073
/// </summary>

‎src/ResourceManager/AzureBackup/AzureRM.Backup.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ PrivateData = @{
9090
PSData = @{
9191

9292
# Tags applied to this module. These help with module discovery in online galleries.
93-
# Tags = @()
93+
Tags = @("Azure", "ResourceManager", "ARM", "Backup")
9494

9595
# A URL to the license for this module.
9696
LicenseUri = 'https://raw.githubusercontent.com/Azure/azure-powershell/dev/LICENSE.txt'

‎src/ResourceManager/AzureBatch/AzureRM.Batch.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ PrivateData = @{
9090
PSData = @{
9191

9292
# Tags applied to this module. These help with module discovery in online galleries.
93-
# Tags = @()
93+
Tags = @("Azure", "ResourceManager", "ARM", "Batch")
9494

9595
# A URL to the license for this module.
9696
LicenseUri = 'https://raw.githubusercontent.com/Azure/azure-powershell/dev/LICENSE.txt'

‎src/ResourceManager/AzureStackAdmin/AzureRM.AzureStackAdmin.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ PrivateData = @{
8686
PSData = @{
8787

8888
# Tags applied to this module. These help with module discovery in online galleries.
89-
# Tags = @()
89+
Tags = @("Azure", "ResourceManager", "ARM", "AzureStack")
9090

9191
# A URL to the license for this module.
9292
LicenseUri = 'https://raw.githubusercontent.com/Azure/azure-powershell/dev/LICENSE.txt'

‎src/ResourceManager/AzureStackStorage/AzureRM.AzureStackStorage.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ PrivateData = @{
8888
PSData = @{
8989

9090
# Tags applied to this module. These help with module discovery in online galleries.
91-
# Tags = @()
91+
Tags = @("Azure", "ResourceManager", "ARM", "AzureStack")
9292

9393
# A URL to the license for this module.
9494
LicenseUri = 'https://raw.githubusercontent.com/Azure/azure-powershell/dev/LICENSE.txt'

‎src/ResourceManager/Cdn/AzureRM.Cdn.psd1

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,27 @@ ModuleList = @()
8383
FileList = @()
8484

8585
# Private data to pass to the module specified in ModuleToProcess
86-
PrivateData = ''
86+
PrivateData = @{
8787

88-
}
88+
PSData = @{
89+
90+
# Tags applied to this module. These help with module discovery in online galleries.
91+
Tags = @("Azure", "ResourceManager", "ARM", "CDN")
92+
93+
# A URL to the license for this module.
94+
LicenseUri = 'https://raw.githubusercontent.com/Azure/azure-powershell/dev/LICENSE.txt'
95+
96+
# A URL to the main website for this project.
97+
ProjectUri = 'https://github.com/Azure/azure-powershell'
98+
99+
# A URL to an icon representing this module.
100+
# IconUri = ''
101+
102+
# ReleaseNotes of this module
103+
ReleaseNotes = 'https://github.com/Azure/azure-powershell/blob/dev/ChangeLog.md'
104+
105+
} # End of PSData hashtable
106+
107+
} # End of PrivateData hashtable
108+
109+
}

‎src/ResourceManager/CognitiveServices/AzureRM.CognitiveServices.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ PrivateData = @{
9292
PSData = @{
9393

9494
# Tags applied to this module. These help with module discovery in online galleries.
95-
# Tags = @()
95+
Tags = @("Azure", "ResourceManager", "ARM", "CognitiveServices")
9696

9797
# A URL to the license for this module.
9898
LicenseUri = 'https://raw.githubusercontent.com/Azure/azure-powershell/dev/LICENSE.txt'

‎src/ResourceManager/Compute/AzureRM.Compute.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ PrivateData = @{
9494
PSData = @{
9595

9696
# Tags applied to this module. These help with module discovery in online galleries.
97-
# Tags = @()
97+
Tags = @("Azure", "ResourceManager", "ARM", "Compute", "IAAS", "VM", "VirtualMachine")
9898

9999
# A URL to the license for this module.
100100
LicenseUri = 'https://raw.githubusercontent.com/Azure/azure-powershell/dev/LICENSE.txt'

‎src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@
6767
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.13.0.4-prerelease\lib\net45\Microsoft.Azure.Management.Compute.dll</HintPath>
6868
<Private>True</Private>
6969
</Reference>
70-
<Reference Include="Microsoft.Azure.Management.Network, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
71-
<SpecificVersion>False</SpecificVersion>
72-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.6.1.1-preview\lib\net45\Microsoft.Azure.Management.Network.dll</HintPath>
70+
71+
<Reference Include="Microsoft.Azure.Management.Network, Version=7.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
72+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.7.1.0-preview\lib\net45\Microsoft.Azure.Management.Network.dll</HintPath>
7373
<Private>True</Private>
7474
</Reference>
7575
<Reference Include="Microsoft.Azure.Management.Storage, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -398,6 +398,12 @@
398398
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineNetworkInterfaceTests\TestVirtualMachineSingleNetworkInterface.json">
399399
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
400400
</None>
401+
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineNetworkInterfaceTests\TestSingleNetworkInterfaceWithAcceleratedNetworking.json">
402+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
403+
</None>
404+
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineNetworkInterfaceTests\TestVMNicWithAcceleratedNetworkingValidations.json">
405+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
406+
</None>
401407
<None Include="SessionRecords\Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineProfileTests\TestVirtualMachineProfileWithoutAUC.json">
402408
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
403409
</None>

‎src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineNetworkInterfaceTests.cs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,19 @@ public void TestEffectiveRoutesAndNsg()
5959
{
6060
ComputeTestController.NewInstance.RunPsTest("Test-EffectiveRoutesAndNsg");
6161
}
62+
63+
[Fact]
64+
[Trait(Category.AcceptanceType, Category.CheckIn)]
65+
public void TestSingleNetworkInterfaceWithAcceleratedNetworking()
66+
{
67+
ComputeTestController.NewInstance.RunPsTest("Test-SingleNetworkInterfaceWithAcceleratedNetworking");
68+
}
69+
70+
[Fact]
71+
[Trait(Category.AcceptanceType, Category.CheckIn)]
72+
public void TestVMNicWithAcceleratedNetworkingValidations()
73+
{
74+
ComputeTestController.NewInstance.RunPsTest("Test-VMNicWithAcceleratedNetworkingValidations");
75+
}
6276
}
6377
}

0 commit comments

Comments
 (0)