Added unit tests for identity server, fixed small spec inconsistency

Author: davidz627

cmd/main.go

@@ -35,6 +35,10 @@ var (
 	nodeID     = flag.String("nodeid", "", "node id")
 )
 
+const (
+	vendorVersion = "0.3.0"
+)
+
 func main() {
 	flag.Parse()
 

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

@@ -26,8 +26,9 @@ import (
 )
 
 type GCEDriver struct {
-	name   string
-	nodeID string
+	name          string
+	nodeID        string
+	vendorVersion string
 
 	ids *GCEIdentityServer
 	ns  *GCENodeServer
@@ -38,11 +39,15 @@ type GCEDriver struct {
 	nscap []*csi.NodeServiceCapability
 }
 
+const (
+	vendorVersion = "v0.3.0-alpha"
+)
+
 func GetGCEDriver() *GCEDriver {
 	return &GCEDriver{}
 }
 
-func (gceDriver *GCEDriver) SetupGCEDriver(cloudProvider gce.GCECompute, mounter mountmanager.Mounter, name string, nodeID string) error {
+func (gceDriver *GCEDriver) SetupGCEDriver(cloudProvider gce.GCECompute, mounter mountmanager.Mounter, name, nodeID string) error {
 	if name == "" {
 		return fmt.Errorf("Driver name missing")
 	}
@@ -52,6 +57,7 @@ func (gceDriver *GCEDriver) SetupGCEDriver(cloudProvider gce.GCECompute, mounter
 
 	gceDriver.name = name
 	gceDriver.nodeID = nodeID
+	gceDriver.vendorVersion = vendorVersion
 
 	// Adding Capabilities
 	vcam := []csi.VolumeCapability_AccessMode_Mode{

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

@@ -35,7 +35,8 @@ func (gceIdentity *GCEIdentityServer) GetPluginInfo(ctx context.Context, req *cs
 	}
 
 	return &csi.GetPluginInfoResponse{
-		Name: gceIdentity.Driver.name,
+		Name:          gceIdentity.Driver.name,
+		VendorVersion: gceIdentity.Driver.vendorVersion,
 	}, nil
 }
 

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

@@ -13,3 +13,70 @@ limitations under the License.
 */
 
 package gceGCEDriver
+
+import (
+	"testing"
+
+	csi "github.com/container-storage-interface/spec/lib/go/csi/v0"
+	"golang.org/x/net/context"
+)
+
+const (
+	vendorVersion = "0.3.0"
+)
+
+func TestGetPluginInfo(t *testing.T) {
+	gceDriver := GetGCEDriver()
+	err := gceDriver.SetupGCEDriver(nil, nil, driver, node)
+	if err != nil {
+		t.Fatalf("Failed to setup GCE Driver: %v", err)
+	}
+
+	resp, err := gceDriver.ids.GetPluginInfo(context.TODO(), &csi.GetPluginInfoRequest{})
+	if err != nil {
+		t.Fatalf("GetPluginInfo returned unexpected error: %v", err)
+	}
+
+	if resp.GetName() != driver {
+		t.Fatalf("Response name expected: %v, got: %v", driver, resp.GetName())
+	}
+
+	respVer := resp.GetVendorVersion()
+	if respVer != vendorVersion {
+		t.Fatalf("Vendor version expected: %v, got: %v", vendorVersion, respVer)
+	}
+}
+
+func TestGetPluginCapabilities(t *testing.T) {
+	gceDriver := GetGCEDriver()
+	err := gceDriver.SetupGCEDriver(nil, nil, driver, node)
+	if err != nil {
+		t.Fatalf("Failed to setup GCE Driver: %v", err)
+	}
+
+	resp, err := gceDriver.ids.GetPluginCapabilities(context.TODO(), &csi.GetPluginCapabilitiesRequest{})
+	if err != nil {
+		t.Fatalf("GetPluginCapabilities returned unexpected error: %v", err)
+	}
+
+	for _, capability := range resp.GetCapabilities() {
+		switch capability.GetService().GetType() {
+		case csi.PluginCapability_Service_CONTROLLER_SERVICE:
+		default:
+			t.Fatalf("Unknown capability: %v", capability.GetService().GetType())
+		}
+	}
+}
+
+func TestProbe(t *testing.T) {
+	gceDriver := GetGCEDriver()
+	err := gceDriver.SetupGCEDriver(nil, nil, driver, node)
+	if err != nil {
+		t.Fatalf("Failed to setup GCE Driver: %v", err)
+	}
+
+	_, err = gceDriver.ids.Probe(context.TODO(), &csi.ProbeRequest{})
+	if err != nil {
+		t.Fatalf("Probe returned unexpected error: %v", err)
+	}
+}

test/sanity/sanity_test.go

@@ -29,6 +29,7 @@ func TestSanity(t *testing.T) {
 	// Set up variables
 	driverName := "test-driver"
 	nodeID := "io.kubernetes.storage.mock"
+	vendorVersion := "0.3.0"
 	project := "test-project"
 	zone := "test-zone"
 	// TODO(dyzz): Only one of these can be correct, the way endpoint is defined in GCE driver is INCORRECT