Removed obsolete GCP CVS driver

Author: clintonk

cli/cmd/get_backend_test.go

@@ -56,7 +56,7 @@ func getFakeBackends1() []storage.BackendExternal {
 			State:       storage.Online,
 			Online:      true,
 			Config: map[string]interface{}{
-				"storageDriverName": "gcp-cvs",
+				"storageDriverName": "gcp-gcnv",
 			},
 			Volumes: []string{},
 		},
@@ -122,7 +122,7 @@ func TestGetBackendCmd_RunE(t *testing.T) {
 							State:       storage.Online,
 							Online:      true,
 							Config: map[string]interface{}{
-								"storageDriverName": "gcp-cvs",
+								"storageDriverName": "gcp-gcnv",
 							},
 						},
 					})

config/config.go

@@ -262,7 +262,6 @@ const (
 	OntapSANEconomyStorageDriverName   = "ontap-san-economy"
 	SolidfireSANStorageDriverName      = "solidfire-san"
 	AzureNASStorageDriverName          = "azure-netapp-files"
-	GCPNFSStorageDriverName            = "gcp-cvs"
 	GCNVNASStorageDriverName           = "google-cloud-netapp-volumes"
 	FakeStorageDriverName              = "fake"
 

core/orchestrator_core_test.go

@@ -7833,8 +7833,8 @@ func TestListLogLayers(t *testing.T) {
 	layers, err := o.ListLogLayers(ctx())
 	expected := []string{
 		"all", "azure-netapp-files", "core", "crd_frontend", "csi_frontend", "docker_frontend",
-		"fake", "gcp-cvs", "ontap-nas", "ontap-nas-economy", "ontap-nas-flexgroup",
-		"ontap-san", "ontap-san-economy", "persistent_store", "rest_frontend", "solidfire-san",
+		"fake", "ontap-nas", "ontap-nas-economy", "ontap-nas-flexgroup", "ontap-san", "ontap-san-economy",
+		"persistent_store", "rest_frontend", "solidfire-san",
 	}
 	assert.Equal(t, expected, layers)
 	assert.NoError(t, err)

logging/defined_log_layers.go

@@ -20,7 +20,6 @@ const (
 	LogLayerPersistentStore         = LogLayer("persistent_store")
 	LogLayerANFNASDriver            = LogLayer(AzureNASStorageDriverName)
 	LogLayerSolidfireDriver         = LogLayer(SolidfireSANStorageDriverName)
-	LogLayerGCPNASDriver            = LogLayer(GCPNFSStorageDriverName)
 	LogLayerGCNVNASDriver           = LogLayer(GCNVNASStorageDriverName)
 	LogLayerOntapNASDriver          = LogLayer(OntapNASStorageDriverName)
 	LogLayerOntapNASFlexgroupDriver = LogLayer(OntapNASFlexGroupStorageDriverName)
@@ -42,7 +41,6 @@ var layers = []LogLayer{
 	LogLayerPersistentStore,
 	LogLayerANFNASDriver,
 	LogLayerSolidfireDriver,
-	LogLayerGCPNASDriver,
 	LogLayerOntapNASDriver,
 	LogLayerOntapNASFlexgroupDriver,
 	LogLayerOntapNASQtreeDriver,

logging/logger_test.go

@@ -736,8 +736,8 @@ func TestSetContextLogLayer(t *testing.T) {
 func TestListLogLayers(t *testing.T) {
 	assert.Equal(t, []string{
 		"all", "azure-netapp-files", "core", "crd_frontend", "csi_frontend", "docker_frontend",
-		"fake", "gcp-cvs", "ontap-nas", "ontap-nas-economy", "ontap-nas-flexgroup",
-		"ontap-san", "ontap-san-economy", "persistent_store", "rest_frontend", "solidfire-san",
+		"fake", "ontap-nas", "ontap-nas-economy", "ontap-nas-flexgroup", "ontap-san", "ontap-san-economy",
+		"persistent_store", "rest_frontend", "solidfire-san",
 	}, ListLogLayers())
 }