Преглед изворни кода

Revert "add support for pricing by storage class"

This reverts commit 4f69fd692c980ca83115584c8c87639744dc478d.
Ajay Tripathy пре 3 година
родитељ
комит
d7aa6e87f0
3 измењених фајлова са 0 додато и 41 уклоњено
  1. 0 2
      configs/pricing_schema_pv_storageclass.csv
  2. 0 7
      pkg/cloud/csvprovider.go
  3. 0 32
      test/cloud_test.go

+ 0 - 2
configs/pricing_schema_pv_storageclass.csv

@@ -1,2 +0,0 @@
-EndTimestamp,InstanceID,Region,AssetClass,InstanceIDField,InstanceType,MarketPriceHourly,Version
-2019-04-17 23:34:22 UTC,storageClass0,,pv,spec.storageClassName,,0.1338,

+ 0 - 7
pkg/cloud/csvprovider.go

@@ -341,13 +341,6 @@ func PVValueFromMapField(m string, n *v1.PersistentVolume) string {
 			log.Infof("[ERROR] Unsupported InstanceIDField %s in CSV For PV", m)
 			log.Infof("[ERROR] Unsupported InstanceIDField %s in CSV For PV", m)
 			return ""
 			return ""
 		}
 		}
-	} else if len(mf) > 1 && mf[0] == "spec" {
-		if mf[1] == "storageClassName" {
-			return n.Spec.StorageClassName
-		} else {
-			log.Infof("[ERROR] Unsupported InstanceIDField %s in CSV For PV", m)
-			return ""
-		}
 	} else {
 	} else {
 		log.Errorf("Unsupported InstanceIDField %s in CSV For PV", m)
 		log.Errorf("Unsupported InstanceIDField %s in CSV For PV", m)
 		return ""
 		return ""

+ 0 - 32
test/cloud_test.go

@@ -125,38 +125,6 @@ func TestPVPriceFromCSV(t *testing.T) {
 
 
 }
 }
 
 
-func TestPVPriceFromCSVStorageClass(t *testing.T) {
-	nameWant := "pvc-08e1f205-d7a9-4430-90fc-7b3965a18c4d"
-	storageClassWant := "storageclass0"
-	pv := &v1.PersistentVolume{}
-	pv.Name = nameWant
-	pv.Spec.StorageClassName = storageClassWant
-
-	confMan := config.NewConfigFileManager(&config.ConfigFileManagerOpts{
-		LocalConfigPath: "./",
-	})
-
-	wantPrice := "0.1338"
-	c := &cloud.CSVProvider{
-		CSVLocation: "../configs/pricing_schema_pv_storageclass.csv",
-		CustomProvider: &cloud.CustomProvider{
-			Config: cloud.NewProviderConfig(confMan, "../configs/default.json"),
-		},
-	}
-	c.DownloadPricingData()
-	k := c.GetPVKey(pv, make(map[string]string), "")
-	resPV, err := c.PVPricing(k)
-	if err != nil {
-		t.Errorf("Error in NodePricing: %s", err.Error())
-	} else {
-		gotPrice := resPV.Cost
-		if gotPrice != wantPrice {
-			t.Errorf("Wanted price '%s' got price '%s'", wantPrice, gotPrice)
-		}
-	}
-
-}
-
 func TestNodePriceFromCSVWithGPU(t *testing.T) {
 func TestNodePriceFromCSVWithGPU(t *testing.T) {
 	providerIDWant := "providerid"
 	providerIDWant := "providerid"
 	nameWant := "gke-standard-cluster-1-pool-1-91dc432d-cg69"
 	nameWant := "gke-standard-cluster-1-pool-1-91dc432d-cg69"