dsccommunity · nyanhp · Jan 17, 2023 · Apr 18, 2023 · Apr 21, 2023 · Apr 21, 2023
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,6 +22,8 @@ For older change log history see the [historic changelog](HISTORIC_CHANGELOG.md)
     - Fix multiple DNS IP adresses does not work #190
     - NetworkSetting parameter is now optional and no default actions are taken if not specified
   - Switch to use VM image `windows-latest` to build phase.
+    - DeviceNaming parameter added #206
+    - MacAddressSpoofing parameter added #206
 
 ## [3.18.0] - 2022-06-04
 

diff --git a/source/DSCResources/DSC_VMHyperV/DSC_VMHyperV.psm1 b/source/DSCResources/DSC_VMHyperV/DSC_VMHyperV.psm1
@@ -362,7 +362,7 @@ function Set-TargetResource
                     if ($nic.SwitchName -ne $switch)
                     {
                         Write-Verbose -Message ($script:localizedData.VMPropertyShouldBe -f 'NIC', $switch, $nic.SwitchName)
-                        $nic | Connect-VMNetworkAdapter -SwitchName $switch
+                        Connect-VMNetworkAdapter -VMNetworkAdapter $nic -SwitchName $switch
                         Write-Verbose -Message ($script:localizedData.VMPropertySet -f 'NIC', $switch)
                     }
                 }

diff --git a/source/DSCResources/DSC_VMNetworkAdapter/DSC_VMNetworkAdapter.psm1 b/source/DSCResources/DSC_VMNetworkAdapter/DSC_VMNetworkAdapter.psm1
@@ -134,6 +134,12 @@ function Get-TargetResource
 .PARAMETER VlanId
     Specifies the Vlan Id for the network adapter.
 
+.PARAMETER DeviceNaming
+    Use this to enable or disable Device Naming. Default: Off
+
+.PARAMETER MacAddressSpoofing
+    Use this to enable or disable MAC address spoofing. Default: Off
+
 .PARAMETER Ensure
     Specifies if the network adapter should be Present or Absent.
 #>
@@ -170,6 +176,16 @@ function Set-TargetResource
         [System.String]
         $VlanId,
 
+        [Parameter()]
+        [ValidateSet('On', 'Off')]
+        [System.String]
+        $DeviceNaming = 'Off',
+
+        [Parameter()]
+        [ValidateSet('On', 'Off')]
+        [System.String]
+        $MacAddressSpoofing = 'Off',
+
         [Parameter()]
         [ValidateSet('Present', 'Absent')]
         [System.String]
@@ -205,34 +221,42 @@ function Set-TargetResource
                     if ($netAdapterExists.DynamicMacAddressEnabled)
                     {
                         Write-Verbose -Message $script:localizedData.EnableStaticMacAddress
-                        $updateMacAddress = $true
+                        $updateAdapter = $true
                     }
-                    elseif ($MacAddress -ne $netAdapterExists.StaicMacAddress)
+                    elseif ($MacAddress -ne $netAdapterExists.MacAddress)
                     {
                         Write-Verbose -Message $script:localizedData.EnableStaticMacAddress
-                        $updateMacAddress = $true
+                        $updateAdapter = $true
                     }
                 }
                 else
                 {
                     if (-not $netAdapterExists.DynamicMacAddressEnabled)
                     {
                         Write-Verbose -Message $script:localizedData.EnableDynamicMacAddress
-                        $updateMacAddress = $true
+                        $updateAdapter = $true
                     }
                 }
 
+                if ($netAdapterExists.DeviceNaming -ne $DeviceNaming)
+                {
+                    $updateAdapter = $true
+                }
+
                 if ($netAdapterExists.SwitchName -ne $SwitchName)
                 {
                     Write-Verbose -Message $script:localizedData.PerformSwitchConnect
                     Connect-VMNetworkAdapter -VMNetworkAdapter $netAdapterExists -SwitchName $SwitchName -ErrorAction Stop -Verbose
                 }
 
-                if (($updateMacAddress))
+                if (($updateAdapter))
                 {
                     Write-Verbose -Message $script:localizedData.PerformVMNetModify
 
-                    $setArguments = @{ }
+                    $setArguments = @{
+                        DeviceNaming       = $DeviceNaming
+                        MacAddressSpoofing = $MacAddressSpoofing
+                    }
                     $setArguments.Add('VMNetworkAdapter', $netAdapterExists)
                     if ($MacAddress)
                     {
@@ -259,9 +283,11 @@ function Set-TargetResource
                     $arguments.Add('StaticMacAddress', $MacAddress)
                 }
                 $arguments.Add('SwitchName', $SwitchName)
+                $arguments.Add('DeviceNaming', $DeviceNaming)
             }
             Write-Verbose -Message $script:localizedData.AddVMNetAdapter
             $netAdapterExists = Add-VMNetworkAdapter @arguments -Passthru -ErrorAction Stop
+            Set-VMNetworkAdapter -VMNetworkAdapter $netAdapterExists -MacAddressSpoofing $MacAddressSpoofing
         }
 
         if ($VmName -ne 'ManagementOS')
@@ -367,6 +393,12 @@ function Set-TargetResource
 .PARAMETER VlanId
     Specifies the Vlan Id for the network adapter.
 
+.PARAMETER DeviceNaming
+    Use this to enable or disable Device Naming. Default: Off
+
+.PARAMETER MacAddressSpoofing
+    Use this to enable or disable MAC address spoofing. Default: Off
+
 .PARAMETER Ensure
     Specifies if the network adapter should be Present or Absent.
 #>
@@ -404,6 +436,16 @@ function Test-TargetResource
         [System.String]
         $VlanId,
 
+        [Parameter()]
+        [ValidateSet('On', 'Off')]
+        [System.String]
+        $DeviceNaming = 'Off',
+
+        [Parameter()]
+        [ValidateSet('On', 'Off')]
+        [System.String]
+        $MacAddressSpoofing = 'Off',
+
         [Parameter()]
         [ValidateSet('Present', 'Absent')]
         [System.String]
@@ -554,10 +596,30 @@ function Test-TargetResource
                 }
                 else
                 {
-                    Write-Verbose -Message $script:localizedData.VMNetAdapterExistsNoActionNeeded
-                    return $true
+                    Write-Verbose -Message $script:localizedData.SwitchIsCorrect
+                }
+
+                if ($netAdapterExists.MacAddressSpoofing -ne $MacAddressSpoofing)
+                {
+                    Write-Verbose -Message $script:localizedData.SpoofingDifferent
+                    return $false
+                }
+                else
+                {
+                    Write-Verbose -Message $script:localizedData.SpoofingConfiguredNoActionNeeded
                 }
 
+                if ($netAdapterExists.DeviceNaming -ne $DeviceNaming)
+                {
+                    Write-Verbose -Message $script:localizedData.DeviceNamingDifferent
+                    return $false
+                }
+                else
+                {
+                    Write-Verbose -Message $script:localizedData.DeviceNamingConfiguredNoActionNeeded
+                }
+
+                return $true
             }
             else
             {

diff --git a/source/DSCResources/DSC_VMNetworkAdapter/DSC_VMNetworkAdapter.schema.mof b/source/DSCResources/DSC_VMNetworkAdapter/DSC_VMNetworkAdapter.schema.mof
@@ -19,5 +19,7 @@ class DSC_VMNetworkAdapter : OMI_BaseResource
     [Write, Description("Network Settings of the network adapter. If this parameter is not supplied, DHCP will be used."), EmbeddedInstance("VMNetworkAdapterNetworkSettings")] String NetworkSetting;
     [Write, Description("Use this to specify a Vlan id on the Network Adapter.")] String VlanId;
     [Write, Description("Ensures that the VM Network Adapter is Present or Absent. The default value is `Present`."), ValueMap{"Present","Absent"}, Values{"Present","Absent"}] String Ensure;
+    [Write, Description("Use this to enable or disable Device Naming. Default: Off"), ValueMap{"On","Off"}, Values{"On","Off"}] String DeviceNaming;
+    [Write, Description("Use this to enable or disable MAC address spoofing. Default: Off"), ValueMap{"On","Off"}, Values{"On","Off"}] String MacAddressSpoofing;
     [Read, Description("Returns `$true` if the network adapter uses a dynamic MAC address.")] Boolean DynamicMacAddress;
 };
diff --git a/source/DSCResources/DSC_VMNetworkAdapter/en-US/DSC_VMNetworkAdapter.strings.psd1 b/source/DSCResources/DSC_VMNetworkAdapter/en-US/DSC_VMNetworkAdapter.strings.psd1
@@ -26,5 +26,10 @@ ConvertFrom-StringData @'
     VMNetAdapterExistsShouldRemove=VM Network Adapter Exists. It will be removed.
     VMNetAdapterDoesNotExistNoActionNeeded=VM Network adapter does not exist. No action needed.
     SwitchIsDifferent=Net Adapter is not connected to the requested switch.
+    SwitchIsCorrect=Net Adapter is connected to the requested switch.
     PerformSwitchConnect=Connecting VM Net adapter to the right switch.
+    SpoofingDifferent=MAC address spoofing configuration does not match.
+    SpoofingConfiguredNoActionNeeded=MAC address spoofing configured.
+    DeviceNamingDifferent=Device naming configuration does not match.
+    DeviceNamingConfiguredNoActionNeeded=Device naming configured.
 '@
diff --git a/tests/Unit/DSC_VMHyperV.Tests.ps1 b/tests/Unit/DSC_VMHyperV.Tests.ps1
@@ -46,13 +46,13 @@ try
             $StubVMConfig = New-Item -Path 'TestDrive:\TestVM.xml' -ItemType File
 
             # Mock the class VMNetworkAdapter to support piping to cmdlet Connect-VMNetworkAdapter
-            $stubNIC1 = [Microsoft.HyperV.PowerShell.VMNetworkAdapter]::CreateTypeInstance()
+            $stubNIC1 = [Microsoft.HyperV.PowerShell.VMNetworkAdapterBase]::CreateTypeInstance()
             $stubNIC1.SwitchName = 'Test Switch 1'
             $stubNIC1.MacAddress = 'AA-BB-CC-DD-EE-FF'
             $stubNIC1.IpAddresses = @('192.168.0.1', '10.0.0.1')
 
             # Mock the class VMNetworkAdapter to support piping to cmdlet Connect-VMNetworkAdapter
-            $stubNIC2 = [Microsoft.HyperV.PowerShell.VMNetworkAdapter]::CreateTypeInstance()
+            $stubNIC2 = [Microsoft.HyperV.PowerShell.VMNetworkAdapterBase]::CreateTypeInstance()
             $stubNIC2.SwitchName = 'Test Switch 2'
             $stubNIC2.MacAddress = 'AA-BB-CC-DD-EE-FE'
             $stubNIC2.IpAddresses = @('192.168.1.1')
@@ -602,7 +602,7 @@ try
                 Mock -CommandName Stop-VM -MockWith { return $true } # requires output to be able to pipe something into Remove-VM
                 Mock -CommandName Remove-VM -MockWith { return $true }
                 Mock -CommandName Set-VMNetworkAdapter -MockWith { return $true }
-                Mock -CommandName Get-VMNetworkAdapter -MockWith { return $stubVM.NetworkAdapters.IpAddresses }
+                Mock -CommandName Get-VMNetworkAdapter -MockWith { return $stubVM.NetworkAdapters }
                 Mock -CommandName Set-VMState -MockWith { return $true }
                 Mock -CommandName Set-VMMemory