Skip to content

Commit

Permalink
Add network backing info to simplify network comparisons
Browse files Browse the repository at this point in the history 
This should fix the issue where NSX-T opaque networks were not properly matching up between the VM NIC and the network switch.
  • Loading branch information
@sneal
sneal committed Sep 8, 2022
1 parent ff3db81 commit 1e58974
Show file tree
Hide file tree
Showing 2 changed files with 96 additions and 86 deletions.
71 changes: 70 additions & 1 deletion pkg/vcenter/adapter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,74 @@
package vcenter

import (
"fmt"
"github.com/vmware/govmomi/vim25/types"
)

type AdapterNotFoundError struct {
vmName string
networkName string
}

func NewAdapterNotFoundError(vmName, networkName string) *AdapterNotFoundError {
return &AdapterNotFoundError{
vmName: vmName,
networkName: networkName,
}
}

func (e *AdapterNotFoundError) Error() string {
return fmt.Sprintf("no network interface found for VM %s on network %s", e.vmName, e.networkName)
}

type anyNetworkBackingInfo struct {
info types.BaseVirtualDeviceBackingInfo
}

func (i anyNetworkBackingInfo) Equal(other anyNetworkBackingInfo) bool {
return i.NetworkID() == other.NetworkID()
}

func (i anyNetworkBackingInfo) NetworkID() string {
switch i.info.(type) {
case *types.VirtualEthernetCardDistributedVirtualPortBackingInfo:
bi, _ := i.info.(*types.VirtualEthernetCardDistributedVirtualPortBackingInfo)
return bi.Port.PortgroupKey
case *types.VirtualEthernetCardNetworkBackingInfo:
bi, _ := i.info.(*types.VirtualEthernetCardNetworkBackingInfo)
return bi.Network.Value
case *types.VirtualEthernetCardOpaqueNetworkBackingInfo:
bi, _ := i.info.(*types.VirtualEthernetCardOpaqueNetworkBackingInfo)
return bi.OpaqueNetworkId
default:
return ""
}
}

func (i anyNetworkBackingInfo) String() string {
return fmt.Sprintf("%v", i.info)
}

type anyAdapter struct {
*types.VirtualVmxnet3
*types.VirtualE1000
}

func (a *anyAdapter) Device() types.BaseVirtualDevice {
func (a anyAdapter) BackingNetworkInfo() anyNetworkBackingInfo {
if a.VirtualE1000 != nil {
return anyNetworkBackingInfo{
info: a.VirtualE1000.Backing,
}
} else if a.VirtualVmxnet3 != nil {
return anyNetworkBackingInfo{
info: a.VirtualVmxnet3.Backing,
}
} else {
panic("bug: no supported vNICs found")
}
}

func (a anyAdapter) Device() types.BaseVirtualDevice {
if a.VirtualE1000 != nil {
return a.VirtualE1000
} else if a.VirtualVmxnet3 != nil {
Expand All @@ -23,3 +82,13 @@ func (a *anyAdapter) Device() types.BaseVirtualDevice {
panic("bug: no supported vNICs found")
}
}

func (a anyAdapter) String() string {
if a.VirtualE1000 != nil {
return fmt.Sprintf("%v", a.VirtualE1000)
} else if a.VirtualVmxnet3 != nil {
return fmt.Sprintf("%v", a.VirtualVmxnet3)
} else {
panic("bug: no supported vNICs found")
}
}
111 changes: 26 additions & 85 deletions pkg/vcenter/finder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,22 +29,6 @@ func NewFinder(datacenter string, client *govmomi.Client) *Finder {
}
}

type AdapterNotFoundError struct {
vmName string
networkName string
}

func NewAdapterNotFoundError(vmName, networkName string) *AdapterNotFoundError {
return &AdapterNotFoundError{
vmName: vmName,
networkName: networkName,
}
}

func (e *AdapterNotFoundError) Error() string {
return fmt.Sprintf("no network interface found for VM %s on network %s", e.vmName, e.networkName)
}

func (f *Finder) HostsInCluster(ctx context.Context, clusterName string) ([]*object.HostSystem, error) {
l := log.FromContext(ctx)
l.Debugf("Finding hosts in cluster %s", clusterName)
Expand Down Expand Up @@ -283,6 +267,8 @@ func (f *Finder) AdapterBackingInfo(ctx context.Context, networkName string) (ty
if err != nil {
return nil, fmt.Errorf("failed to find target network %s: %w", networkName, err)
}
log.FromContext(ctx).Debugf("Found network %s (%s) with path: %s",
networkName, network.Reference().Value, network.GetInventoryPath())

networkBackingInfo, err := network.EthernetCardBackingInfo(ctx)
if err != nil {
Expand All @@ -301,12 +287,13 @@ func (f *Finder) Adapter(ctx context.Context, vmName, networkName string) (*anyA
return nil, err
}

network, err := finder.Network(ctx, networkName)
ni, err := f.AdapterBackingInfo(ctx, networkName)
if err != nil {
return nil, fmt.Errorf("failed to find network %s: %w", networkName, err)
return nil, err
}
netBackingInfo := anyNetworkBackingInfo{
info: ni,
}
l.Debugf("Found network %s (%s) with path: %s",
networkName, network.Reference().Value, network.GetInventoryPath())

vm, err := finder.VirtualMachine(ctx, vmName)
if err != nil {
Expand All @@ -319,74 +306,28 @@ func (f *Finder) Adapter(ctx context.Context, vmName, networkName string) (*anyA
}

for _, d := range virtualDeviceList {
switch d.(type) {
switch a := d.(type) {
case *types.VirtualVmxnet3:
l.Debugf("Found a Vmxnet3 network adapter, seeing if it's attached to %s", networkName)
var anyAdapter anyAdapter
anyAdapter.VirtualVmxnet3 = d.(*types.VirtualVmxnet3)

switch anyAdapter.VirtualVmxnet3.Backing.(type) {
case *types.VirtualEthernetCardDistributedVirtualPortBackingInfo:
info, _ := anyAdapter.VirtualVmxnet3.Backing.(*types.VirtualEthernetCardDistributedVirtualPortBackingInfo)
if info.Port.PortgroupKey == network.Reference().Value {
l.Debugf("Found Vmxnet3 attached to NVDS %s", networkName)
return &anyAdapter, nil
} else {
l.Debugf("Vmxnet3 with distributed ethernet net id %s was not attached to %s (%s), continuing search",
info.Port.PortgroupKey, networkName, network.Reference().Value)
}
case *types.VirtualEthernetCardNetworkBackingInfo:
info, _ := anyAdapter.VirtualVmxnet3.Backing.(*types.VirtualEthernetCardNetworkBackingInfo)
if info.Network.Value == network.Reference().Value {
l.Debugf("Found Vmxnet3 attached to VDS %s", networkName)
return &anyAdapter, nil
} else {
l.Debugf("Vmxnet3 with standard ethernet net id %s was not attached to %s (%s), continuing search",
info.Network.Value, networkName, network.Reference().Value)
}
case *types.VirtualEthernetCardOpaqueNetworkBackingInfo:
info, _ := anyAdapter.VirtualVmxnet3.Backing.(*types.VirtualEthernetCardOpaqueNetworkBackingInfo)
if info.OpaqueNetworkId == network.Reference().Value {
l.Debugf("Found Vmxnet3 attached to NSX-T %s", networkName)
return &anyAdapter, nil
} else {
l.Debugf("Vmxnet3 with opaque net id %s was not attached to %s (%s), continuing search",
info.OpaqueNetworkId, networkName, network.Reference().Value)
}
netAdapter := anyAdapter{
VirtualVmxnet3: a,
}
if netAdapter.BackingNetworkInfo().Equal(netBackingInfo) {
l.Debugf("Found %s VMXNET3 attached to network %s", vmName, networkName)
return &netAdapter, nil
} else {
l.Debugf("%s VMXNET3 (%s) was not attached to %s (%s), continuing search",
vmName, netAdapter, networkName, netBackingInfo)
}
case *types.VirtualE1000:
l.Debugf("Found a E1000 network adapter, seeing if it's attached to %s", networkName)
var anyAdapter anyAdapter
anyAdapter.VirtualE1000 = d.(*types.VirtualE1000)

switch anyAdapter.VirtualE1000.Backing.(type) {
case *types.VirtualEthernetCardDistributedVirtualPortBackingInfo:
info, _ := anyAdapter.VirtualE1000.Backing.(*types.VirtualEthernetCardDistributedVirtualPortBackingInfo)
if info.Port.PortgroupKey == network.Reference().Value {
l.Debugf("Found E1000 attached to NVDS %s", networkName)
return &anyAdapter, nil
} else {
l.Debugf("E1000 with distributed ethernet net id %s was not attached to %s (%s), continuing search",
info.Port.PortgroupKey, networkName, network.Reference().Value)
}
case *types.VirtualEthernetCardNetworkBackingInfo:
info, _ := anyAdapter.VirtualE1000.Backing.(*types.VirtualEthernetCardNetworkBackingInfo)
if info.Network.Value == network.Reference().Value {
l.Debugf("Found E1000 attached to VDS %s", networkName)
return &anyAdapter, nil
} else {
l.Debugf("E1000 with standard ethernet net id %s was not attached to %s (%s), continuing search",
info.Network.Value, networkName, network.Reference().Value)
}
case *types.VirtualEthernetCardOpaqueNetworkBackingInfo:
info, _ := anyAdapter.VirtualE1000.Backing.(*types.VirtualEthernetCardOpaqueNetworkBackingInfo)
if info.OpaqueNetworkId == network.Reference().Value {
l.Debugf("Found E1000 attached to NSX-T %s", networkName)
return &anyAdapter, nil
} else {
l.Debugf("E1000 with opaque net id %s was not attached to %s (%s), continuing search",
info.OpaqueNetworkId, networkName, network.Reference().Value)
}
netAdapter := anyAdapter{
VirtualE1000: a,
}
if netAdapter.BackingNetworkInfo().Equal(netBackingInfo) {
l.Debugf("Found %s E1000 attached to network %s", vmName, networkName)
return &netAdapter, nil
} else {
l.Debugf("%s E1000 (%s) was not attached to %s (%s), continuing search",
vmName, netAdapter, networkName, netBackingInfo)
}
}
}
Expand Down

0 comments on commit 1e58974

Please sign in to comment.