Update pricing (fix #294)

Author: moul

README.md

@@ -1166,6 +1166,7 @@ $ scw inspect myserver | jq '.[0].public_ip.address'
 * `scw info` Use json fingerprint field exposed by API
 * Allow to override Region and Architecture when using the helpers to create a new volume from a human size
 * Do not check permissions on config file under Windows ([#282](https://github.com/scaleway/scaleway-cli/pull/282)) ([@ElNounch](https://github.com/ElNounch))
+* Update pricing ([#294](https://github.com/scaleway/scaleway-cli/issues/294))
 
 View full [commits list](https://github.com/scaleway/scaleway-cli/compare/v1.7.1...master)
 

pkg/pricing/basket_test.go

@@ -55,6 +55,36 @@ func TestBasket_Total(t *testing.T) {
 			So(err, ShouldBeNil)
 			So(basket.Total(), ShouldEqualBigRat, big.NewRat(24, 1000)) // 0.024
 		})
+		Convey("1 server of each type", func() {
+			basket := NewBasket()
+			So(basket, ShouldNotBeNil)
+			So(basket.Total(), ShouldEqualBigRat, ratZero)
+
+			basket.Add(NewUsageByPath("/compute/c1/run"))
+			basket.Add(NewUsageByPath("/compute/c2s/run"))
+			basket.Add(NewUsageByPath("/compute/c2m/run"))
+			basket.Add(NewUsageByPath("/compute/c2l/run"))
+			basket.Add(NewUsageByPath("/compute/vc1/run"))
+
+			basket.SetDuration(1 * time.Minute)
+			So(basket.Total(), ShouldEqualBigRat, big.NewRat(100, 1000)) // 0.1
+
+			basket.SetDuration(1 * time.Hour)
+			So(basket.Total(), ShouldEqualBigRat, big.NewRat(100, 1000)) // 0.1
+
+			basket.SetDuration(2 * time.Hour)
+			So(basket.Total(), ShouldEqualBigRat, big.NewRat(200, 1000)) // 0.2
+
+			basket.SetDuration(24 * time.Hour)
+			So(basket.Total(), ShouldEqualBigRat, big.NewRat(2400, 1000)) // 2.4
+
+			basket.SetDuration(30 * 24 * time.Hour)
+			So(basket.Total(), ShouldEqualBigRat, big.NewRat(50000, 1000)) // 50
+
+			// FIXME: this test if false, the capacity is per month
+			basket.SetDuration(365 * 24 * time.Hour)
+			So(basket.Total(), ShouldEqualBigRat, big.NewRat(50000, 1000)) // 40
+		})
 		Convey("1 compute instance with 2 volumes and 1 ip", func() {
 			basket := NewBasket()
 

pkg/pricing/pricing.go

@@ -36,6 +36,42 @@ func init() {
 			UnitPriceCap:     big.NewRat(1000, 1000),  // 1
 			UsageGranularity: time.Minute,
 		},
+		{
+			Path:             "/compute/c2s/run",
+			Identifier:       "aaaaaaaa-aaaa-4aaa-8aaa-222222222222",
+			Currency:         "EUR",
+			UnitPrice:        big.NewRat(20, 1000),    // 0.02
+			UnitQuantity:     big.NewRat(60000, 1000), // 60
+			UnitPriceCap:     big.NewRat(10000, 1000), // 10
+			UsageGranularity: time.Minute,
+		},
+		{
+			Path:             "/compute/c2m/run",
+			Identifier:       "aaaaaaaa-aaaa-4aaa-8aaa-444444444444",
+			Currency:         "EUR",
+			UnitPrice:        big.NewRat(32, 1000),    // 0.032
+			UnitQuantity:     big.NewRat(60000, 1000), // 60
+			UnitPriceCap:     big.NewRat(16000, 1000), // 16
+			UsageGranularity: time.Minute,
+		},
+		{
+			Path:             "/compute/c2l/run",
+			Identifier:       "aaaaaaaa-aaaa-4aaa-8aaa-333333333333",
+			Currency:         "EUR",
+			UnitPrice:        big.NewRat(44, 1000),    // 0.044
+			UnitQuantity:     big.NewRat(60000, 1000), // 60
+			UnitPriceCap:     big.NewRat(22000, 1000), // 22
+			UsageGranularity: time.Minute,
+		},
+		{
+			Path:             "/compute/vc1/run",
+			Identifier:       "cccccccc-6ab1-4131-a35e-000000000001",
+			Currency:         "EUR",
+			UnitPrice:        big.NewRat(2, 1000),     // 0.002
+			UnitQuantity:     big.NewRat(60000, 1000), // 60
+			UnitPriceCap:     big.NewRat(1000, 1000),  // 1
+			UsageGranularity: time.Minute,
+		},
 		{
 			Path:             "/ip/dynamic",
 			Identifier:       "467116bf-4631-49fb-905b-e07701c21111",