Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update pricing #345

Merged
merged 3 commits into from
Apr 12, 2016
Merged

Update pricing #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86f9a01
Add new models pricing (#293)
moul Apr 8, 2016
31261ff
Using dynamic commercial type for 'scw _billing' (#293)
moul Apr 8, 2016
a2c30b3
Update Changelog
moul Apr 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1191,6 +1191,7 @@ $ scw inspect myserver | jq '.[0].public_ip.address'
* Add `ScalewayIPV6Definition`
* Add marketplace alias in the cache to resolve image ([#330](https://github.com/scaleway/scaleway-cli/issues/330))
* `scw _userdata` handles `@~/path/to/file` ([#321](https://github.com/scaleway/scaleway-cli/issues/321))
* Update `scw _billing` for new instance types ([#293](https://github.com/scaleway/scaleway-cli/issues/293))

View full [commits list](https://github.com/scaleway/scaleway-cli/compare/v1.9.0...master)

Expand Down
6 changes: 4 additions & 2 deletions pkg/cli/x_billing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ package cli
import (
"fmt"
"math/big"
"strings"
"text/tabwriter"
"time"

Expand Down Expand Up @@ -75,17 +76,18 @@ func runBilling(cmd *Command, rawArgs []string) error {
if server.State != "running" {
continue
}
commercialType := strings.ToLower(server.CommercialType)
shortID := utils.TruncIf(server.Identifier, 8, !args.NoTrunc)
shortName := utils.TruncIf(utils.Wordify(server.Name), 25, !args.NoTrunc)
modificationTime, _ := time.Parse("2006-01-02T15:04:05.000000+00:00", server.ModificationDate)
modificationAgo := time.Now().UTC().Sub(modificationTime)
shortModificationDate := units.HumanDuration(modificationAgo)
usage := pricing.NewUsageByPath("/compute/c1/run")
usage := pricing.NewUsageByPath(fmt.Sprintf("/compute/%s/run", commercialType))
usage.SetStartEnd(modificationTime, time.Now().UTC())

totalMonthPrice = totalMonthPrice.Add(totalMonthPrice, usage.Total())

fmt.Fprintf(w, "server/%s\t%s\t%s\t%s\n", shortID, shortName, shortModificationDate, usage.TotalString())
fmt.Fprintf(w, "server/%s/%s\t%s\t%s\t%s\n", commercialType, shortID, shortName, shortModificationDate, usage.TotalString())
}

fmt.Fprintf(w, "TOTAL\t\t\t%s\n", pricing.PriceString(totalMonthPrice, "EUR"))
Expand Down
16 changes: 9 additions & 7 deletions pkg/pricing/basket_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,26 +64,28 @@ func TestBasket_Total(t *testing.T) {
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.Add(NewUsageByPath("/compute/vc1s/run"))
basket.Add(NewUsageByPath("/compute/vc1m/run"))
basket.Add(NewUsageByPath("/compute/vc1l/run"))

basket.SetDuration(1 * time.Minute)
So(basket.Total(), ShouldEqualBigRat, big.NewRat(100, 1000)) // 0.1
So(basket.Total(), ShouldEqualBigRat, big.NewRat(116, 1000)) // 0.116

basket.SetDuration(1 * time.Hour)
So(basket.Total(), ShouldEqualBigRat, big.NewRat(100, 1000)) // 0.1
So(basket.Total(), ShouldEqualBigRat, big.NewRat(116, 1000)) // 0.116

basket.SetDuration(2 * time.Hour)
So(basket.Total(), ShouldEqualBigRat, big.NewRat(200, 1000)) // 0.2
So(basket.Total(), ShouldEqualBigRat, big.NewRat(232, 1000)) // 0.232

basket.SetDuration(24 * time.Hour)
So(basket.Total(), ShouldEqualBigRat, big.NewRat(2400, 1000)) // 2.4
So(basket.Total(), ShouldEqualBigRat, big.NewRat(2784, 1000)) // 2.784

basket.SetDuration(30 * 24 * time.Hour)
So(basket.Total(), ShouldEqualBigRat, big.NewRat(50000, 1000)) // 50
So(basket.Total(), ShouldEqualBigRat, big.NewRat(58000, 1000)) // 58

// 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
So(basket.Total(), ShouldEqualBigRat, big.NewRat(58000, 1000)) // 58
})
Convey("1 compute instance with 2 volumes and 1 ip", func() {
basket := NewBasket()
Expand Down
20 changes: 19 additions & 1 deletion pkg/pricing/pricing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,32 @@ func init() {
UsageGranularity: time.Minute,
},
{
Path: "/compute/vc1/run",
Path: "/compute/vc1s/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: "/compute/vc1m/run",
Identifier: "cccccccc-6ab1-4131-a35e-000000000002",
Currency: "EUR",
UnitPrice: big.NewRat(6, 1000), // 0.006
UnitQuantity: big.NewRat(60000, 1000), // 60
UnitPriceCap: big.NewRat(3000, 1000), // 3
UsageGranularity: time.Minute,
},
{
Path: "/compute/vc1l/run",
Identifier: "cccccccc-6ab1-4131-a35e-000000000003",
Currency: "EUR",
UnitPrice: big.NewRat(10, 1000), // 0.01
UnitQuantity: big.NewRat(60000, 1000), // 60
UnitPriceCap: big.NewRat(5000, 1000), // 5
UsageGranularity: time.Minute,
},
{
Path: "/ip/dynamic",
Identifier: "467116bf-4631-49fb-905b-e07701c21111",
Expand Down