test: Update gce cloudmock

Author: Camila-B

cloudmock/gce/mock_gce_cloud.go

@@ -70,7 +70,6 @@ func (c *MockGCECloud) AllResources() map[string]interface{} {
 	return c.computeClient.AllResources()
 }
 
-// GetCloudGroups is not implemented yet
 func (c *MockGCECloud) GetCloudGroups(cluster *kops.Cluster, instancegroups []*kops.InstanceGroup, options *fi.GetCloudGroupsOptions, nodes []v1.Node) (map[string]*cloudinstances.CloudInstanceGroup, error) {
 	return gce.GetCloudGroups(c, cluster, instancegroups, options, nodes)
 }
@@ -167,8 +166,7 @@ func (c *MockGCECloud) Labels() map[string]string {
 
 // DeleteGroup implements fi.Cloud::DeleteGroup
 func (c *MockGCECloud) DeleteGroup(g *cloudinstances.CloudInstanceGroup) error {
-	return nil
-	//	return deleteCloudInstanceGroup(c, g)
+	return gce.DeleteCloudInstanceGroup(c, g)
 }
 
 // DeleteInstance deletes a GCE instance

cloudmock/gce/mockcompute/api.go

@@ -50,6 +50,8 @@ var _ gce.ComputeClient = &MockClient{}
 
 // NewMockClient creates a new mock client.
 func NewMockClient(project string) *MockClient {
+	instanceClient := newInstanceClient()
+
 	return &MockClient{
 		projectClient: newProjectClient(project),
 		zoneClient:    newZoneClient(project),
@@ -66,8 +68,8 @@ func NewMockClient(project string) *MockClient {
 		routerClient:           newRouterClient(),
 
 		instanceTemplateClient:     newInstanceTemplateClient(),
-		instanceGroupManagerClient: newInstanceGroupManagerClient(),
-		instanceClient:             newInstanceClient(),
+		instanceGroupManagerClient: newInstanceGroupManagerClient(instanceClient),
+		instanceClient:             instanceClient,
 		targetPoolClient:           newTargetPoolClient(),
 
 		diskClient: newDiskClient(),

cloudmock/gce/mockcompute/instance.go

@@ -56,14 +56,29 @@ func (c *instanceClient) Insert(project, zone string, instance *compute.Instance
 		instances = map[string]*compute.Instance{}
 		zones[zone] = instances
 	}
-	instance.SelfLink = fmt.Sprintf("https://www.googleapis.com/compute/v1/projects/%s/zones/%s/instances/%s", project, zone, instance.Name)
+	instance.SelfLink = instance.Name
 	instances[instance.Name] = instance
 
 	return doneOperation(), nil
 }
 
 func (c *instanceClient) Delete(project, zone, name string) (*compute.Operation, error) {
-	return nil, fmt.Errorf("delete unimplemented")
+	c.Lock()
+	defer c.Unlock()
+
+	zones, ok := c.instances[project]
+	if !ok {
+		return nil, notFoundError()
+	}
+	instances, ok := zones[zone]
+	if !ok {
+		return nil, notFoundError()
+	}
+	if _, ok := instances[name]; !ok {
+		return nil, notFoundError()
+	}
+	delete(instances, name)
+	return doneOperation(), nil
 }
 
 func (c *instanceClient) Get(project, zone, name string) (*compute.Instance, error) {

cloudmock/gce/mockcompute/instance_group_manager.go

@@ -28,17 +28,20 @@ import (
 type instanceGroupManagerClient struct {
 	// instanceGroupManagers are instanceGroupManagers keyed by project, zone, and name.
 	instanceGroupManagers map[string]map[string]map[string]*compute.InstanceGroupManager
-	// instances are instances keyed by project, zone, and name.
-	instances map[string]map[string]map[string]*compute.ManagedInstance
+	// managedInstances are managedInstances keyed by project, zone, and name.
+	managedInstances map[string]map[string]map[string]*compute.ManagedInstance
+	// instanceClient is the client for instances.
+	instanceClient gce.InstanceClient
 	sync.Mutex
 }
 
 var _ gce.InstanceGroupManagerClient = &instanceGroupManagerClient{}
 
-func newInstanceGroupManagerClient() *instanceGroupManagerClient {
+func newInstanceGroupManagerClient(instanceClient gce.InstanceClient) *instanceGroupManagerClient {
 	return &instanceGroupManagerClient{
 		instanceGroupManagers: map[string]map[string]map[string]*compute.InstanceGroupManager{},
-		instances:             map[string]map[string]map[string]*compute.ManagedInstance{},
+		managedInstances:      map[string]map[string]map[string]*compute.ManagedInstance{},
+		instanceClient:        instanceClient,
 	}
 }
 
@@ -72,22 +75,25 @@ func (c *instanceGroupManagerClient) Insert(project, zone string, igm *compute.I
 	igm.SelfLink = fmt.Sprintf("https://www.googleapis.com/compute/v1/projects/%s/zones/%s/instanceGroupManagers/%s", project, zone, igm.Name)
 	igms[igm.Name] = igm
 
-	newInstance := &compute.ManagedInstance{
-		Instance: fmt.Sprintf("https://www.googleapis.com/compute/v1/projects/%s/zones/%s/instances/%s", project, zone, igm.Name),
+	newInstance := &compute.Instance{
+		Name: igm.Name,
 	}
 
-	instanceZones, ok := c.instances[project]
+	c.instanceClient.Insert(project, zone, newInstance)
+
+	instanceZones, ok := c.managedInstances[project]
 	if !ok {
 		instanceZones = map[string]map[string]*compute.ManagedInstance{}
-		c.instances[project] = instanceZones
+		c.managedInstances[project] = instanceZones
 	}
-	instanceIgms, ok := instanceZones[zone]
+	_, ok = instanceZones[zone]
 	if !ok {
-		instanceIgms = map[string]*compute.ManagedInstance{}
-		instanceZones[zone] = instanceIgms
+		instanceZones[zone] = map[string]*compute.ManagedInstance{}
 	}
 
-	c.instances[project][zone][igm.Name] = newInstance
+	c.managedInstances[project][zone][igm.Name] = &compute.ManagedInstance{
+		Instance: fmt.Sprintf("https://www.googleapis.com/compute/v1/projects/%s/zones/%s/instances/%s", project, zone, igm.Name),
+	}
 
 	return doneOperation(), nil
 }
@@ -150,7 +156,7 @@ func (c *instanceGroupManagerClient) ListManagedInstances(ctx context.Context, p
 	c.Lock()
 	defer c.Unlock()
 
-	zones, ok := c.instances[project]
+	zones, ok := c.managedInstances[project]
 	if !ok {
 		return nil, nil
 	}