Migrate VMware from generation to main

src/VMware/VMware.Autorest/Az.VMware.psd1

@@ -1,159 +1,23 @@
-#
-# Module manifest for module 'Az.VMware'
-#
-# Generated by: Microsoft Corporation
-#
-# Generated on: 10/10/2022
-#
-
 @{
-
-# Script module or binary module file associated with this manifest.
-RootModule = './Az.VMware.psm1'
-
-# Version number of this module.
-ModuleVersion = '0.5.0'
-
-# Supported PSEditions
-CompatiblePSEditions = 'Core', 'Desktop'
-
-# ID used to uniquely identify this module
-GUID = '78d2fac8-ec90-47ad-b8aa-a27106b158f5'
-
-# 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: VMware cmdlets'
-
-# Minimum version of the PowerShell engine required by this module
-PowerShellVersion = '5.1'
-
-# Name of the PowerShell host required by this module
-# PowerShellHostName = ''
-
-# Minimum version of the PowerShell host required by this module
-# PowerShellHostVersion = ''
-
-# Minimum version of Microsoft .NET Framework required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
-DotNetFrameworkVersion = '4.7.2'
-
-# Minimum version of the common language runtime (CLR) required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
-# ClrVersion = ''
-
-# Processor architecture (None, X86, Amd64) required by this module
-# ProcessorArchitecture = ''
-
-# Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.10.2'; })
-
-# Assemblies that must be loaded prior to importing this module
-RequiredAssemblies = './bin/Az.VMware.private.dll'
-
-# 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
-FormatsToProcess = './Az.VMware.format.ps1xml'
-
-# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
-# NestedModules = @()
-
-# 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.
-FunctionsToExport = 'Get-AzVMwareAddon', 'Get-AzVMwareAuthorization', 
-               'Get-AzVMwareCloudLink', 'Get-AzVMwareCluster', 
-               'Get-AzVMwareDatastore', 'Get-AzVMwareGlobalReachConnection', 
-               'Get-AzVMwarePlacementPolicy', 'Get-AzVMwarePrivateCloud', 
-               'Get-AzVMwarePrivateCloudAdminCredential', 
-               'Get-AzVMwareVirtualMachine', 'New-AzVMwareAddon', 
-               'New-AzVMwareAddonSrmPropertiesObject', 
-               'New-AzVMwareAddonVrPropertiesObject', 'New-AzVMwareAuthorization', 
-               'New-AzVMwareCloudLink', 'New-AzVMwareCluster', 
-               'New-AzVMwareDatastore', 'New-AzVMwareGlobalReachConnection', 
-               'New-AzVMwarePlacementPolicy', 'New-AzVMwarePrivateCloud', 
-               'New-AzVMwarePrivateCloudNsxtPassword', 
-               'New-AzVMwarePrivateCloudVcenterPassword', 
-               'New-AzVMwarePSCredentialExecutionParameterObject', 
-               'New-AzVMwareScriptSecureStringExecutionParameterObject', 
-               'New-AzVMwareScriptStringExecutionParameterObject', 
-               'New-AzVMwareVmHostPlacementPolicyPropertiesObject', 
-               'New-AzVMwareVMPlacementPolicyPropertiesObject', 
-               'Remove-AzVMwareAddon', 'Remove-AzVMwareAuthorization', 
-               'Remove-AzVMwareCloudLink', 'Remove-AzVMwareCluster', 
-               'Remove-AzVMwareDatastore', 'Remove-AzVMwareGlobalReachConnection', 
-               'Remove-AzVMwarePlacementPolicy', 'Remove-AzVMwarePrivateCloud', 
-               'Test-AzVMwareLocationQuotaAvailability', 
-               'Test-AzVMwareLocationTrialAvailability', 'Update-AzVMwareCluster', 
-               'Update-AzVMwarePlacementPolicy', 'Update-AzVMwarePrivateCloud'
-
-# Cmdlets 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 cmdlets to export.
-CmdletsToExport = @()
-
-# Variables to export from this module
-# VariablesToExport = @()
-
-# Aliases 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 aliases to export.
-AliasesToExport = '*'
-
-# DSC resources to export from this module
-# DscResourcesToExport = @()
-
-# 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 RootModule/ModuleToProcess. This may also contain a PSData hashtable with additional module metadata used by PowerShell.
-PrivateData = @{
-
+  GUID = '6ced3ed2-fb86-4a72-aca7-369161b12fea'
+  RootModule = './Az.VMware.psm1'
+  ModuleVersion = '0.4.0'
+  CompatiblePSEditions = 'Core', 'Desktop'
+  Author = 'Microsoft Corporation'
+  CompanyName = 'Microsoft Corporation'
+  Copyright = 'Microsoft Corporation. All rights reserved.'
+  Description = 'Microsoft Azure PowerShell: VMware cmdlets'
+  PowerShellVersion = '5.1'
+  DotNetFrameworkVersion = '4.7.2'
+  RequiredAssemblies = './bin/Az.VMware.private.dll'
+  FormatsToProcess = './Az.VMware.format.ps1xml'
+  FunctionsToExport = 'Get-AzVMwareAddon', 'Get-AzVMwareAuthorization', 'Get-AzVMwareCloudLink', 'Get-AzVMwareCluster', 'Get-AzVMwareClusterZone', 'Get-AzVMwareDatastore', 'Get-AzVMwareGlobalReachConnection', 'Get-AzVMwarePlacementPolicy', 'Get-AzVMwarePrivateCloud', 'Get-AzVMwarePrivateCloudAdminCredential', 'Get-AzVMwareVirtualMachine', 'New-AzVMwareAddon', 'New-AzVMwareAddonSrmPropertiesObject', 'New-AzVMwareAddonVrPropertiesObject', 'New-AzVMwareAuthorization', 'New-AzVMwareCloudLink', 'New-AzVMwareCluster', 'New-AzVMwareDatastore', 'New-AzVMwareGlobalReachConnection', 'New-AzVMwareIdentitySourceObject', 'New-AzVMwarePlacementPolicy', 'New-AzVMwarePrivateCloud', 'New-AzVMwarePrivateCloudNsxtPassword', 'New-AzVMwarePrivateCloudVcenterPassword', 'New-AzVMwarePSCredentialExecutionParameterObject', 'New-AzVMwareScriptSecureStringExecutionParameterObject', 'New-AzVMwareScriptStringExecutionParameterObject', 'New-AzVMwareVmHostPlacementPolicyPropertiesObject', 'New-AzVMwareVMPlacementPolicyPropertiesObject', 'Remove-AzVMwareAddon', 'Remove-AzVMwareAuthorization', 'Remove-AzVMwareCloudLink', 'Remove-AzVMwareCluster', 'Remove-AzVMwareDatastore', 'Remove-AzVMwareGlobalReachConnection', 'Remove-AzVMwarePlacementPolicy', 'Remove-AzVMwarePrivateCloud', 'Test-AzVMwareLocationQuotaAvailability', 'Test-AzVMwareLocationTrialAvailability', 'Update-AzVMwareAuthorization', 'Update-AzVMwareCloudLink', 'Update-AzVMwareCluster', 'Update-AzVMwareDatastore', 'Update-AzVMwareGlobalReachConnection', 'Update-AzVMwarePlacementPolicy', 'Update-AzVMwarePrivateCloud'
+  PrivateData = @{
     PSData = @{
-
-        # Tags applied to this module. These help with module discovery in online galleries.
-        Tags = 'Azure','ResourceManager','ARM','PSModule','VMware'
-
-        # A URL to the license for this module.
-        LicenseUri = 'https://aka.ms/azps-license'
-
-        # A URL to the main website for this project.
-        ProjectUri = 'https://github.com/Azure/azure-powershell'
-
-        # A URL to an icon representing this module.
-        # IconUri = ''
-
-        # ReleaseNotes of this module
-        ReleaseNotes = '* Added cmdlet:
-    - ''Get-AzVMwareDatastore''
-    - ''New-AzVMwareDatastore''
-    - ''Remove-AzVMwareDatastore'''
-
-        # Prerelease string of this module
-        # Prerelease = ''
-
-        # Flag to indicate whether the module requires explicit user acceptance for install/update/save
-        # RequireLicenseAcceptance = $false
-
-        # External dependent modules of this module
-        # ExternalModuleDependencies = @()
-
-    } # End of PSData hashtable
-
- } # End of PrivateData hashtable
-
-# HelpInfo URI of this module
-# HelpInfoURI = ''
-
-# Default prefix for commands exported from this module. Override the default prefix using Import-Module -Prefix.
-# DefaultCommandPrefix = ''
-
+      Tags = 'Azure', 'ResourceManager', 'ARM', 'PSModule', 'VMware'
+      LicenseUri = 'https://aka.ms/azps-license'
+      ProjectUri = 'https://github.com/Azure/azure-powershell'
+      ReleaseNotes = ''
+    }
+  }
 }
-

src/VMware/VMware.Autorest/README.md

@@ -47,19 +47,17 @@ In this directory, run AutoRest:
 > see https://aka.ms/autorest
 
 ``` yaml
-branch: 2e665b044670074d91e8a9e6d04f23fbe3c8a06e
+commit: 0baf811c3c76c87b3c127d098519bd97141222dd
 require:
-  - $(this-folder)/../readme.azure.noprofile.md
+  - $(this-folder)/../../readme.azure.noprofile.md
 input-file: 
-  - $(repo)/specification/vmware/resource-manager/Microsoft.AVS/stable/2021-12-01/vmware.json
+  - $(repo)/specification/vmware/resource-manager/Microsoft.AVS/stable/2023-03-01/vmware.json
 
 module-version: 0.4.0
 title: VMware
 subject-prefix: $(service-name)
 
-identity-correction-for-post: true
-resourcegroup-append: true
-nested-object-to-string: true
+support-json-input: false
 
 directive:
   - from: swagger-document 
@@ -83,7 +81,7 @@ directive:
           "format": "password"
       }
   - where:
-      variant: ^Create$|^CreateViaIdentity$|^CreateViaIdentityExpanded$|^Update$|^UpdateViaIdentity$
+      variant: ^(Create|Update)(?!.*?Expanded)
     remove: true
   - where:
       variant: ^Restrict$|^RestrictViaIdentity$
@@ -121,12 +119,47 @@ directive:
     remove: true
   - where:
       verb: Test
-      subject: ^LocationTrialAvailability$|^LocationQuotaAvailability$
+      subject: ^LocationQuotaAvailability$
       variant: ^CheckViaIdentity$
     remove: true
+  # Remove v4 variant
+  - where:
+      verb: Test
+      subject: ^LocationTrialAvailability$
+      variant: ^Check$|CheckViaIdentity
+    remove: true
+  - where:
+      verb: New
+      subject: PrivateCloud
+      variant: CreateViaIdentityExpanded
+    remove: true
+  # custom set SKU Name optional
+  # - where:
+  #     verb: Test
+  #     subject: ^LocationTrialAvailability$
+  #   hide: true
+  # Remove the list variant as the workloadNetwork only have one enum value 
+  - where:
+      verb: Get
+      subject: WorkloadNetwork
+  #   variant: List
+    hide: true
+  # Hide parent object variant to fix 'multiple types define RestrictMovement [string, IVirtualMachineRestrictMovement]'
+  - where:
+      verb: Lock
+      subject: VirtualMachineMovement
+      variant: ^RestrictViaIdentityCluster$|^RestrictViaIdentityPrivateCloud$
+    remove: true
+  # Hide HcxEnterpriseSite, ScriptExecution, Addon update
+  - where:
+      verb: Update
+      subject: HcxEnterpriseSite|ScriptExecution|Addon
+    remove: true
   - no-inline:
       - AddonProperties
       - PlacementPolicyProperties
+  - model-cmdlet:
+    - model-name: IdentitySource
   # Re-name and custom it
   # - model-cmdlet:
   #     - VMPlacementPolicyProperties

src/VMware/VMware.Autorest/UX/Microsoft.AVS/locations.json

@@ -1,6 +1,6 @@
 {
   "resourceType": "locations",
-  "apiVersion": "2021-12-01",
+  "apiVersion": "2023-03-01",
   "learnMore": {
     "url": "https://learn.microsoft.com/powershell/module/az.vmware"
   },
@@ -37,39 +37,6 @@
           ]
         }
       ]
-    },
-    {
-      "name": "Test-AzVMwareLocationTrialAvailability",
-      "description": "Return trial status for subscription by region",
-      "path": "/subscriptions/{subscriptionId}/providers/Microsoft.AVS/locations/{location}/checkTrialAvailability",
-      "help": {
-        "learnMore": {
-          "url": "https://learn.microsoft.com/powershell/module/az.vmware/test-azvmwarelocationtrialavailability"
-        },
-        "parameterSets": [
-          {
-            "parameters": [
-              "-Location <String>",
-              "[-SubscriptionId <String>]"
-            ]
-          }
-        ]
-      },
-      "examples": [
-        {
-          "description": "Return trial status for subscription by region",
-          "parameters": [
-            {
-              "name": "-Location",
-              "value": "[Path.location]"
-            },
-            {
-              "name": "-SubscriptionId",
-              "value": "[Path.subscriptionId]"
-            }
-          ]
-        }
-      ]
     }
   ]
 }

src/VMware/VMware.Autorest/UX/Microsoft.AVS/privateClouds-authorizations.json

@@ -1,6 +1,6 @@
 {
   "resourceType": "privateClouds/authorizations",
-  "apiVersion": "2021-12-01",
+  "apiVersion": "2023-03-01",
   "learnMore": {
     "url": "https://learn.microsoft.com/powershell/module/az.vmware"
   },

src/VMware/VMware.Autorest/UX/Microsoft.AVS/privateClouds-cloudLinks.json

@@ -1,6 +1,6 @@
 {
   "resourceType": "privateClouds/cloudLinks",
-  "apiVersion": "2021-12-01",
+  "apiVersion": "2023-03-01",
   "learnMore": {
     "url": "https://learn.microsoft.com/powershell/module/az.vmware"
   },

src/VMware/VMware.Autorest/UX/Microsoft.AVS/privateClouds-clusters-datastores.json

@@ -1,6 +1,6 @@
 {
   "resourceType": "privateClouds/clusters/datastores",
-  "apiVersion": "2021-12-01",
+  "apiVersion": "2023-03-01",
   "learnMore": {
     "url": "https://learn.microsoft.com/powershell/module/az.vmware"
   },

src/VMware/VMware.Autorest/UX/Microsoft.AVS/privateClouds-clusters-placementPolicies.json

@@ -1,6 +1,6 @@
 {
   "resourceType": "privateClouds/clusters/placementPolicies",
-  "apiVersion": "2021-12-01",
+  "apiVersion": "2023-03-01",
   "learnMore": {
     "url": "https://learn.microsoft.com/powershell/module/az.vmware"
   },

src/VMware/VMware.Autorest/UX/Microsoft.AVS/privateClouds-clusters-virtualMachines.json

@@ -1,6 +1,6 @@
 {
   "resourceType": "privateClouds/clusters/virtualMachines",
-  "apiVersion": "2021-12-01",
+  "apiVersion": "2023-03-01",
   "learnMore": {
     "url": "https://learn.microsoft.com/powershell/module/az.vmware"
   },

src/VMware/VMware.Autorest/UX/Microsoft.AVS/privateClouds-clusters.json

@@ -1,6 +1,6 @@
 {
   "resourceType": "privateClouds/clusters",
-  "apiVersion": "2021-12-01",
+  "apiVersion": "2023-03-01",
   "learnMore": {
     "url": "https://learn.microsoft.com/powershell/module/az.vmware"
   },

src/VMware/VMware.Autorest/UX/Microsoft.AVS/privateClouds-globalReachConnections.json

@@ -1,6 +1,6 @@
 {
   "resourceType": "privateClouds/globalReachConnections",
-  "apiVersion": "2021-12-01",
+  "apiVersion": "2023-03-01",
   "learnMore": {
     "url": "https://learn.microsoft.com/powershell/module/az.vmware"
   },

src/VMware/VMware.Autorest/UX/Microsoft.AVS/privateClouds.json

@@ -1,6 +1,6 @@
 {
   "resourceType": "privateClouds",
-  "apiVersion": "2021-12-01",
+  "apiVersion": "2023-03-01",
   "learnMore": {
     "url": "https://learn.microsoft.com/powershell/module/az.vmware"
   },