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.

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

add function to parse canonical quantities (e.g. resources) #855

Merged
merged 1 commit into from
Aug 26, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
112 changes: 112 additions & 0 deletions kubernetes/test/test_quantity.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
# coding: utf-8
# Copyright 2019 The Kubernetes Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

from __future__ import absolute_import

import unittest
from kubernetes.utils import parse_quantity
from decimal import Decimal


class TestQuantity(unittest.TestCase):
def test_parse(self):
self.assertIsInstance(parse_quantity(2.2), Decimal)
# input, expected output
tests = [
(0, 0),
(2, 2),
(2, Decimal("2")),
(2., 2),
(Decimal("2.2"), Decimal("2.2")),
(2., Decimal(2)),
(Decimal("2."), 2),
("123", 123),
("2", 2),
("2n", Decimal("2") * Decimal(1000)**-3),
("2u", Decimal("0.000002")),
("2m", Decimal("0.002")),
("0m", Decimal("0")),
("0M", Decimal("0")),
("223k", 223000),
("002M", 2 * 1000**2),
("2M", 2 * 1000**2),
("4123G", 4123 * 1000**3),
("2T", 2 * 1000**4),
("2P", 2 * 1000**5),
("2E", 2 * 1000**6),

("223Ki", 223 * 1024),
("002Mi", 2 * 1024**2),
("2Mi", 2 * 1024**2),
("2Gi", 2 * 1024**3),
("4123Gi", 4123 * 1024**3),
("2Ti", 2 * 1024**4),
("2Pi", 2 * 1024**5),
("2Ei", 2 * 1024**6),

("2.34n", Decimal("2.34") * Decimal(1000)**-3),
("2.34u", Decimal("2.34") * Decimal(1000)**-2),
("2.34m", Decimal("2.34") * Decimal(1000)**-1),
("2.34Ki", Decimal("2.34") * 1024),
("2.34", Decimal("2.34")),
(".34", Decimal("0.34")),
("34.", 34),
(".34M", Decimal("0.34") * 1000**2),

("2e2K", Decimal("2e2") * 1000),
("2e2Ki", Decimal("2e2") * 1024),
("2e-2Ki", Decimal("2e-2") * 1024),
("2.34E1", Decimal("2.34E1")),
(".34e-2", Decimal("0.34e-2")),
]

for inp, out in tests:
self.assertEqual(parse_quantity(inp), out)
if isinstance(inp, (int, float, Decimal)):
self.assertEqual(parse_quantity(-1 * inp), -out)
else:
self.assertEqual(parse_quantity("-" + inp), -out)
self.assertEqual(parse_quantity("+" + inp), out)

def test_parse_invalid(self):
self.assertRaises(ValueError, parse_quantity, [])
self.assertRaises(ValueError, parse_quantity, "")
self.assertRaises(ValueError, parse_quantity, "-")
self.assertRaises(ValueError, parse_quantity, "i")
self.assertRaises(ValueError, parse_quantity, "2i")
self.assertRaises(ValueError, parse_quantity, "2mm")
self.assertRaises(ValueError, parse_quantity, "2mmKi")
self.assertRaises(ValueError, parse_quantity, "2KKi")
self.assertRaises(ValueError, parse_quantity, "2e")
self.assertRaises(ValueError, parse_quantity, "2.2i")
self.assertRaises(ValueError, parse_quantity, "bla")
self.assertRaises(ValueError, parse_quantity, "Ki")
self.assertRaises(ValueError, parse_quantity, "M")
self.assertRaises(ValueError, parse_quantity, "2ki")
self.assertRaises(ValueError, parse_quantity, "2Ki ")
self.assertRaises(ValueError, parse_quantity, "20Ki ")
self.assertRaises(ValueError, parse_quantity, "20B")
self.assertRaises(ValueError, parse_quantity, "20Bi")
self.assertRaises(ValueError, parse_quantity, "20.2Bi")
self.assertRaises(ValueError, parse_quantity, "2MiKi")
self.assertRaises(ValueError, parse_quantity, "2MK")
self.assertRaises(ValueError, parse_quantity, "2MKi")
self.assertRaises(ValueError, parse_quantity, "234df")
self.assertRaises(ValueError, parse_quantity, "df234")
self.assertRaises(ValueError, parse_quantity, tuple())


if __name__ == '__main__':
unittest.main()
1 change: 1 addition & 0 deletions kubernetes/utils/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@

from .create_from_yaml import (FailToCreateError, create_from_dict,
create_from_yaml)
from .quantity import parse_quantity
75 changes: 75 additions & 0 deletions kubernetes/utils/quantity.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
# Copyright 2019 The Kubernetes Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
from decimal import Decimal, InvalidOperation


def parse_quantity(quantity):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

@juliantaylor juliantaylor Aug 24, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes this function currently only parse the canonical form of the quantities, which is what you get in the api objects. It is not intended to re-implement the quantities in kubernetes.

it is probably reasonably straightforward to do by returning decimal objects instead of floats.
Imo that is not unreasonable, but it means user have to work fully in decimals or convert to float/integer as you cannot mix both in computations.

Should I change it to decimals and be able to parse all number representations, also those that will never be in api objects?

"""
Parse kubernetes canonical form quantity like 200Mi to a decimal number.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you add a link to the quantity code in k/k repo?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

Supported SI suffixes:
base1024: Ki | Mi | Gi | Ti | Pi | Ei
base1000: n | u | m | "" | k | M | G | T | P | E

See https://github.com/kubernetes/apimachinery/blob/master/pkg/api/resource/quantity.go

Input:
quanity: string. kubernetes canonical form quantity

Returns:
Decimal

Raises:
ValueError on invalid or unknown input
"""
if isinstance(quantity, (int, float, Decimal)):
return Decimal(quantity)

exponents = {"n": -3, "u": -2, "m": -1, "K": 1, "k": 1, "M": 2,
"G": 3, "T": 4, "P": 5, "E": 6}

quantity = str(quantity)
number = quantity
suffix = None
if len(quantity) >= 2 and quantity[-1] == "i":
if quantity[-2] in exponents:
number = quantity[:-2]
suffix = quantity[-2:]
elif len(quantity) >= 1 and quantity[-1] in exponents:
number = quantity[:-1]
suffix = quantity[-1:]

try:
number = Decimal(number)
except InvalidOperation:
raise ValueError("Invalid number format: {}".format(number))

if suffix is None:
return number

if suffix.endswith("i"):
base = 1024
elif len(suffix) == 1:
base = 1000
else:
raise ValueError("{} has unknown suffix".format(quantity))

# handly SI inconsistency
if suffix == "ki":
raise ValueError("{} has unknown suffix".format(quantity))

if suffix[0] not in exponents:
raise ValueError("{} has unknown suffix".format(quantity))

exponent = Decimal(exponents[suffix[0]])
return number * (base ** exponent)