iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8017 from marcinbojko/master 

hyper-v fix when management interface is not part of virtual switch
This commit is contained in:
Megan Marsh 2019-09-03 11:15:51 -07:00 committed by GitHub
parent c475eb57ef d4ff29f6c5
commit 9f041216ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/powershell/hyperv/hyperv.go
View File

@ -32,10 +32,9 @@ type scriptOptions struct {
func GetHostAdapterIpAddressForSwitch(switchName string) (string, error) { func GetHostAdapterIpAddressForSwitch(switchName string) (string, error) {
var script = ` var script = `
param([string]$switchName, [int]$addressIndex) param([string]$switchName, [int]$addressIndex)
$HostVMAdapter = Hyper-V\Get-VMNetworkAdapter -ManagementOS -SwitchName $switchName $HostVMAdapter = Hyper-V\Get-VMNetworkAdapter -ManagementOS -SwitchName $switchName
if ($HostVMAdapter){ if ($HostVMAdapter){
$HostNetAdapter = Get-NetAdapter | ?{ $_.DeviceId -eq $HostVMAdapter.DeviceId } $HostNetAdapter = Get-NetAdapter | Where-Object { $_.DeviceId -eq $HostVMAdapter.DeviceId }
if ($HostNetAdapter){ if ($HostNetAdapter){
$HostNetAdapterIfIndex = @() $HostNetAdapterIfIndex = @()
$HostNetAdapterIfIndex += $HostNetAdapter.ifIndex $HostNetAdapterIfIndex += $HostNetAdapter.ifIndex
@ -45,7 +44,15 @@ if ($HostVMAdapter){
} }
} }
} }
else {
$HostNetAdapterConfiguration=@(Get-NetIPAddress -CimSession $env:computername -AddressFamily IPv4 | Where-Object { ( $_.InterfaceAlias -notmatch 'Loopback' ) -and ( $_.SuffixOrigin -notmatch "Link" )})
if ($HostNetAdapterConfiguration) {
return @($HostNetAdapterConfiguration.IpAddress)[$addressIndex]
}
else {
return $false return $false
}
}
` `
var ps powershell.PowerShellCmd var ps powershell.PowerShellCmd