Merge pull request #207 from microsoft/users/mduppre/CloudAgentVmHydr…

…ation [DRAFT] Hydration PoC - adding cloudagent
microsoft · Mar 25, 2024 · a18e826 · a18e826
2 parents 84d0364 + 2b8694e
commit a18e826
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 5 deletions.
diff --git a/services/compute/virtualmachine/client.go b/services/compute/virtualmachine/client.go
@@ -18,6 +18,7 @@ import (
 type Service interface {
 	Get(context.Context, string, string) (*[]compute.VirtualMachine, error)
 	CreateOrUpdate(context.Context, string, string, *compute.VirtualMachine) (*compute.VirtualMachine, error)
+	Hydrate(context.Context, string, string) (*compute.VirtualMachine, error)
 	Delete(context.Context, string, string) error
 	Query(context.Context, string, string) (*[]compute.VirtualMachine, error)
 	Start(context.Context, string, string) error
@@ -58,6 +59,11 @@ func (c *VirtualMachineClient) CreateOrUpdate(ctx context.Context, group, name s
 	return c.internal.CreateOrUpdate(ctx, group, name, compute)
 }
 
+// Hydrate methods invokes create or update on the client
+func (c *VirtualMachineClient) Hydrate(ctx context.Context, group, name string) (*compute.VirtualMachine, error) {
+	return c.internal.Hydrate(ctx, group, name)
+}
+
 // Delete methods invokes delete of the compute resource
 func (c *VirtualMachineClient) Delete(ctx context.Context, group string, name string) error {
 	return c.internal.Delete(ctx, group, name)

diff --git a/services/compute/virtualmachine/virtualmachine.go b/services/compute/virtualmachine/virtualmachine.go
@@ -457,13 +457,13 @@ func (c *client) getVirtualMachine(vm *wssdcloudcompute.VirtualMachine, group st
 		vmtype = compute.StackedControlPlane
 	}
 	return &compute.VirtualMachine{
-		Name: &vm.Name,
-		ID:   &vm.Id,
-		Tags: getComputeTags(vm.GetTags()),
+		Name:                     &vm.Name,
+		ID:                       &vm.Id,
+		Tags:                     getComputeTags(vm.GetTags()),
 		VirtualMachineProperties: &compute.VirtualMachineProperties{
 			ProvisioningState:       status.GetProvisioningState(vm.GetStatus().GetProvisioningStatus()),
 			ValidationStatus:        status.GetValidationStatus(vm.GetStatus()),
-			Statuses:                c.getVirtualMachineStatuses(vm),
+			// Statuses:                c.getVirtualMachineStatuses(vm),
 			StorageProfile:          c.getVirtualMachineStorageProfile(vm.Storage),
 			HardwareProfile:         c.getVirtualMachineHardwareProfile(vm),
 			SecurityProfile:         c.getVirtualMachineSecurityProfile(vm),
@@ -475,7 +475,7 @@ func (c *client) getVirtualMachine(vm *wssdcloudcompute.VirtualMachine, group st
 			DisableHighAvailability: &vm.DisableHighAvailability,
 			Host:                    c.getVirtualMachineHostDescription(vm),
 		},
-		Version:  &vm.Status.Version.Number,
+		// Version:  &vm.Status.Version.Number,
 		Location: &vm.LocationName,
 	}
 }

diff --git a/services/compute/virtualmachine/wssd.go b/services/compute/virtualmachine/wssd.go
@@ -77,6 +77,24 @@ func (c *client) CreateOrUpdate(ctx context.Context, group, name string, sg *com
 	return &(*vms)[0], nil
 }
 
+// Hydrate
+func (c *client) Hydrate(ctx context.Context, group, name string) (*compute.VirtualMachine, error) {
+	request, err := c.getVirtualMachineRequest(wssdcloudproto.Operation_HYDRATE, group, name, nil)
+	if err != nil {
+		return nil, err
+	}
+	response, err := c.VirtualMachineAgentClient.Invoke(ctx, request)
+	if err != nil {
+		return nil, err
+	}
+	vms := c.getVirtualMachineFromResponse(response, group)
+	if len(*vms) == 0 {
+		return nil, fmt.Errorf("Hydration of Virtual Machine failed to unknown reason.")
+	}
+
+	return &(*vms)[0], nil
+}
+
 // Delete methods invokes create or update on the client
 func (c *client) Delete(ctx context.Context, group, name string) error {
 	vm, err := c.Get(ctx, group, name)