Skip to content

Commit

Permalink
Temporarily use VirtualMachineDiscovery
Browse files Browse the repository at this point in the history
  • Loading branch information
mduppre committed Apr 4, 2024
1 parent d24c670 commit 608350f
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 4 deletions.
4 changes: 2 additions & 2 deletions services/compute/virtualmachine/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ type Service interface {
RepairGuestAgent(context.Context, string, string) error
RunCommand(context.Context, string, string, *compute.VirtualMachineRunCommandRequest) (*compute.VirtualMachineRunCommandResponse, error)
Validate(context.Context, string, string) error
DiscoverVm(context.Context) (*[]compute.VirtualMachine, error)
DiscoverVm(context.Context) (*[]compute.VirtualMachineDiscovery, error)
}

type VirtualMachineClient struct {
Expand Down Expand Up @@ -378,6 +378,6 @@ func (c *VirtualMachineClient) Validate(ctx context.Context, group, name string)
return c.internal.Validate(ctx, group, name)
}

func (c *VirtualMachineClient) DiscoverVm(ctx context.Context) (*[]compute.VirtualMachine, error) {
func (c *VirtualMachineClient) DiscoverVm(ctx context.Context) (*[]compute.VirtualMachineDiscovery, error) {
return c.internal.DiscoverVm(ctx)
}
18 changes: 16 additions & 2 deletions services/compute/virtualmachine/wssd.go
Original file line number Diff line number Diff line change
Expand Up @@ -218,14 +218,28 @@ func (c *client) Validate(ctx context.Context, group, name string) error {
}

// Discover VMs on this cluster node
func (c *client) DiscoverVm(ctx context.Context) (*[]compute.VirtualMachine, error) {
func (c *client) DiscoverVm(ctx context.Context) (*[]compute.VirtualMachineDiscovery, error) {
request, err := c.getVirtualMachineRequest(wssdcloudproto.Operation_DISCOVERVM, "", "", nil)
if err != nil {
return nil, err
}
response, err := c.VirtualMachineAgentClient.Invoke(ctx, request)

return c.getVirtualMachineFromResponse(response, ""), nil
vms := c.getVirtualMachineFromResponse(response, "")

vmdiscoverys := []compute.VirtualMachineDiscovery{}
for _, vm := range *vms {
vmdiscovery := compute.VirtualMachineDiscovery{
VmId: vm.ID,
VmName: vm.Name,
PowerState: vm.VirtualMachineProperties.Statuses["PowerState"],
}

vmdiscoverys = append(vmdiscoverys, vmdiscovery)
}

return &vmdiscoverys, nil

}

// Private methods
Expand Down

0 comments on commit 608350f

Please sign in to comment.