vm connect changes (#328)

Co-authored-by: Harika Vedati <havedati@microsoft.com>

Author: hvedati

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/Azure/go-autorest/autorest/date v0.3.0
 	github.com/google/go-cmp v0.6.0
 	github.com/google/uuid v1.6.0
-	github.com/microsoft/moc v0.30.4
+	github.com/microsoft/moc v0.31.1
 	google.golang.org/grpc v1.72.0
 	k8s.io/klog v1.0.0
 	sigs.k8s.io/controller-runtime v0.20.4

go.sum

@@ -122,8 +122,8 @@ github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0V
 github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
 github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
-github.com/microsoft/moc v0.30.4 h1:CdP494TaHqhBrwn12ojBAqy5UvgHdNXWQYOz3l1dtjg=
-github.com/microsoft/moc v0.30.4/go.mod h1:OZ1rc2/qs9AVRKCLfwY0N8R+ZXJlVz5UyWYS5vNH4m0=
+github.com/microsoft/moc v0.31.1 h1:JtmQAKErI4DfDAZHbSF8U1sVg7sRue6PzL3PIZICre4=
+github.com/microsoft/moc v0.31.1/go.mod h1:OZ1rc2/qs9AVRKCLfwY0N8R+ZXJlVz5UyWYS5vNH4m0=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=

services/compute/compute.go

@@ -1313,3 +1313,15 @@ type ZoneConfiguration struct {
 	// Strict Placement
 	StrictPlacement *bool `json:"strictPlacement,omitempty"`
 }
+
+type VirtualMachineHyperVVmId struct {
+	HyperVVmId *string `json:"hyperVVmId ,omitempty"`
+}
+
+type VirtualMachineHostNodeName struct {
+	HostNodeName *string `json:"hostNodeName ,omitempty"`
+}
+
+type VirtualMachineHostNodeIpAddress struct {
+	HostNodeIpAddress *string `json:"hostNodeIpAddress ,omitempty"`
+}

services/compute/virtualmachine/client.go

@@ -30,6 +30,9 @@ type Service interface {
 	Validate(context.Context, string, string) error
 	Precheck(context.Context, string, []*compute.VirtualMachine) (bool, error)
 	RemoveIsoDisk(context.Context, string, string) error
+	GetHyperVVmId(context.Context, string, string) (*compute.VirtualMachineHyperVVmId, error)
+	GetHostNodeName(context.Context, string, string) (*compute.VirtualMachineHostNodeName, error)
+	GetHostNodeIpAddress(context.Context, string, string) (*compute.VirtualMachineHostNodeIpAddress, error)
 }
 
 type VirtualMachineClient struct {
@@ -396,3 +399,15 @@ func (c *VirtualMachineClient) Validate(ctx context.Context, group, name string)
 func (c *VirtualMachineClient) Precheck(ctx context.Context, group string, vms []*compute.VirtualMachine) (bool, error) {
 	return c.internal.Precheck(ctx, group, vms)
 }
+
+func (c *VirtualMachineClient) GetHyperVVmId(ctx context.Context, group string, name string) (*compute.VirtualMachineHyperVVmId, error) {
+	return c.internal.GetHyperVVmId(ctx, group, name)
+}
+
+func (c *VirtualMachineClient) GetHostNodeName(ctx context.Context, group string, name string) (*compute.VirtualMachineHostNodeName, error) {
+	return c.internal.GetHostNodeName(ctx, group, name)
+}
+
+func (c *VirtualMachineClient) GetHostNodeIpAddress(ctx context.Context, group string, name string) (*compute.VirtualMachineHostNodeIpAddress, error) {
+	return c.internal.GetHostNodeIpAddress(ctx, group, name)
+}

services/compute/virtualmachine/wssd.go

@@ -410,3 +410,67 @@ func (c *client) virtualMachineValidations(opType wssdcloudproto.Operation, vmss
 	}
 	return nil
 }
+
+func (c *client) GetHyperVVmId(ctx context.Context, group, name string) (*compute.VirtualMachineHyperVVmId, error) {
+	vm, err := c.get(ctx, group, name)
+	if err != nil {
+		return nil, err
+	}
+
+	if len(vm) == 0 {
+		return nil, fmt.Errorf("Virtual machine [%s] not found", name)
+	}
+	mocResponse, err := c.VirtualMachineAgentClient.GetHyperVVmId(ctx, vm[0])
+	if err != nil {
+		return nil, err
+	}
+
+	response := &compute.VirtualMachineHyperVVmId{
+		HyperVVmId: &mocResponse.HyperVVmId,
+	}
+
+	return response, nil
+}
+
+func (c *client) GetHostNodeName(ctx context.Context, group, name string) (*compute.VirtualMachineHostNodeName, error) {
+	vm, err := c.get(ctx, group, name)
+	if err != nil {
+		return nil, err
+	}
+
+	if len(vm) == 0 {
+		return nil, fmt.Errorf("Virtual machine [%s] not found", name)
+	}
+	mocResponse, err := c.VirtualMachineAgentClient.GetHostNodeName(ctx, vm[0])
+	if err != nil {
+		return nil, err
+	}
+
+	response := &compute.VirtualMachineHostNodeName{
+		HostNodeName: &mocResponse.HostNodeName,
+	}
+
+	return response, nil
+}
+
+func (c *client) GetHostNodeIpAddress(ctx context.Context, group, name string) (*compute.VirtualMachineHostNodeIpAddress, error) {
+
+	vm, err := c.get(ctx, group, name)
+	if err != nil {
+		return nil, err
+	}
+
+	if len(vm) == 0 {
+		return nil, fmt.Errorf("Virtual machine [%s] not found", name)
+	}
+	mocResponse, err := c.VirtualMachineAgentClient.GetHostNodeIpAddress(ctx, vm[0])
+	if err != nil {
+		return nil, err
+	}
+
+	response := &compute.VirtualMachineHostNodeIpAddress{
+		HostNodeIpAddress: &mocResponse.HostNodeIpAddress,
+	}
+
+	return response, nil
+}