Skip to content

Commit 4507d32

Browse files
committed
MarketplaceOrdering updated help files and disable some tests in TestSetGeneratorTester.cs
1 parent 95e20c0 commit 4507d32

File tree

5 files changed

+66
-28
lines changed

5 files changed

+66
-28
lines changed

src/ResourceManager/MarketplaceOrdering/Commands.MarketplaceOrdering.Test/Commands.MarketplaceOrdering.Test.csproj

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -149,11 +149,21 @@
149149
<None Include="ScenarioTests\AgreementsTests.ps1">
150150
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
151151
</None>
152-
<None Include="SessionRecords\Microsoft.Azure.Commands.MarketplaceOrdering.Test.ScenarioTests.AgreementsTests\TestGetAgreement.json" />
153-
<None Include="SessionRecords\Microsoft.Azure.Commands.MarketplaceOrdering.Test.ScenarioTests.AgreementsTests\TestSetAgreementAccepted.json" />
154-
<None Include="SessionRecords\Microsoft.Azure.Commands.MarketplaceOrdering.Test.ScenarioTests.AgreementsTests\TestSetAgreementAcceptedPipeline.json" />
155-
<None Include="SessionRecords\Microsoft.Azure.Commands.MarketplaceOrdering.Test.ScenarioTests.AgreementsTests\TestSetAgreementNotAccepted.json" />
156-
<None Include="SessionRecords\Microsoft.Azure.Commands.MarketplaceOrdering.Test.ScenarioTests.AgreementsTests\TestSetAgreementRejectPipeline.json" />
152+
<None Include="SessionRecords\Microsoft.Azure.Commands.MarketplaceOrdering.Test.ScenarioTests.AgreementsTests\TestGetAgreement.json">
153+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
154+
</None>
155+
<None Include="SessionRecords\Microsoft.Azure.Commands.MarketplaceOrdering.Test.ScenarioTests.AgreementsTests\TestSetAgreementAccepted.json">
156+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
157+
</None>
158+
<None Include="SessionRecords\Microsoft.Azure.Commands.MarketplaceOrdering.Test.ScenarioTests.AgreementsTests\TestSetAgreementAcceptedPipeline.json">
159+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
160+
</None>
161+
<None Include="SessionRecords\Microsoft.Azure.Commands.MarketplaceOrdering.Test.ScenarioTests.AgreementsTests\TestSetAgreementNotAccepted.json">
162+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
163+
</None>
164+
<None Include="SessionRecords\Microsoft.Azure.Commands.MarketplaceOrdering.Test.ScenarioTests.AgreementsTests\TestSetAgreementRejectPipeline.json">
165+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
166+
</None>
157167
</ItemGroup>
158168
<ItemGroup>
159169
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />

src/ResourceManager/MarketplaceOrdering/Commands.MarketplaceOrdering/help/AzureRM.MarketplaceOrdering.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ Locale: en-US
88

99
# AzureRM.MarketplaceOrdering Module
1010
## Description
11-
The topics in this section document the Azure PowerShell cmdlets for Azure MarketplaceOrdering in the Azure Resource Manager (ARM) framework. The cmdlets exist in the Microsoft.Azure.Commands.MarketplaceOrdering namespace. These cmdlets allow azure users to accept the term for a marketplace offering further allowing programmtic deployment for these solutions. Users may also reject set of terms already accepted.
11+
The topics in this section document the Azure PowerShell cmdlets for Azure MarketplaceOrdering in the Azure Resource Manager (ARM) framework. The cmdlets exist in the Microsoft.Azure.Commands.MarketplaceOrdering namespace. These cmdlets allow azure users to accept the legal terms for a marketplace offering further allowing programmtic deployment for these solutions. Users may also reject set of legal terms already accepted.
1212

1313
## AzureRM.MarketplaceOrdering Cmdlets
1414
### [Get-AzureRmMarketplaceTerms](Get-AzureRmMarketplaceTerms.md)
15-
Get the agreement terms for a given publisher id(Publisher), offer id(Product) and plan id(Name). The same terms object which is returned here should be passed to Set-AzureRmMarketplaceTerms to accept the terms.
15+
Get the agreement terms for a given publisher id(Publisher), offer id(Product) and plan id(Name). The terms object which is returned by this command should be passed to Set-AzureRmMarketplaceTerms to accept the legal terms.
1616

1717
### [Set-AzureRmMarketplaceTerms](Set-AzureRmMarketplaceTerms.md)
18-
Accept or reject terms for a given publisher id(Publisher), offer id(Product) and plan id(Name). Please use Get-AzureRmMarketplaceTerms to get the agreement terms.
18+
Accept or reject the legal terms for a given publisher id(Publisher), offer id(Product) and plan id(Name). Please use Get-AzureRmMarketplaceTerms to get the agreement terms.
1919

src/ResourceManager/MarketplaceOrdering/Commands.MarketplaceOrdering/help/Get-AzureRmMarketplaceTerms.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ schema: 2.0.0
88
# Get-AzureRmMarketplaceTerms
99

1010
## SYNOPSIS
11-
Get the agreement terms for a given publisher id(Publisher), offer id(Product) and plan id(Name). The same terms object which is returned here should be passed to Set-AzureRmMarketplaceTerms to accept the terms.
11+
Get the agreement terms for a given publisher id(Publisher), offer id(Product) and plan id(Name). The terms object which is returned by this command should be passed to Set-AzureRmMarketplaceTerms to accept the legal terms.
1212

1313
## SYNTAX
1414

src/ResourceManager/MarketplaceOrdering/Commands.MarketplaceOrdering/help/Set-AzureRmMarketplaceTerms.md

Lines changed: 44 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,29 @@ Accept or reject terms for a given publisher id(Publisher), offer id(Product) an
1212

1313
## SYNTAX
1414

15-
### AgreementParameterSet (Default)
15+
### AgreementAcceptParameterSet (Default)
1616
```
17-
Set-AzureRmMarketplaceTerms -Publisher <String> -Product <String> -Name <String> -Accepted <Boolean>
17+
Set-AzureRmMarketplaceTerms -Publisher <String> -Product <String> -Name <String> [-Accept]
1818
[-Terms <PSAgreementTerms>] [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm]
1919
[<CommonParameters>]
2020
```
2121

22-
### InputObjectParameterSet
22+
### AgreementRejectParameterSet
2323
```
24-
Set-AzureRmMarketplaceTerms -Accepted <Boolean> [-InputObject] <PSAgreementTerms>
24+
Set-AzureRmMarketplaceTerms -Publisher <String> -Product <String> -Name <String> [-Reject]
25+
[-Terms <PSAgreementTerms>] [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm]
26+
[<CommonParameters>]
27+
```
28+
29+
### InputObjectAcceptParametrSet
30+
```
31+
Set-AzureRmMarketplaceTerms [-Accept] [-InputObject] <PSAgreementTerms>
32+
[-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
33+
```
34+
35+
### InputObjectRejectParametrSet
36+
```
37+
Set-AzureRmMarketplaceTerms [-Reject] [-InputObject] <PSAgreementTerms>
2538
[-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
2639
```
2740

@@ -32,22 +45,22 @@ The **Set-AzureRmMarketplaceTerms** cmdlet saves the terms object for given publ
3245

3346
### Example 1
3447
```
35-
PS C:\> Set-AzureRmMarketplaceTerms -Publisher "microsoft-ads" -Product "windows-data-science-vm" -Name "windows2016" -Terms $agreementTerms -Accepted $true
48+
PS C:\> Set-AzureRmMarketplaceTerms -Publisher "microsoft-ads" -Product "windows-data-science-vm" -Name "windows2016" -Terms $agreementTerms -Accept
3649
```
3750

3851
### Example 2
3952
```
40-
PS C:\> Get-AzureRmMarketplaceTerms -Publisher "microsoft-ads" -Product "windows-data-science-vm" -Name "windows2016" | Set-AzureRmMarketplaceTerms -Accepted $true
53+
PS C:\> Get-AzureRmMarketplaceTerms -Publisher "microsoft-ads" -Product "windows-data-science-vm" -Name "windows2016" | Set-AzureRmMarketplaceTerms -Accept
4154
```
4255

4356
## PARAMETERS
4457

45-
### -Accepted
46-
Boolean which indicate the status of acceptance of the terms, it should be true if any version of the terms have been accepted.
58+
### -Accept
59+
Pass this to accept the legal terms.
4760

4861
```yaml
49-
Type: Boolean
50-
Parameter Sets: (All)
62+
Type: SwitchParameter
63+
Parameter Sets: AgreementAcceptParameterSet, InputObjectAcceptParametrSet
5164
Aliases:
5265

5366
Required: True
@@ -58,7 +71,9 @@ Accept wildcard characters: False
5871
```
5972
6073
### -DefaultProfile
61-
The credentials, account, tenant, and subscription used for communication with azure.```yaml
74+
The credentials, account, tenant, and subscription used for communication with azure.
75+
76+
```yaml
6277
Type: IAzureContextContainer
6378
Parameter Sets: (All)
6479
Aliases: AzureRmContext, AzureCredential
@@ -75,7 +90,7 @@ Terms object returned in Get-AzureRmMarketplaceTerms cmdlet. This is a mandatory
7590
7691
```yaml
7792
Type: PSAgreementTerms
78-
Parameter Sets: InputObjectParameterSet
93+
Parameter Sets: InputObjectAcceptParametrSet, InputObjectRejectParametrSet
7994
Aliases:
8095

8196
Required: True
@@ -90,7 +105,7 @@ Plan identifier string of image being deployed.
90105
91106
```yaml
92107
Type: String
93-
Parameter Sets: AgreementParameterSet
108+
Parameter Sets: AgreementAcceptParameterSet, AgreementRejectParameterSet
94109
Aliases:
95110

96111
Required: True
@@ -105,7 +120,7 @@ Offer identifier string of image being deployed.
105120
106121
```yaml
107122
Type: String
108-
Parameter Sets: AgreementParameterSet
123+
Parameter Sets: AgreementAcceptParameterSet, AgreementRejectParameterSet
109124
Aliases:
110125

111126
Required: True
@@ -120,7 +135,20 @@ Publisher identifier string of image being deployed.
120135
121136
```yaml
122137
Type: String
123-
Parameter Sets: AgreementParameterSet
138+
Parameter Sets: AgreementAcceptParameterSet, AgreementRejectParameterSet
139+
Aliases:
140+
141+
Required: True
142+
Position: Named
143+
Default value: None
144+
Accept pipeline input: False
145+
Accept wildcard characters: False
146+
```
147+
148+
### -Reject
149+
Pass this to reject the legal terms.```yaml
150+
Type: SwitchParameter
151+
Parameter Sets: AgreementRejectParameterSet, InputObjectRejectParametrSet
124152
Aliases:
125153

126154
Required: True
@@ -135,7 +163,7 @@ Terms object returned in Get-AzureRmMarketplaceTerms cmdlet. This is a mandatory
135163
136164
```yaml
137165
Type: PSAgreementTerms
138-
Parameter Sets: AgreementParameterSet
166+
Parameter Sets: AgreementAcceptParameterSet, AgreementRejectParameterSet
139167
Aliases:
140168

141169
Required: False

tools/BuildPackagesTask/Microsoft.Azure.Build.Tasks.Test/TestSetGeneratorTester.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ public void GetTests_MultiplePathsAndMultipleMappingsWithSomeMatchingPaths_Retur
398398
Assert.True(expectedNumberFiles <= actual.Count);
399399
}
400400

401-
[Fact]
401+
[Fact(Skip = "https://github.com/Azure/azure-powershell/issues/4723")]
402402
[Trait(AcceptanceType, CheckIn)]
403403
public void GetTests_MultiplePathsAndMultipleMappingsWithMatchingPaths_ReturnsMatchingTests()
404404
{
@@ -441,7 +441,7 @@ public void GetTests_FilesNull_ThrowNullException()
441441
throw new Exception("No exception was thrown.");
442442
}
443443

444-
[Fact]
444+
[Fact(Skip = "https://github.com/Azure/azure-powershell/issues/4723")]
445445
[Trait(AcceptanceType, CheckIn)]
446446
public void GetTests_EmptyListOfFiles_ShouldReturnAllTests()
447447
{
@@ -524,7 +524,7 @@ public void GetTests_WithActualMappings_FilesFound_ReturnsMatchingTests()
524524
Assert.True(expected.SetEquals(actual));
525525
}
526526

527-
[Fact]
527+
[Fact(Skip = "https://github.com/Azure/azure-powershell/issues/4723")]
528528
[Trait(AcceptanceType, CheckIn)]
529529
public void GetTests_WithActualMappings_FilesNotFound_ReturnsAllTests()
530530
{

0 commit comments

Comments
 (0)