Added topology to ValidateVolumeCapabilities, fixed spelling, added metadata comment

Author: davidz627

pkg/gce-cloud-provider/metadata/metadata.go

@@ -22,6 +22,8 @@ import (
 	"cloud.google.com/go/compute/metadata"
 )
 
+// MetadataService is a fakeable interface exposing necessary data
+// from the GCE Metadata service
 type MetadataService interface {
 	GetZone() string
 	GetProject() string

pkg/gce-pd-csi-driver/controller.go

@@ -98,7 +98,7 @@ func (gceCS *GCEControllerServer) CreateVolume(ctx context.Context, req *csi.Cre
 	}
 
 	// Topology overwrites Storage Class Params if specified
-	// TODO: Support preferred toplogies.
+	// TODO: Support preferred topologies.
 	if req.GetAccessibilityRequirements() != nil {
 		if len(configuredZone) != 0 {
 			return nil, status.Error(codes.InvalidArgument, fmt.Sprintf("CreateVolume only one of parameter zone or topology zone may be specified"))
@@ -369,11 +369,11 @@ func (gceCS *GCEControllerServer) ValidateVolumeCapabilities(ctx context.Context
 	glog.V(5).Infof("Using default ValidateVolumeCapabilities")
 	// Validate Arguments
 	if req.GetVolumeCapabilities() == nil || len(req.GetVolumeCapabilities()) == 0 {
-		return nil, status.Error(codes.InvalidArgument, "ControllerUnpublishVolume Volume Capabilities must be provided")
+		return nil, status.Error(codes.InvalidArgument, "ValidateVolumeCapabilities Volume Capabilities must be provided")
 	}
 	volumeID := req.GetVolumeId()
 	if len(volumeID) == 0 {
-		return nil, status.Error(codes.InvalidArgument, "ControllerUnpublishVolume Volume ID must be provided")
+		return nil, status.Error(codes.InvalidArgument, "ValidateVolumeCapabilities Volume ID must be provided")
 	}
 	z, n, err := common.SplitZoneNameId(volumeID)
 	if err != nil {
@@ -403,6 +403,29 @@ func (gceCS *GCEControllerServer) ValidateVolumeCapabilities(ctx context.Context
 		// TODO: Ignoring mount & block types for now.
 	}
 
+	for _, top := range req.GetAccessibleTopology(){
+		for k,v := range top.GetSegments(){
+			switch k{
+			case common.TopologyKeyZone:
+				// take the zone from v and see if it matches with zone
+				if v == z{
+					// Accessible zone matches with storage zone
+					return &csi.ValidateVolumeCapabilitiesResponse{
+						Supported: true,
+					}
+				} else{
+					// Accessible zone does not match
+					return &csi.ValidateVolumeCapabilitiesResponse{
+						Supported: false,
+						Message: fmt.Sprintf("Volume %s is not accesible from topology %s:%s", volumeID, k,v)
+					}
+				}
+			case default:
+				return nil, status.Error(codes.InvalidArgument, "ValidateVolumeCapabilities unknown topology segment key")
+			}
+		}
+	}
+
 	return &csi.ValidateVolumeCapabilitiesResponse{
 		Supported: true,
 	}, nil
@@ -501,10 +524,10 @@ func pickTopology(top *csi.TopologyRequirement) (string, error) {
 	reqTop := top.GetRequisite()
 	prefTop := top.GetPreferred()
 
-	// Pick the preferred toplogy in order
+	// Pick the preferred topology in order
 	if len(prefTop) != 0 {
 		if prefTop[0].GetSegments() == nil {
-			return "", fmt.Errorf("preferred toplogies specified specified but no segments")
+			return "", fmt.Errorf("preferred topologies specified but no segments")
 		}
 
 		// GCE PD cloud provider Create has no restrictions so just create in top preferred zone
@@ -516,7 +539,7 @@ func pickTopology(top *csi.TopologyRequirement) (string, error) {
 	} else if len(reqTop) != 0 {
 		r := rand.Intn(len(reqTop))
 		if reqTop[r].GetSegments() == nil {
-			return "", fmt.Errorf("requisite toplogies specified specified but no segments in requisite topology %v", r)
+			return "", fmt.Errorf("requisite topologies specified but no segments in requisite topology %v", r)
 		}
 
 		zone, err := getZoneFromSegment(reqTop[r].GetSegments())

test/e2e/tests/multi_zone_e2e_test.go

@@ -28,7 +28,7 @@ var _ = Describe("GCE PD CSI Driver Multi-Zone", func() {
 		// I Think there should be a better way of guaranteeing this. Like a map from zone to instance for testInstances (?)
 	})
 
-	It("Should get reasonable toplogy from nodes with NodeGetInfo", func() {
+	It("Should get reasonable topology from nodes with NodeGetInfo", func() {
 		for _, instance := range testInstances {
 			testContext, err := testutils.SetupNewDriverAndClient(instance)
 			Expect(err).To(BeNil(), "Set up new Driver and Client failed with error")

test/e2e/tests/single_zone_e2e_test.go

@@ -132,7 +132,7 @@ var _ = Describe("GCE PD CSI Driver", func() {
 
 	})
 
-	It("Should create disks in correct zones when toplogy is specified", func() {
+	It("Should create disks in correct zones when topology is specified", func() {
 		///
 		Expect(testInstances).NotTo(BeEmpty())
 		testContext, err := testutils.SetupNewDriverAndClient(testInstances[0])