From d2d67d08826ef330715f9ae9686b0393729f1317 Mon Sep 17 00:00:00 2001 From: Madhan Raj Mookkandy Date: Wed, 30 Sep 2020 21:32:06 -0700 Subject: [PATCH] * Fix Setting PortProfile * Fix an error case in VM Creation --- pkg/virtualization/core/service/virtualmachine.go | 2 +- .../service/virtualmachinemanagementservice_test.go | 10 ++++------ .../core/service/virtualnetworkadapter.go | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkg/virtualization/core/service/virtualmachine.go b/pkg/virtualization/core/service/virtualmachine.go index b1771ff29d..2b29cd2d0e 100644 --- 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 index 357b4b00b1..c089529423 100644 --- 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 index 0d3d6383b2..0856d0eadd 100644 --- 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(