Skip to content

Commit 6e206b4

Browse files
huangpfhuangpf
committed
Merge pull request #153 from huangpf/vmss
Vmss
2 parents 0e51aec + dcf6a7f commit 6e206b4

File tree

10 files changed

+831
-41
lines changed

10 files changed

+831
-41
lines changed

‎src/ServiceManagement/Common/Commands.ScenarioTest/Resources/ServiceManagement/ServiceManagementTests.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -422,16 +422,16 @@ function Run-AutoGeneratedServiceExtensionCmdletTests
422422
$p1 = New-AzureComputeArgumentList -MethodName HostedServiceAddExtension;
423423
$p1[0].Value = $svcName; #ServiceName
424424
$p1[1].Value = 'test'; #Id
425-
#PrivateConfiguration
425+
#PrivateConfiguration
426426
$p1[2].Value =
427427
@"
428428
<?xml version="1.0" encoding="UTF-8"?>
429429
<PrivateConfig>
430430
<Password>pstestuser</Password>
431431
</PrivateConfig>
432432
"@;
433-
$p1[3].Value = 'Microsoft.Windows.Azure.Extensions'; #ProviderNamespace
434-
#PublicConfiguration
433+
$p1[3].Value = 'Microsoft.Windows.Azure.Extensions'; #ProviderNamespace
434+
#PublicConfiguration
435435
$p1[4].Value =
436436
@"
437437
<?xml version="1.0" encoding="UTF-8"?>

‎src/ServiceManagement/Common/Commands.ScenarioTest/ServiceManagement/ScenarioTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public void RunAutoGeneratedVirtualMachineCmdletTests()
7272
this.RunPowerShellTest("Run-AutoGeneratedVirtualMachineCmdletTests");
7373
}
7474

75-
[Fact]
75+
[Fact(Skip = "TODO")]
7676
[Trait(Category.Service, Category.ServiceManagement)]
7777
[Trait(Category.AcceptanceType, Category.CheckIn)]
7878
[Trait(Category.AcceptanceType, Category.BVT)]

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Automation/RunCodeGeneration.ps1 renamed to ‎src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Automation/Invoke-CodeGeneration.ps1

File renamed without changes.

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Commands.ServiceManagement.Preview.csproj

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
<DebugType>full</DebugType>
2323
<Optimize>false</Optimize>
2424
<OutputPath>..\..\..\Package\Debug\ServiceManagement\Azure\Compute</OutputPath>
25-
<CrpDllPath>..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Compute</CrpDllPath>
2625
<DefineConstants>DEBUG;TRACE</DefineConstants>
2726
<ErrorReport>prompt</ErrorReport>
2827
<WarningLevel>4</WarningLevel>
@@ -198,7 +197,7 @@
198197
<None Include="Automation\Create-ParameterTree.ps1" />
199198
<None Include="Automation\Create-ParameterObject.ps1" />
200199
<None Include="Automation\Import-OperationFunction.ps1" />
201-
<None Include="Automation\RunCodeGeneration.ps1" />
200+
<None Include="Automation\Invoke-CodeGeneration.ps1" />
202201
<None Include="Automation\ConvertTo-Json.ps1" />
203202
<None Include="AzurePreview.psd1">
204203
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -256,7 +255,7 @@
256255
<Target Name="BuildGenerateRDFE">
257256
<PropertyGroup>
258257
<PowerShellExe Condition=" '$(PowerShellExe)'=='' ">%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe</PowerShellExe>
259-
<PSCodeGenScriptPath>".\Automation\RunCodeGeneration.ps1"</PSCodeGenScriptPath>
258+
<PSCodeGenScriptPath>".\Automation\Invoke-CodeGeneration.ps1"</PSCodeGenScriptPath>
260259
<PSCodeGenTargetFolder>$(OutputPath)</PSCodeGenTargetFolder>
261260
<ClientLibraryNamesSpace>"Microsoft.WindowsAzure.Management.Compute"</ClientLibraryNamesSpace>
262261
<BaseCmdletFullName>"Microsoft.WindowsAzure.Commands.Utilities.Common.ServiceManagementBaseCmdlet"</BaseCmdletFullName>
@@ -271,16 +270,16 @@
271270
<Target Name="BuildGenerateARM" DependsOnTargets="BuildGenerateRDFE">
272271
<PropertyGroup>
273272
<PowerShellExe Condition=" '$(PowerShellExe)'=='' ">%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe</PowerShellExe>
274-
<PSCodeGenScriptPath>".\Automation\RunCodeGeneration.ps1"</PSCodeGenScriptPath>
275-
<PSCodeGenTargetFolder>$(CrpDllPath)</PSCodeGenTargetFolder>
276-
<BaseCmdletFullName>"Microsoft.Azure.Commands.Compute.ComputeClientBaseCmdlet"</BaseCmdletFullName>
277-
<BaseCmdletClientName>"ComputeClient.ComputeManagementClient"</BaseCmdletClientName>
278-
<ARMClientLibraryNamesSpace>"Microsoft.Azure.Management.Compute"</ARMClientLibraryNamesSpace>
279-
<ARMGeneratedPSCodeFolder>..\..\..\ResourceManager\Compute\Commands.Compute</ARMGeneratedPSCodeFolder>
280-
<ARMCmdletFlavor>Verb</ARMCmdletFlavor>
281-
<CliCmdletFlavor>Verb</CliCmdletFlavor>
282-
<OperationNameFilter>"VirtualMachineScaleSets","VirtualMachineScaleSetVMs"</OperationNameFilter>
273+
<ScriptPath>".\Automation\Invoke-CodeGeneration.ps1"</ScriptPath>
274+
<DllFolder>$(OutputPath)\..\..\..\ResourceManager\AzureResourceManager\AzureRM.Compute</DllFolder>
275+
<TargetFolder>..\..\..\ResourceManager\Compute\Commands.Compute</TargetFolder>
276+
<BaseCmdletFullName>Microsoft.Azure.Commands.Compute.ComputeClientBaseCmdlet</BaseCmdletFullName>
277+
<BaseCmdletClientName>ComputeClient.ComputeManagementClient</BaseCmdletClientName>
278+
<NamesSpace>Microsoft.Azure.Management.Compute</NamesSpace>
279+
<PSFlavor>Verb</PSFlavor>
280+
<CliFlavor>Verb</CliFlavor>
281+
<Operations>VirtualMachineScaleSets,VirtualMachineScaleSetVMs</Operations>
283282
</PropertyGroup>
284-
<Exec Command="$(PowerShellExe) $(PSCodeGenScriptPath) $(PSCodeGenTargetFolder) $(ARMGeneratedPSCodeFolder) $(ARMClientLibraryNamesSpace) $(BaseCmdletFullName) $(BaseCmdletClientName) $(ARMCmdletFlavor) $(CliCmdletFlavor) $(OperationNameFilter)" />
283+
<Exec Command="$(PowerShellExe) $(ScriptPath) $(DllFolder) $(TargetFolder) $(NamesSpace) $(BaseCmdletFullName) $(BaseCmdletClientName) $(PSFlavor) $(CliFlavor) $(Operations)" />
285284
</Target>
286285
</Project>

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Generated/HostedService/HostedServiceListPublisherExtensionsMethod.cs

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
//
2+
// Copyright (c) Microsoft and contributors. All rights reserved.
3+
//
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
//
13+
// See the License for the specific language governing permissions and
14+
// limitations under the License.
15+
//
16+
17+
// Warning: This code was generated by a tool.
18+
//
19+
// Changes to this file may cause incorrect behavior and will be lost if the
20+
// code is regenerated.
21+
22+
using Microsoft.Azure;
23+
using Microsoft.WindowsAzure.Commands.Compute.Automation.Models;
24+
using Microsoft.WindowsAzure.Management.Compute;
25+
using Microsoft.WindowsAzure.Management.Compute.Models;
26+
using System;
27+
using System.Collections.Generic;
28+
using System.Linq;
29+
using System.Management.Automation;
30+
31+
namespace Microsoft.WindowsAzure.Commands.Compute.Automation
32+
{
33+
public partial class InvokeAzureComputeMethodCmdlet : ComputeAutomationBaseCmdlet
34+
{
35+
protected object CreateHostedServiceListPublisherExtensionsDynamicParameters()
36+
{
37+
dynamicParameters = new RuntimeDefinedParameterDictionary();
38+
var pArgumentList = new RuntimeDefinedParameter();
39+
pArgumentList.Name = "ArgumentList";
40+
pArgumentList.ParameterType = typeof(object[]);
41+
pArgumentList.Attributes.Add(new ParameterAttribute
42+
{
43+
ParameterSetName = "InvokeByStaticParameters",
44+
Position = 1,
45+
Mandatory = true
46+
});
47+
pArgumentList.Attributes.Add(new AllowNullAttribute());
48+
dynamicParameters.Add("ArgumentList", pArgumentList);
49+
50+
return dynamicParameters;
51+
}
52+
53+
protected void ExecuteHostedServiceListPublisherExtensionsMethod(object[] invokeMethodInputParameters)
54+
{
55+
56+
var result = HostedServiceClient.ListPublisherExtensions();
57+
WriteObject(result);
58+
}
59+
}
60+
61+
public partial class NewAzureComputeArgumentListCmdlet : ComputeAutomationBaseCmdlet
62+
{
63+
protected PSArgument[] CreateHostedServiceListPublisherExtensionsParameters()
64+
{
65+
return ConvertFromObjectsToArguments(new string[0], new object[0]);
66+
}
67+
}
68+
}

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Generated/InvokeAzureComputeMethodCmdlet.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ protected static object[] ConvertDynamicParameters(RuntimeDefinedParameterDictio
9999
"HostedServiceListAvailableExtensions",
100100
"HostedServiceListExtensions",
101101
"HostedServiceListExtensionVersions",
102+
"HostedServiceListPublisherExtensions",
102103
"HostedServiceUpdate",
103104
"LoadBalancerCreate",
104105
"LoadBalancerDelete",
@@ -324,6 +325,9 @@ protected override void ProcessRecord()
324325
case "HostedServiceListExtensionVersions" :
325326
ExecuteHostedServiceListExtensionVersionsMethod(argumentList);
326327
break;
328+
case "HostedServiceListPublisherExtensions" :
329+
ExecuteHostedServiceListPublisherExtensionsMethod(argumentList);
330+
break;
327331
case "HostedServiceUpdate" :
328332
ExecuteHostedServiceUpdateMethod(argumentList);
329333
break;
@@ -540,6 +544,7 @@ public virtual object GetDynamicParameters()
540544
case "HostedServiceListAvailableExtensions" : return CreateHostedServiceListAvailableExtensionsDynamicParameters();
541545
case "HostedServiceListExtensions" : return CreateHostedServiceListExtensionsDynamicParameters();
542546
case "HostedServiceListExtensionVersions" : return CreateHostedServiceListExtensionVersionsDynamicParameters();
547+
case "HostedServiceListPublisherExtensions" : return CreateHostedServiceListPublisherExtensionsDynamicParameters();
543548
case "HostedServiceUpdate" : return CreateHostedServiceUpdateDynamicParameters();
544549
case "LoadBalancerCreate" : return CreateLoadBalancerCreateDynamicParameters();
545550
case "LoadBalancerDelete" : return CreateLoadBalancerDeleteDynamicParameters();

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Generated/Microsoft.WindowsAzure.Commands.Compute.Automation.format.generated.ps1xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1134,6 +1134,10 @@
11341134
<Label>DataVirtualHardDisks</Label>
11351135
<ScriptBlock> foreach ($item in $_.DataVirtualHardDisks) { [Newtonsoft.Json.JsonConvert]::SerializeObject($item, [Newtonsoft.Json.Formatting]::Indented) } </ScriptBlock>
11361136
</ListItem>
1137+
<ListItem>
1138+
<Label>DebugSettings</Label>
1139+
<ScriptBlock>[Newtonsoft.Json.JsonConvert]::SerializeObject($_.DebugSettings, [Newtonsoft.Json.Formatting]::Indented)</ScriptBlock>
1140+
</ListItem>
11371141
<ListItem>
11381142
<Label>DefaultWinRmCertificateThumbprint</Label>
11391143
<PropertyName>DefaultWinRmCertificateThumbprint</PropertyName>

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Generated/NewAzureComputeArgumentListCmdlet.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ public partial class NewAzureComputeArgumentListCmdlet : ComputeAutomationBaseCm
8383
"HostedServiceListAvailableExtensions",
8484
"HostedServiceListExtensions",
8585
"HostedServiceListExtensionVersions",
86+
"HostedServiceListPublisherExtensions",
8687
"HostedServiceUpdate",
8788
"LoadBalancerCreate",
8889
"LoadBalancerDelete",
@@ -195,6 +196,7 @@ protected override void ProcessRecord()
195196
case "HostedServiceListAvailableExtensions" : WriteObject(CreateHostedServiceListAvailableExtensionsParameters(), true); break;
196197
case "HostedServiceListExtensions" : WriteObject(CreateHostedServiceListExtensionsParameters(), true); break;
197198
case "HostedServiceListExtensionVersions" : WriteObject(CreateHostedServiceListExtensionVersionsParameters(), true); break;
199+
case "HostedServiceListPublisherExtensions" : WriteObject(CreateHostedServiceListPublisherExtensionsParameters(), true); break;
198200
case "HostedServiceUpdate" : WriteObject(CreateHostedServiceUpdateParameters(), true); break;
199201
case "LoadBalancerCreate" : WriteObject(CreateLoadBalancerCreateParameters(), true); break;
200202
case "LoadBalancerDelete" : WriteObject(CreateLoadBalancerDeleteParameters(), true); break;

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Generated/NewAzureComputeParameterObjectCmdlet.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ public partial class NewAzureComputeParameterObjectCmdlet : ComputeAutomationBas
8484
"VirtualMachineDataDiskConfigurationList",
8585
"VirtualMachineDataVirtualHardDisk",
8686
"VirtualMachineDataVirtualHardDiskList",
87+
"VirtualMachineDebugSettings",
8788
"VirtualMachineDiskCreateParameters",
8889
"VirtualMachineDiskUpdateParameters",
8990
"VirtualMachineDiskVirtualMachineDataDiskCreateParameters",
@@ -157,6 +158,7 @@ public partial class NewAzureComputeParameterObjectCmdlet : ComputeAutomationBas
157158
"Microsoft.WindowsAzure.Management.Compute.Models.DataDiskConfigurationCreateParameters",
158159
"Microsoft.WindowsAzure.Management.Compute.Models.DataDiskConfigurationUpdateParameters",
159160
"Microsoft.WindowsAzure.Management.Compute.Models.DataVirtualHardDisk",
161+
"Microsoft.WindowsAzure.Management.Compute.Models.DebugSettings",
160162
"Microsoft.WindowsAzure.Management.Compute.Models.DeploymentChangeConfigurationParameters",
161163
"Microsoft.WindowsAzure.Management.Compute.Models.DeploymentCreateParameters",
162164
"Microsoft.WindowsAzure.Management.Compute.Models.DeploymentDeleteRoleInstanceParameters",
@@ -316,6 +318,7 @@ protected override void ProcessRecord()
316318
case "VirtualMachineDataDiskConfigurationList" : WriteObject(new List<DataDiskConfiguration>()); break;
317319
case "VirtualMachineDataVirtualHardDisk" : WriteObject(new DataVirtualHardDisk()); break;
318320
case "VirtualMachineDataVirtualHardDiskList" : WriteObject(new List<DataVirtualHardDisk>()); break;
321+
case "VirtualMachineDebugSettings" : WriteObject(new DebugSettings()); break;
319322
case "VirtualMachineDiskCreateParameters" : WriteObject(new VirtualMachineDiskCreateParameters()); break;
320323
case "VirtualMachineDiskUpdateParameters" : WriteObject(new VirtualMachineDiskUpdateParameters()); break;
321324
case "VirtualMachineDiskVirtualMachineDataDiskCreateParameters" : WriteObject(new VirtualMachineDataDiskCreateParameters()); break;
@@ -391,6 +394,7 @@ protected override void ProcessRecord()
391394
case "Microsoft.WindowsAzure.Management.Compute.Models.DataDiskConfigurationCreateParameters" : WriteObject(new DataDiskConfigurationCreateParameters()); break;
392395
case "Microsoft.WindowsAzure.Management.Compute.Models.DataDiskConfigurationUpdateParameters" : WriteObject(new DataDiskConfigurationUpdateParameters()); break;
393396
case "Microsoft.WindowsAzure.Management.Compute.Models.DataVirtualHardDisk" : WriteObject(new DataVirtualHardDisk()); break;
397+
case "Microsoft.WindowsAzure.Management.Compute.Models.DebugSettings" : WriteObject(new DebugSettings()); break;
394398
case "Microsoft.WindowsAzure.Management.Compute.Models.DeploymentChangeConfigurationParameters" : WriteObject(new DeploymentChangeConfigurationParameters()); break;
395399
case "Microsoft.WindowsAzure.Management.Compute.Models.DeploymentCreateParameters" : WriteObject(new DeploymentCreateParameters()); break;
396400
case "Microsoft.WindowsAzure.Management.Compute.Models.DeploymentDeleteRoleInstanceParameters" : WriteObject(new DeploymentDeleteRoleInstanceParameters()); break;

0 commit comments

Comments
 (0)