Merge pull request #42 from madhanrm/pp

* Fix Setting PortProfile * Fix an error case in VM Creation
microsoft · Oct 1, 2020 · 64d026d · 64d026d
2 parents e24369d + d2d67d0
commit 64d026d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/pkg/virtualization/core/service/virtualmachine.go b/pkg/virtualization/core/service/virtualmachine.go
@@ -98,7 +98,7 @@ func (vmms *VirtualSystemManagementService) CreateVirtualMachine(settings *virtu
 		return
 	}
 	val, ok := result.OutMethodParams["ResultingSystem"]
-	if ok {
+	if ok && val.Value != nil {
 		vminstance, err := instance.GetWmiInstanceFromPath(vmms.GetWmiHost(), string(constant.Virtualization), val.Value.(string))
 		if err == nil {
 			vm, err = virtualsystem.NewVirtualMachine(vminstance)

diff --git a/pkg/virtualization/core/service/virtualmachinemanagementservice_test.go b/pkg/virtualization/core/service/virtualmachinemanagementservice_test.go
@@ -155,20 +155,18 @@ func TestVirtualMachineAdapterScenario(t *testing.T) {
 			t.Fatalf("Failed [%+v]", err)
 		}
 		t.Logf("Connect VM[%s] to VirtualSwitch[%s]", "test", "test")
-
 		err = vmms.SetVirtualNetworkAdapterAccessVLAN(testna, uint16(i))
 		if err != nil {
 			t.Fatalf("Failed [%+v]", err)
 		}
 		t.Logf("Set Adapter VLAN [%d]", i)
 		err = vmms.SetVirtualNetworkAdapterPortProfile(testna, "test",
-			"1fa41b39-b444-b35a-e1f7985fd548",
-			"00000000-0000-0000-000000000000", 1)
+			"1FA41B39-B444-4E43-B35A-E1F7985FD548",
+			"08cf6a3b-f4ea-48d9-a29c-60370363fb19", 1)
 		if err != nil {
-			t.Fatalf("Failed [%+v]", err)
+			t.Fatalf("Set PortProfile Failed [%+v]", err)
 		}
-		t.Logf("Set Adapter VLAN [%d]", i)
-
+		t.Logf("Set Adapter Port Profile [%d]", i)
 	}
 	for i := 1; i <= 4; i++ {
 		adapterName := fmt.Sprintf("testadapter-%d", i)

diff --git a/pkg/virtualization/core/service/virtualnetworkadapter.go b/pkg/virtualization/core/service/virtualnetworkadapter.go
@@ -279,7 +279,7 @@ func (vmms *VirtualSystemManagementService) SetVirtualNetworkAdapterPortProfile(
 	}
 	defer pasd.Close()
 
-	return vmms.AddEthernetFeatureEx1(vna.Msvm_EthernetPortAllocationSettingData, profileSettings.WmiInstance)
+	return vmms.AddEthernetFeatureEx1(pasd.Msvm_EthernetPortAllocationSettingData, profileSettings.WmiInstance)
 }
 
 func (vmms *VirtualSystemManagementService) SetVirtualNetworkAdapterPortIsolation(