Skip to content

Commit 0f22721

Browse files
Migrate VMware from generation to main (Azure#19619)
* Move VMware to main * update changelog.md Co-authored-by: lijinpei2008 <[email protected]>
1 parent 5821bd8 commit 0f22721

File tree

843 files changed

+13211
-7975
lines changed

Some content is hidden

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

843 files changed

+13211
-7975
lines changed

src/VMware/Az.VMware.format.ps1xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -689,6 +689,12 @@
689689
<TableColumnHeader>
690690
<Label>Name</Label>
691691
</TableColumnHeader>
692+
<TableColumnHeader>
693+
<Label>Status</Label>
694+
</TableColumnHeader>
695+
<TableColumnHeader>
696+
<Label>ProvisioningState</Label>
697+
</TableColumnHeader>
692698
<TableColumnHeader>
693699
<Label>ResourceGroupName</Label>
694700
</TableColumnHeader>
@@ -699,6 +705,12 @@
699705
<TableColumnItem>
700706
<PropertyName>Name</PropertyName>
701707
</TableColumnItem>
708+
<TableColumnItem>
709+
<PropertyName>Status</PropertyName>
710+
</TableColumnItem>
711+
<TableColumnItem>
712+
<PropertyName>ProvisioningState</PropertyName>
713+
</TableColumnItem>
702714
<TableColumnItem>
703715
<PropertyName>ResourceGroupName</PropertyName>
704716
</TableColumnItem>

src/VMware/Az.VMware.psd1

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Generated by: Microsoft Corporation
55
#
6-
# Generated on: 2/24/2022
6+
# Generated on: 9/26/2022
77
#
88

99
@{
@@ -71,15 +71,16 @@ FormatsToProcess = './Az.VMware.format.ps1xml'
7171
# Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
7272
FunctionsToExport = 'Get-AzVMwareAddon', 'Get-AzVMwareAuthorization',
7373
'Get-AzVMwareCloudLink', 'Get-AzVMwareCluster',
74-
'Get-AzVMwareGlobalReachConnection', 'Get-AzVMwarePlacementPolicy',
75-
'Get-AzVMwarePrivateCloud',
74+
'Get-AzVMwareDatastore', 'Get-AzVMwareGlobalReachConnection',
75+
'Get-AzVMwarePlacementPolicy', 'Get-AzVMwarePrivateCloud',
7676
'Get-AzVMwarePrivateCloudAdminCredential',
7777
'Get-AzVMwareVirtualMachine', 'New-AzVMwareAddon',
7878
'New-AzVMwareAddonSrmPropertiesObject',
7979
'New-AzVMwareAddonVrPropertiesObject', 'New-AzVMwareAuthorization',
8080
'New-AzVMwareCloudLink', 'New-AzVMwareCluster',
81-
'New-AzVMwareGlobalReachConnection', 'New-AzVMwarePlacementPolicy',
82-
'New-AzVMwarePrivateCloud', 'New-AzVMwarePrivateCloudNsxtPassword',
81+
'New-AzVMwareDatastore', 'New-AzVMwareGlobalReachConnection',
82+
'New-AzVMwarePlacementPolicy', 'New-AzVMwarePrivateCloud',
83+
'New-AzVMwarePrivateCloudNsxtPassword',
8384
'New-AzVMwarePrivateCloudVcenterPassword',
8485
'New-AzVMwarePSCredentialExecutionParameterObject',
8586
'New-AzVMwareScriptSecureStringExecutionParameterObject',
@@ -88,7 +89,7 @@ FunctionsToExport = 'Get-AzVMwareAddon', 'Get-AzVMwareAuthorization',
8889
'New-AzVMwareVMPlacementPolicyPropertiesObject',
8990
'Remove-AzVMwareAddon', 'Remove-AzVMwareAuthorization',
9091
'Remove-AzVMwareCloudLink', 'Remove-AzVMwareCluster',
91-
'Remove-AzVMwareGlobalReachConnection',
92+
'Remove-AzVMwareDatastore', 'Remove-AzVMwareGlobalReachConnection',
9293
'Remove-AzVMwarePlacementPolicy', 'Remove-AzVMwarePrivateCloud',
9394
'Test-AzVMwareLocationQuotaAvailability',
9495
'Test-AzVMwareLocationTrialAvailability', 'Update-AzVMwareCluster',
@@ -130,12 +131,7 @@ PrivateData = @{
130131
# IconUri = ''
131132

132133
# ReleaseNotes of this module
133-
ReleaseNotes = '* Upgrade API version to 2021-12-01
134-
* Added cmdlet:
135-
- ''Get-AzVMwareVirtualMachine''
136-
- ''New-AzVMwarePlacementPolicy''
137-
- ''Update-AzVMwarePlacementPolicy''
138-
- ''Remove-AzVMwarePlacementPolicy'''
134+
# ReleaseNotes = ''
139135

140136
# Prerelease string of this module
141137
# Prerelease = ''

src/VMware/Az.VMware.psm1

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@
2525
}
2626
}
2727
if(-not $accountsModule) {
28-
$hasAdequateVersion = (Get-Module -Name $accountsName -ListAvailable | Where-Object { $_.Version -ge [System.Version]'2.2.3' } | Measure-Object).Count -gt 0
28+
$hasAdequateVersion = (Get-Module -Name $accountsName -ListAvailable | Where-Object { $_.Version -ge [System.Version]'2.7.5' } | Measure-Object).Count -gt 0
2929
if($hasAdequateVersion) {
30-
$accountsModule = Import-Module -Name $accountsName -MinimumVersion 2.2.3 -Scope Global -PassThru
30+
$accountsModule = Import-Module -Name $accountsName -MinimumVersion 2.7.5 -Scope Global -PassThru
3131
}
3232
}
3333
}
3434

3535
if(-not $accountsModule) {
36-
Write-Error "`nThis module requires $accountsName version 2.2.3 or greater. For installation instructions, please see: https://docs.microsoft.com/powershell/azure/install-az-ps" -ErrorAction Stop
37-
} elseif (($accountsModule.Version -lt [System.Version]'2.2.3') -and (-not $localAccounts)) {
38-
Write-Error "`nThis module requires $accountsName version 2.2.3 or greater. An earlier version of Az.Accounts is imported in the current PowerShell session. If you are running test, please try to add the switch '-RegenerateSupportModule' when executing 'test-module.ps1'. Otherwise please open a new PowerShell session and import this module again.`nAdditionally, this error could indicate that multiple incompatible versions of Azure PowerShell modules are installed on your system. For troubleshooting information, please see: https://aka.ms/azps-version-error" -ErrorAction Stop
36+
Write-Error "`nThis module requires $accountsName version 2.7.5 or greater. For installation instructions, please see: https://docs.microsoft.com/powershell/azure/install-az-ps" -ErrorAction Stop
37+
} elseif (($accountsModule.Version -lt [System.Version]'2.7.5') -and (-not $localAccounts)) {
38+
Write-Error "`nThis module requires $accountsName version 2.7.5 or greater. An earlier version of Az.Accounts is imported in the current PowerShell session. If you are running test, please try to add the switch '-RegenerateSupportModule' when executing 'test-module.ps1'. Otherwise please open a new PowerShell session and import this module again.`nAdditionally, this error could indicate that multiple incompatible versions of Azure PowerShell modules are installed on your system. For troubleshooting information, please see: https://aka.ms/azps-version-error" -ErrorAction Stop
3939
}
4040
Write-Information "Loaded Module '$($accountsModule.Name)'"
4141

@@ -50,6 +50,10 @@
5050

5151
# Tweaks the pipeline on module load
5252
$instance.OnModuleLoad = $VTable.OnModuleLoad
53+
54+
# Following two delegates are added for telemetry
55+
$instance.GetTelemetryId = $VTable.GetTelemetryId
56+
$instance.Telemetry = $VTable.Telemetry
5357

5458

5559
# Tweaks the pipeline per call

src/VMware/Changelog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@
1818
- Additional information about change #1
1919
-->
2020
## Upcoming Release
21+
* Added cmdlet:
22+
- `Get-AzVMwareDatastore`
23+
- `New-AzVMwareDatastore`
24+
- `Remove-AzVMwareDatastore`
2125

2226
## Version 0.4.0
2327
* Upgrade API version to 2021-12-01

src/VMware/README.md

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ This directory contains the PowerShell module for the VMware service.
1717
This module was primarily generated via [AutoRest](https://github.com/Azure/autorest) using the [PowerShell](https://github.com/Azure/autorest.powershell) extension.
1818

1919
## Module Requirements
20-
- [Az.Accounts module](https://www.powershellgallery.com/packages/Az.Accounts/), version 2.2.3 or greater
20+
- [Az.Accounts module](https://www.powershellgallery.com/packages/Az.Accounts/), version 2.7.5 or greater
2121

2222
## Authentication
2323
AutoRest does not generate authentication code for the module. Authentication is handled via Az.Accounts by altering the HTTP payload before it is sent.
@@ -47,7 +47,7 @@ In this directory, run AutoRest:
4747
> see https://aka.ms/autorest
4848
4949
``` yaml
50-
branch: 69e98508ef71f09851b2a79971d2d8e12560adc5
50+
branch: 2e665b044670074d91e8a9e6d04f23fbe3c8a06e
5151
require:
5252
- $(this-folder)/../readme.azure.noprofile.md
5353
input-file:
@@ -105,7 +105,7 @@ directive:
105105
hide: true
106106
- where:
107107
verb: Get|New|Remove
108-
subject: ScriptExecution|WorkloadNetworkPublicIP|Datastore
108+
subject: ScriptExecution|WorkloadNetworkPublicIP
109109
hide: true
110110
- where:
111111
verb: Lock
@@ -217,4 +217,13 @@ directive:
217217
parameter-name: PeerExpressRouteCircuit
218218
set:
219219
parameter-name: PeerExpressRouteResourceId
220+
- where:
221+
model-name: Datastore
222+
set:
223+
format-table:
224+
properties:
225+
- Name
226+
- Status
227+
- ProvisioningState
228+
- ResourceGroupName
220229
```

0 commit comments

Comments
 (0)