Updated pricing

Author: moul

pkg/pricing/basket_test.go

@@ -45,15 +45,15 @@ func TestBasket_Total(t *testing.T) {
 
 			err := basket.Add(NewUsageByPathWithQuantity("/compute/c1/run", big.NewRat(1, 1)))
 			So(err, ShouldBeNil)
-			So(basket.Total(), ShouldEqualBigRat, big.NewRat(72, 100)) // 0.72
+			So(basket.Total(), ShouldEqualBigRat, big.NewRat(12, 100)) // 0.12
 
 			err = basket.Add(NewUsageByPathWithQuantity("/compute/c1/run", big.NewRat(42, 1)))
 			So(err, ShouldBeNil)
-			So(basket.Total(), ShouldEqualBigRat, big.NewRat(144, 100)) // 1.44
+			So(basket.Total(), ShouldEqualBigRat, big.NewRat(24, 100)) // 0.24
 
 			err = basket.Add(NewUsageByPathWithQuantity("/compute/c1/run", big.NewRat(600, 1)))
 			So(err, ShouldBeNil)
-			So(basket.Total(), ShouldEqualBigRat, big.NewRat(744, 100)) // 7.44
+			So(basket.Total(), ShouldEqualBigRat, big.NewRat(124, 100)) // 1.24
 		})
 		Convey("1 compute instance with 2 volumes and 1 ip", func() {
 			basket := NewBasket()
@@ -65,23 +65,23 @@ func TestBasket_Total(t *testing.T) {
 			So(basket.Length(), ShouldEqual, 4)
 
 			basket.SetDuration(1 * time.Minute)
-			So(basket.Total(), ShouldEqualBigRat, big.NewRat(136, 100)) // 1.36
+			So(basket.Total(), ShouldEqualBigRat, big.NewRat(44, 100)) // 0.44
 
 			basket.SetDuration(1 * time.Hour)
-			So(basket.Total(), ShouldEqualBigRat, big.NewRat(136, 100)) // 1.36
+			So(basket.Total(), ShouldEqualBigRat, big.NewRat(44, 100)) // 0.44
 
 			basket.SetDuration(2 * time.Hour)
-			So(basket.Total(), ShouldEqualBigRat, big.NewRat(232, 100)) // 2.32
+			So(basket.Total(), ShouldEqualBigRat, big.NewRat(68, 100)) // 0.68
 
 			basket.SetDuration(2 * 24 * time.Hour)
-			So(basket.Total(), ShouldEqualBigRat, big.NewRat(8399, 1000)) // 8.399
+			So(basket.Total(), ShouldEqualBigRat, big.NewRat(219, 100)) // 2.19
 
 			basket.SetDuration(30 * 24 * time.Hour)
-			So(basket.Total(), ShouldEqualBigRat, big.NewRat(11999, 1000)) // 11.999
+			So(basket.Total(), ShouldEqualBigRat, big.NewRat(399, 100)) // 3.99
 
 			// FIXME: this test is false, the capacity is per month
 			basket.SetDuration(365 * 24 * time.Hour)
-			So(basket.Total(), ShouldEqualBigRat, big.NewRat(11999, 1000)) // 11.999
+			So(basket.Total(), ShouldEqualBigRat, big.NewRat(399, 100)) // 3.99
 		})
 	})
 }

pkg/pricing/pricing.go

@@ -27,38 +27,38 @@ func init() {
 	CurrentPricing = PricingList{
 		{
 			Path:             "/compute/c1/run",
-			Identifier:       "aaaaaaaa-aaaa-4aaa-8aaa-111111111111",
+			Identifier:       "aaaaaaaa-aaaa-4aaa-8aaa-111111111112",
 			Currency:         "EUR",
-			UnitPrice:        big.NewRat(12, 1000),    // 0.012
+			UnitPrice:        big.NewRat(2, 1000),     // 0.002
 			UnitQuantity:     big.NewRat(60000, 1000), // 60
-			UnitPriceCap:     big.NewRat(6000, 1000),  // 6
+			UnitPriceCap:     big.NewRat(1000, 1000),  // 1
 			UsageGranularity: time.Minute,
 		},
 		{
 			Path:             "/ip/dynamic",
-			Identifier:       "467116bf-4631-49fb-905b-e07701c2db11",
+			Identifier:       "467116bf-4631-49fb-905b-e07701c21111",
 			Currency:         "EUR",
-			UnitPrice:        big.NewRat(4, 1000),     // 0.004
+			UnitPrice:        big.NewRat(2, 1000),     // 0.002
 			UnitQuantity:     big.NewRat(60000, 1000), // 60
-			UnitPriceCap:     big.NewRat(1999, 1000),  // 1.99
+			UnitPriceCap:     big.NewRat(990, 1000),   // 0.99
 			UsageGranularity: time.Minute,
 		},
 		{
 			Path:             "/ip/reserved",
-			Identifier:       "467116bf-4631-49fb-905b-e07701c2db22",
+			Identifier:       "467116bf-4631-49fb-905b-e07701c22222",
 			Currency:         "EUR",
-			UnitPrice:        big.NewRat(4, 1000),     // 0.004
+			UnitPrice:        big.NewRat(2, 1000),     // 0.002
 			UnitQuantity:     big.NewRat(60000, 1000), // 60
-			UnitPriceCap:     big.NewRat(1990, 1000),  // 1.99
+			UnitPriceCap:     big.NewRat(990, 1000),   // 0.99
 			UsageGranularity: time.Minute,
 		},
 		{
 			Path:             "/storage/local/ssd/storage",
-			Identifier:       "bbbbbbbb-bbbb-4bbb-8bbb-111111111113",
+			Identifier:       "bbbbbbbb-bbbb-4bbb-8bbb-111111111144",
 			Currency:         "EUR",
-			UnitPrice:        big.NewRat(4, 1000),     // 0.004
+			UnitPrice:        big.NewRat(2, 1000),     // 0.002
 			UnitQuantity:     big.NewRat(50000, 1000), // 50
-			UnitPriceCap:     big.NewRat(2000, 1000),  // 2
+			UnitPriceCap:     big.NewRat(1000, 1000),  // 1
 			UsageGranularity: time.Hour,
 		},
 	}

pkg/pricing/pricing_test.go

@@ -23,7 +23,7 @@ func TestGetByPath(t *testing.T) {
 
 func TestGetByIdentifier(t *testing.T) {
 	Convey("Testing GetByIdentifier", t, func() {
-		object := CurrentPricing.GetByIdentifier("aaaaaaaa-aaaa-4aaa-8aaa-111111111111")
+		object := CurrentPricing.GetByIdentifier("aaaaaaaa-aaaa-4aaa-8aaa-111111111112")
 		So(object, ShouldNotBeNil)
 		So(object.Path, ShouldEqual, "/compute/c1/run")