Skip to content

Commit 8546802

Browse files
authored
fixing arg parameters for Get/Set-SdnVMNetwork cmdlets (#434)
# Description Summary of changes: - Fix an issue where invalid parameters being passed to sub-function # Change type - [x] Bug fix (non-breaking change) - [ ] Code style update (formatting, local variables) - [ ] New Feature (non-breaking change that adds new functionality without impacting existing) - [ ] Breaking change (fix or feature that may cause functionality impact) - [ ] Other # Checklist: - [x] My code follows the style and contribution guidelines of this project. - [x] I have tested and validated my code changes.
1 parent 6a1e4e1 commit 8546802

File tree

1 file changed

+14
-11
lines changed

1 file changed

+14
-11
lines changed

src/modules/SdnDiag.Server.psm1

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2569,16 +2569,19 @@ function Get-SdnVMNetworkAdapter {
25692569
Import-Module -Name Hyper-V -Force -ErrorAction Stop
25702570
}
25712571

2572-
# remove the credential parameter if it is empty to avoid passing it to the cmdlet
2572+
$vmNetworkAdaptersParams = $PSBoundParameters
2573+
[void]$vmNetworkAdaptersParams.Remove('MacAddress')
25732574
if ($Credential -eq [System.Management.Automation.PSCredential]::Empty) {
2574-
[void]$PSBoundParameters.Remove('Credential')
2575+
[void]$vmNetworkAdaptersParams.Remove('Credential')
25752576
}
25762577

25772578
try {
2578-
$adapters = Get-VMNetworkAdapter @PSBoundParameters
2579-
if ($PSBoundParameters.ContainsKey('MacAddress')) {
2579+
$adapters = Get-VMNetworkAdapter @vmNetworkAdaptersParams
2580+
2581+
if ($MacAddress) {
25802582
$macAddress = Format-SdnMacAddress -MacAddress $MacAddress
2581-
$adapters = $adapters | Where-Object { $_.MacAddress -eq $MacAddress }
2583+
$macAddress1 = Format-SdnMacAddress -MacAddress $MacAddress -Dashes
2584+
$adapters = $adapters | Where-Object { $_.MacAddress -eq $MacAddress -or $_.MacAddress -eq $macAddress1 }
25822585
}
25832586

25842587
return ($adapters | Sort-Object -Property Name)
@@ -2811,12 +2814,12 @@ function Set-SdnVMNetworkAdapterPortProfile {
28112814

28122815
[System.Guid]$portProfileFeatureId = "9940cd46-8b06-43bb-b9d5-93d50381fd56"
28132816
[System.Guid]$vendorId = "1FA41B39-B444-4E43-B35A-E1F7985FD548"
2814-
$vmAdapterParams = $PSBoundParameters
2815-
[void]$vmAdapterParams.Remove('ProfileId')
2816-
[void]$vmAdapterParams.Remove('ProfileData')
2817-
if ($PSBoundParameters.ContainsKey('HostVmNic')) {
2818-
[void]$vmAdapterParams.Remove('HostVmNic')
2819-
$vmAdapterParams.Add('ManagementOS', $HostVmNic)
2817+
$vmAdapterParams = @{
2818+
VMName = $VMName
2819+
MacAddress = $MacAddress
2820+
}
2821+
if ($HostVmNic) {
2822+
$vmAdapterParams.Add('ManagementOS', $true)
28202823
}
28212824

28222825
$vmNic = Get-SdnVmNetworkAdapter @vmAdapterParams

0 commit comments

Comments
 (0)