Skip to content

Commit

Permalink
fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Quentin Brosse committed Apr 3, 2020
1 parent 37b7998 commit 4324b03
Show file tree
Hide file tree
Showing 2 changed files with 86 additions and 34 deletions.
98 changes: 75 additions & 23 deletions ...rnal/namespaces/instance/v1/testdata/test-server-type-list-server-type-list.cassette.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ interactions:
form: {}
headers:
User-Agent:
- scaleway-sdk-go/v1.0.0-beta.5+dev (go1.13.1; darwin; amd64) cli-e2e-test
- scaleway-sdk-go/v1.0.0-beta.6+dev (go1.13.6; darwin; amd64) cli-e2e-test
url: https://api.scaleway.com/instance/v1/zones/fr-par-1/products/servers
method: GET
response:
Expand Down Expand Up @@ -114,26 +114,26 @@ interactions:
15.99, "hourly_price": 0.032, "capabilities": {"boot_types": ["bootscript",
"rescue", "local"], "default_boot_type": "local", "hot_snapshots_local_volume":
true, "placement_groups": true, "block_storage": true, "private_network": 8},
"network": {"ipv6_support": true, "sum_internal_bandwidth": 104857600, "sum_internet_bandwidth":
419430400, "interfaces": [{"internal_bandwidth": 104857600, "internet_bandwidth":
"network": {"ipv6_support": true, "sum_internal_bandwidth": 419430400, "sum_internet_bandwidth":
419430400, "interfaces": [{"internal_bandwidth": 419430400, "internet_bandwidth":
null}, {"internal_bandwidth": null, "internet_bandwidth": 419430400}]}}, "DEV1-M":
{"alt_names": [], "arch": "x86_64", "ncpus": 3, "ram": 4294967296, "gpu": null,
"volumes_constraint": {"min_size": 40000000000, "max_size": 40000000000}, "per_volume_constraint":
{"l_ssd": {"min_size": 1000000000, "max_size": 800000000000}}, "baremetal":
false, "monthly_price": 7.99, "hourly_price": 0.016, "capabilities": {"boot_types":
["bootscript", "rescue", "local"], "default_boot_type": "local", "hot_snapshots_local_volume":
true, "placement_groups": true, "block_storage": true, "private_network": 8},
"network": {"ipv6_support": true, "sum_internal_bandwidth": 104857600, "sum_internet_bandwidth":
314572800, "interfaces": [{"internal_bandwidth": 104857600, "internet_bandwidth":
"network": {"ipv6_support": true, "sum_internal_bandwidth": 314572800, "sum_internet_bandwidth":
314572800, "interfaces": [{"internal_bandwidth": 314572800, "internet_bandwidth":
null}, {"internal_bandwidth": null, "internet_bandwidth": 314572800}]}}, "DEV1-S":
{"alt_names": [], "arch": "x86_64", "ncpus": 2, "ram": 2147483648, "gpu": null,
"volumes_constraint": {"min_size": 20000000000, "max_size": 20000000000}, "per_volume_constraint":
{"l_ssd": {"min_size": 1000000000, "max_size": 800000000000}}, "baremetal":
false, "monthly_price": 2.99, "hourly_price": 0.006, "capabilities": {"boot_types":
["bootscript", "rescue", "local"], "default_boot_type": "local", "hot_snapshots_local_volume":
true, "placement_groups": true, "block_storage": true, "private_network": 8},
"network": {"ipv6_support": true, "sum_internal_bandwidth": 104857600, "sum_internet_bandwidth":
209715200, "interfaces": [{"internal_bandwidth": 104857600, "internet_bandwidth":
"network": {"ipv6_support": true, "sum_internal_bandwidth": 209715200, "sum_internet_bandwidth":
209715200, "interfaces": [{"internal_bandwidth": 209715200, "internet_bandwidth":
null}, {"internal_bandwidth": null, "internet_bandwidth": 209715200}]}}, "DEV1-XL":
{"alt_names": [], "arch": "x86_64", "ncpus": 4, "ram": 12884901888, "gpu": null,
"volumes_constraint": {"min_size": 120000000000, "max_size": 120000000000},
Expand All @@ -142,62 +142,62 @@ interactions:
{"boot_types": ["bootscript", "rescue", "local"], "default_boot_type": "local",
"hot_snapshots_local_volume": true, "placement_groups": true, "block_storage":
true, "private_network": 8}, "network": {"ipv6_support": true, "sum_internal_bandwidth":
104857600, "sum_internet_bandwidth": 524288000, "interfaces": [{"internal_bandwidth":
104857600, "internet_bandwidth": null}, {"internal_bandwidth": null, "internet_bandwidth":
524288000, "sum_internet_bandwidth": 524288000, "interfaces": [{"internal_bandwidth":
524288000, "internet_bandwidth": null}, {"internal_bandwidth": null, "internet_bandwidth":
524288000}]}}, "GP1-L": {"alt_names": [], "arch": "x86_64", "ncpus": 32, "ram":
137438953472, "gpu": null, "volumes_constraint": {"min_size": 600000000000,
"max_size": 600000000000}, "per_volume_constraint": {"l_ssd": {"min_size": 1000000000,
"max_size": 800000000000}}, "baremetal": false, "monthly_price": 299.0, "hourly_price":
0.598, "capabilities": {"boot_types": ["bootscript", "rescue", "local"], "default_boot_type":
"local", "hot_snapshots_local_volume": true, "placement_groups": true, "block_storage":
true, "private_network": 8}, "network": {"ipv6_support": true, "sum_internal_bandwidth":
104857600, "sum_internet_bandwidth": 5368709120, "interfaces": [{"internal_bandwidth":
104857600, "internet_bandwidth": null}, {"internal_bandwidth": null, "internet_bandwidth":
5368709120, "sum_internet_bandwidth": 5368709120, "interfaces": [{"internal_bandwidth":
5368709120, "internet_bandwidth": null}, {"internal_bandwidth": null, "internet_bandwidth":
5368709120}]}}, "GP1-M": {"alt_names": [], "arch": "x86_64", "ncpus": 16, "ram":
68719476736, "gpu": null, "volumes_constraint": {"min_size": 600000000000, "max_size":
600000000000}, "per_volume_constraint": {"l_ssd": {"min_size": 1000000000, "max_size":
800000000000}}, "baremetal": false, "monthly_price": 159.0, "hourly_price":
0.318, "capabilities": {"boot_types": ["bootscript", "rescue", "local"], "default_boot_type":
"local", "hot_snapshots_local_volume": true, "placement_groups": true, "block_storage":
true, "private_network": 8}, "network": {"ipv6_support": true, "sum_internal_bandwidth":
104857600, "sum_internet_bandwidth": 1610612736, "interfaces": [{"internal_bandwidth":
104857600, "internet_bandwidth": null}, {"internal_bandwidth": null, "internet_bandwidth":
1610612736, "sum_internet_bandwidth": 1610612736, "interfaces": [{"internal_bandwidth":
1610612736, "internet_bandwidth": null}, {"internal_bandwidth": null, "internet_bandwidth":
1610612736}]}}, "GP1-S": {"alt_names": [], "arch": "x86_64", "ncpus": 8, "ram":
34359738368, "gpu": null, "volumes_constraint": {"min_size": 300000000000, "max_size":
300000000000}, "per_volume_constraint": {"l_ssd": {"min_size": 1000000000, "max_size":
800000000000}}, "baremetal": false, "monthly_price": 79.0, "hourly_price": 0.158,
"capabilities": {"boot_types": ["bootscript", "rescue", "local"], "default_boot_type":
"local", "hot_snapshots_local_volume": true, "placement_groups": true, "block_storage":
true, "private_network": 8}, "network": {"ipv6_support": true, "sum_internal_bandwidth":
104857600, "sum_internet_bandwidth": 838860800, "interfaces": [{"internal_bandwidth":
104857600, "internet_bandwidth": null}, {"internal_bandwidth": null, "internet_bandwidth":
838860800, "sum_internet_bandwidth": 838860800, "interfaces": [{"internal_bandwidth":
838860800, "internet_bandwidth": null}, {"internal_bandwidth": null, "internet_bandwidth":
838860800}]}}, "GP1-XL": {"alt_names": [], "arch": "x86_64", "ncpus": 48, "ram":
274877906944, "gpu": null, "volumes_constraint": {"min_size": 600000000000,
"max_size": 600000000000}, "per_volume_constraint": {"l_ssd": {"min_size": 1000000000,
"max_size": 800000000000}}, "baremetal": false, "monthly_price": 569.0, "hourly_price":
1.138, "capabilities": {"boot_types": ["bootscript", "rescue", "local"], "default_boot_type":
"local", "hot_snapshots_local_volume": true, "placement_groups": true, "block_storage":
true, "private_network": 8}, "network": {"ipv6_support": true, "sum_internal_bandwidth":
104857600, "sum_internet_bandwidth": 10737418240, "interfaces": [{"internal_bandwidth":
104857600, "internet_bandwidth": null}, {"internal_bandwidth": null, "internet_bandwidth":
10737418240, "sum_internet_bandwidth": 10737418240, "interfaces": [{"internal_bandwidth":
10737418240, "internet_bandwidth": null}, {"internal_bandwidth": null, "internet_bandwidth":
10737418240}]}}, "GP1-XS": {"alt_names": [], "arch": "x86_64", "ncpus": 4, "ram":
17179869184, "gpu": null, "volumes_constraint": {"min_size": 150000000000, "max_size":
150000000000}, "per_volume_constraint": {"l_ssd": {"min_size": 1000000000, "max_size":
800000000000}}, "baremetal": false, "monthly_price": 39.0, "hourly_price": 0.078,
"capabilities": {"boot_types": ["bootscript", "rescue", "local"], "default_boot_type":
"local", "hot_snapshots_local_volume": true, "placement_groups": true, "block_storage":
true, "private_network": 8}, "network": {"ipv6_support": true, "sum_internal_bandwidth":
104857600, "sum_internet_bandwidth": 524288000, "interfaces": [{"internal_bandwidth":
104857600, "internet_bandwidth": null}, {"internal_bandwidth": null, "internet_bandwidth":
524288000, "sum_internet_bandwidth": 524288000, "interfaces": [{"internal_bandwidth":
524288000, "internet_bandwidth": null}, {"internal_bandwidth": null, "internet_bandwidth":
524288000}]}}, "RENDER-S": {"alt_names": [], "arch": "x86_64", "ncpus": 10,
"ram": 48318382080, "gpu": 1, "volumes_constraint": {"min_size": 400000000000,
"max_size": 400000000000}, "per_volume_constraint": {"l_ssd": {"min_size": 1000000000,
"max_size": 800000000000}}, "baremetal": false, "monthly_price": 499.99, "hourly_price":
1.0, "capabilities": {"boot_types": ["local", "rescue"], "default_boot_type":
"local", "hot_snapshots_local_volume": true, "placement_groups": true, "block_storage":
true, "private_network": 8}, "network": {"ipv6_support": true, "sum_internal_bandwidth":
104857600, "sum_internet_bandwidth": 1073741824, "interfaces": [{"internal_bandwidth":
104857600, "internet_bandwidth": null}, {"internal_bandwidth": null, "internet_bandwidth":
1073741824, "sum_internet_bandwidth": 1073741824, "interfaces": [{"internal_bandwidth":
1073741824, "internet_bandwidth": null}, {"internal_bandwidth": null, "internet_bandwidth":
1073741824}]}}, "START1-L": {"alt_names": [], "arch": "x86_64", "ncpus": 8,
"ram": 8589934592, "gpu": null, "volumes_constraint": {"min_size": 200000000000,
"max_size": 200000000000}, "per_volume_constraint": {"l_ssd": {"min_size": 1000000000,
Expand Down Expand Up @@ -298,13 +298,13 @@ interactions:
Cache-Control:
- no-cache
Content-Length:
- "23699"
- "23709"
Content-Security-Policy:
- default-src 'none'; frame-ancestors 'none'
Content-Type:
- application/json
Date:
- Fri, 28 Feb 2020 13:16:13 GMT
- Fri, 03 Apr 2020 17:55:51 GMT
Link:
- </products/servers?page=1&per_page=50&>; rel="last"
Server:
Expand All @@ -320,3 +320,55 @@ interactions:
status: 200 OK
code: 200
duration: ""
- request:
body: ""
form: {}
headers:
User-Agent:
- scaleway-sdk-go/v1.0.0-beta.6+dev (go1.13.6; darwin; amd64) cli-e2e-test
url: https://api.scaleway.com/instance/v1/zones/fr-par-1/products/servers/availability
method: GET
response:
body: '{"servers": {"ARM64-128GB": {"availability": "shortage"}, "ARM64-16GB":
{"availability": "shortage"}, "ARM64-2GB": {"availability": "scarce"}, "ARM64-32GB":
{"availability": "shortage"}, "ARM64-4GB": {"availability": "shortage"}, "ARM64-64GB":
{"availability": "shortage"}, "ARM64-8GB": {"availability": "shortage"}, "C1":
{"availability": "available"}, "C2L": {"availability": "available"}, "C2M":
{"availability": "shortage"}, "C2S": {"availability": "available"}, "DEV1-L":
{"availability": "shortage"}, "DEV1-M": {"availability": "shortage"}, "DEV1-S":
{"availability": "available"}, "DEV1-XL": {"availability": "shortage"}, "GP1-L":
{"availability": "available"}, "GP1-M": {"availability": "available"}, "GP1-S":
{"availability": "available"}, "GP1-XL": {"availability": "available"}, "GP1-XS":
{"availability": "available"}, "RENDER-S": {"availability": "available"}, "START1-L":
{"availability": "shortage"}, "START1-M": {"availability": "shortage"}, "START1-S":
{"availability": "available"}, "START1-XS": {"availability": "available"}, "VC1L":
{"availability": "shortage"}, "VC1M": {"availability": "shortage"}, "VC1S":
{"availability": "scarce"}, "X64-120GB": {"availability": "available"}, "X64-15GB":
{"availability": "available"}, "X64-30GB": {"availability": "available"}, "X64-60GB":
{"availability": "available"}}}'
headers:
Cache-Control:
- no-cache
Content-Length:
- "1330"
Content-Security-Policy:
- default-src 'none'; frame-ancestors 'none'
Content-Type:
- application/json
Date:
- Fri, 03 Apr 2020 17:55:52 GMT
Link:
- </products/servers/availability?page=1&per_page=50&>; rel="last"
Server:
- scaleway_api
Strict-Transport-Security:
- max-age=63072000
X-Content-Type-Options:
- nosniff
X-Frame-Options:
- DENY
X-Total-Count:
- "32"
status: 200 OK
code: 200
duration: ""
22 changes: 11 additions & 11 deletions ...rnal/namespaces/instance/v1/testdata/test-server-type-list-server-type-list.stdout.golden
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
NAME MONTHLY PRICE HOURLY PRICE LOCAL VOLUME SIZE CPU GPU RAM ARCH AVAILABILITY
ARM64-2GB € 2.99 € 0.006 50 GB 4 2.0 GiB arm64 available
ARM64-4GB € 5.99 € 0.012 100 GB 6 4.0 GiB arm64 available
ARM64-8GB € 11.99 € 0.024 200 GB 8 8.0 GiB arm64 available
ARM64-16GB € 34.99 € 0.07 200 GB 16 16 GiB arm64 available
ARM64-32GB € 69.99 € 0.14 300 GB 32 32 GiB arm64 available
ARM64-64GB € 139.99 € 0.28 400 GB 48 64 GiB arm64 available
ARM64-128GB € 279.99 € 0.56 500 GB 64 128 GiB arm64 available
ARM64-2GB € 2.99 € 0.006 50 GB 4 2.0 GiB arm64 low stock
ARM64-4GB € 5.99 € 0.012 100 GB 6 4.0 GiB arm64 out of stock
ARM64-8GB € 11.99 € 0.024 200 GB 8 8.0 GiB arm64 out of stock
ARM64-16GB € 34.99 € 0.07 200 GB 16 16 GiB arm64 out of stock
ARM64-32GB € 69.99 € 0.14 300 GB 32 32 GiB arm64 out of stock
ARM64-64GB € 139.99 € 0.28 400 GB 48 64 GiB arm64 out of stock
ARM64-128GB € 279.99 € 0.56 500 GB 64 128 GiB arm64 out of stock
C1 € 2.99 € 0.006 50 GB 4 2.0 GiB arm available
C2L € 23.99 € 0.048 50 GB 8 32 GiB x86_64 available
C2M € 17.99 € 0.036 50 GB 8 16 GiB x86_64 available
C2M € 17.99 € 0.036 50 GB 8 16 GiB x86_64 out of stock
C2S € 11.99 € 0.024 50 GB 4 8.0 GiB x86_64 available
DEV1-S € 2.99 € 0.006 20 GB 2 2.0 GiB x86_64 available
DEV1-M € 7.99 € 0.016 40 GB 3 4.0 GiB x86_64 available
DEV1-L € 15.99 € 0.032 80 GB 4 8.0 GiB x86_64 available
DEV1-XL € 23.99 € 0.048 120 GB 4 12 GiB x86_64 available
DEV1-M € 7.99 € 0.016 40 GB 3 4.0 GiB x86_64 out of stock
DEV1-L € 15.99 € 0.032 80 GB 4 8.0 GiB x86_64 out of stock
DEV1-XL € 23.99 € 0.048 120 GB 4 12 GiB x86_64 out of stock
GP1-XS € 39.00 € 0.078 150 GB 4 16 GiB x86_64 available
GP1-S € 79.00 € 0.158 300 GB 8 32 GiB x86_64 available
GP1-M € 159.00 € 0.318 600 GB 16 64 GiB x86_64 available
Expand Down

0 comments on commit 4324b03

Please sign in to comment.