python-blazarclient 4.0.1__py3-none-any.whl → 4.2.0__py3-none-any.whl

blazarclient/tests/v1/shell_commands/test_leases.py

@@ -28,7 +28,7 @@ FIRST_LEASE = 'd1e43d6d-8f6f-4c2e-b0a9-2982b39dc698'
 SECOND_LEASE = '424d21c3-45a2-448a-81ad-32eddc888375'
 
 
-@mock.patch('blazarclient.v1.shell_commands.leases._utc_now', mock_time)
+@mock.patch('oslo_utils.timeutils.utcnow', mock_time)
 class CreateLeaseTestCase(tests.TestCase):
 
     def setUp(self):

blazarclient/utils.py

@@ -22,7 +22,7 @@ from oslo_serialization import jsonutils as json
 from blazarclient import exception
 from blazarclient.i18n import _
 
-ELAPSED_TIME_REGEX = '^(\d+)([s|m|h|d])$' # noqa W605
+ELAPSED_TIME_REGEX = r'^(\d+)([s|m|h|d])$'
 
 LEASE_DATE_FORMAT = '%Y-%m-%dT%H:%M:%S.%f'
 API_DATE_FORMAT = '%Y-%m-%d %H:%M'

blazarclient/v1/allocations.py

@@ -30,5 +30,5 @@ class AllocationClientManager(base.BaseClientManager):
         resp, body = self.request_manager.get('/%s/allocations' % resource)
         allocations = body['allocations']
         if sort_by:
-            allocations = sorted(allocations, key=lambda l: l[sort_by])
+            allocations = sorted(allocations, key=lambda alloc: alloc[sort_by])
         return allocations

blazarclient/v1/floatingips.py

@@ -43,5 +43,5 @@ class FloatingIPClientManager(base.BaseClientManager):
         resp, body = self.request_manager.get('/floatingips')
         floatingips = body['floatingips']
         if sort_by:
-            floatingips = sorted(floatingips, key=lambda l: l[sort_by])
+            floatingips = sorted(floatingips, key=lambda fip: fip[sort_by])
         return floatingips

blazarclient/v1/hosts.py

@@ -51,7 +51,7 @@ class ComputeHostClientManager(base.BaseClientManager):
         resp, body = self.request_manager.get('/os-hosts')
         hosts = body['hosts']
         if sort_by:
-            hosts = sorted(hosts, key=lambda l: l[sort_by])
+            hosts = sorted(hosts, key=lambda host: host[sort_by])
         return hosts
 
     def list_properties(self, detail=False, all=False, sort_by=None):
@@ -76,7 +76,7 @@ class ComputeHostClientManager(base.BaseClientManager):
 
         if sort_by:
             resource_properties = sorted(resource_properties,
-                                         key=lambda l: l[sort_by])
+                                         key=lambda rp: rp[sort_by])
         return resource_properties
 
     def get_property(self, property_name):

blazarclient/v1/leases.py

@@ -91,7 +91,7 @@ class LeaseClientManager(base.BaseClientManager):
         resp, body = self.request_manager.get('/leases')
         leases = body['leases']
         if sort_by:
-            leases = sorted(leases, key=lambda l: l[sort_by])
+            leases = sorted(leases, key=lambda lease: lease[sort_by])
         return leases
 
     def _add_lease_date(self, values, lease, key, delta_date, positive_delta):

blazarclient/v1/shell_commands/leases.py

@@ -20,6 +20,7 @@ import re
 
 from oslo_serialization import jsonutils
 from oslo_utils import strutils
+from oslo_utils import timeutils
 
 from blazarclient import command
 from blazarclient import exception
@@ -52,22 +53,18 @@ CREATE_RESERVATION_KEYS = {
         "resource_properties": "",
         "resource_type": 'virtual:instance'
     },
+    "flavor:instance": {
+        "flavor_id": "",
+        "amount": "",
+        "affinity": "None",
+        "resource_type": 'flavor:instance'
+    },
     "others": {
         ".*": None
     }
 }
 
 
-def _utc_now():
-    """Wrap datetime.datetime.utcnow so it can be mocked in unit tests.
-
-    This is required because some of the tests require understanding the
-    'current time'; simply mocking utcnow() is made very difficult by
-    the many different ways the datetime package is used in this module.
-    """
-    return datetime.datetime.utcnow()
-
-
 class ListLeases(command.ListCommand):
     """Print a list of leases."""
     resource = 'lease'
@@ -107,7 +104,7 @@ class CreateLeaseBase(command.CreateCommand):
     json_indent = 4
     log = logging.getLogger(__name__ + '.CreateLease')
     default_start = 'now'
-    default_end = _utc_now() + datetime.timedelta(days=1)
+    default_end = timeutils.utcnow() + datetime.timedelta(days=1)
 
     def get_parser(self, prog_name):
         parser = super(CreateLeaseBase, self).get_parser(prog_name)
@@ -183,7 +180,7 @@ class CreateLeaseBase(command.CreateCommand):
                 raise exception.IncorrectLease
 
         if parsed_args.start == 'now':
-            start = _utc_now()
+            start = timeutils.utcnow()
         else:
             start = parsed_args.start
 
@@ -226,6 +223,8 @@ class CreateLeaseBase(command.CreateCommand):
                 defaults = CREATE_RESERVATION_KEYS['virtual:instance']
             elif "virtual:floatingip" in res_str:
                 defaults = CREATE_RESERVATION_KEYS['virtual:floatingip']
+            elif "flavor:instance" in res_str:
+                defaults = CREATE_RESERVATION_KEYS['flavor:instance']
             else:
                 defaults = CREATE_RESERVATION_KEYS['others']
 

{python_blazarclient-4.0.1.dist-info → python_blazarclient-4.2.0.dist-info}/AUTHORS

@@ -15,6 +15,7 @@ Hiroki Ito <ito.hiroki@lab.ntt.co.jp>
 Jason Anderson <jasonanderson@uchicago.edu>
 Jay Lau <liugya@cn.ibm.com>
 Jeremy Stanley <fungi@yuggoth.org>
+John Garbutt <john.garbutt@stackhpc.com>
 Mark Powers <markpowers@uchicago.edu>
 Martin Kopec <mkopec@redhat.com>
 Masahito Muroi <muroi.masahito@lab.ntt.co.jp>
@@ -38,8 +39,10 @@ Sergey Lukjanov <slukjanov@mirantis.com>
 ShangXiao <shangxiaobj@inspur.com>
 Steve Martinelli <s.martinelli@gmail.com>
 Sylvain Bauza <sylvain.bauza@bull.net>
+Takashi Natsume <takanattie@gmail.com>
 Tetsuro Nakamura <nakamura.tetsuro@lab.ntt.co.jp>
 Tetsuro Nakamura <tetsuro.nakamura.bc@hco.ntt.co.jp>
+Thomas Goirand <zigo@debian.org>
 Tony Breeds <tony@bakeyournoodle.com>
 Vieri <15050873171@163.com>
 ZhijunWei <wzj334965317@outlook.com>

{python_blazarclient-4.0.1.dist-info → python_blazarclient-4.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-blazarclient
-Version: 4.0.1
+Version: 4.2.0
 Summary: Client for OpenStack Reservation Service
 Home-page: https://launchpad.net/blazar
 Author: OpenStack
@@ -29,7 +29,7 @@ Requires-Dist: keystoneauth1 (>=3.4.0)
 Requires-Dist: osc-lib (>=1.3.0)
 Requires-Dist: oslo.i18n (>=3.15.3)
 Requires-Dist: oslo.log (>=3.36.0)
-Requires-Dist: oslo.utils (>=3.33.0)
+Requires-Dist: oslo.utils (>=7.0.0)
 Requires-Dist: pbr (!=2.1.0,>=2.0.0)
 
 ========================

{python_blazarclient-4.0.1.dist-info → python_blazarclient-4.2.0.dist-info}/RECORD

@@ -5,7 +5,7 @@ blazarclient/command.py,sha256=m-Tek-l_1Xy3YZND5_f-9Ia8HiT3uCYxKIaCzHG1WOA,12448
 blazarclient/exception.py,sha256=nccQagxyp1wkgFSAxacbWXl6vdqvy0Q92jeW4TVL4mQ,3080
 blazarclient/i18n.py,sha256=xH89lr9tMpr9WQelTfqbjJJldqcxvDOLOgEJj6AjkFg,857
 blazarclient/shell.py,sha256=hD6db_wwQnz6cxNSmOv2E0SfehnQy9_LscBpyY7uoRo,13986
-blazarclient/utils.py,sha256=PHqygiKPlXW1eSvIbr5ASP1egfdyHfBZ9wYxpQD3oSg,5999
+blazarclient/utils.py,sha256=HOjSVBFIV6ytewIUSWeS3OMxnC1czbIO5REijh563vM,5988
 blazarclient/version.py,sha256=r2fTZKJSyMU6-NtpZpGXVk3ZXkeNGtxQp06S-ajsgV0,682
 blazarclient/osc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 blazarclient/osc/plugin.py,sha256=1DcRdrjsEg5xata7iFanLFR8c2GTbnP5H1AgKv4pKNc,2120
@@ -19,23 +19,23 @@ blazarclient/tests/v1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 blazarclient/tests/v1/shell_commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 blazarclient/tests/v1/shell_commands/test_floatingips.py,sha256=7YRS34Q0FFuOvj18igKeimF6tuM96YO1hDDcR0ZkNlw,4920
 blazarclient/tests/v1/shell_commands/test_hosts.py,sha256=ChUgCTSwj_YjddIx9uZSPRVm0lQxTrA-KtnqllZUzgA,8026
-blazarclient/tests/v1/shell_commands/test_leases.py,sha256=3bLxmcJKi_phsln9fwiugll_3XufUTiTbu_g93OnzXc,13166
+blazarclient/tests/v1/shell_commands/test_leases.py,sha256=0GbULeNp0tVRCYz7fa0IQwvGi_ZkQaD6Kn-4JAeVP54,13147
 blazarclient/v1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-blazarclient/v1/allocations.py,sha256=YuNh-F8mlbK0MEvvG-yr98jfiQQk763NHRBVlM78NLw,1331
+blazarclient/v1/allocations.py,sha256=NtA3zv-J9EgS6OrcG2XoqiJC5pVJZ1WI45CH3wsuHNI,1339
 blazarclient/v1/client.py,sha256=xTdnTA5hXT_3da6_ZYtC2HY4bHfUTY_1mBvQAHFfF_0,2719
-blazarclient/v1/floatingips.py,sha256=frat8gAi_YB9bQYc6kNVwQE6SMfPlroq3na9lbc8Ui4,1779
-blazarclient/v1/hosts.py,sha256=hyjd7rc-GMiK2i1G2fWrexX4cP699-n3bzOHvXRALhc,3335
-blazarclient/v1/leases.py,sha256=5g0Uio19bpfYUGiNzyDXodgLNwNlTuiajYJ2Fn2lys8,4044
+blazarclient/v1/floatingips.py,sha256=hpr7RKWfRjIXhPuZfUN9wcVy2ZWNc0Nx6Zw7shQDZWo,1783
+blazarclient/v1/hosts.py,sha256=1eplsonm-unFKcuuUGGW8Bztjd6GARiKfhPFHEcrF14,3343
+blazarclient/v1/leases.py,sha256=_OYy7mgMV5JnNLoSZVQvZpYHEkwr_1fnZj6z8V2azBI,4052
 blazarclient/v1/shell_commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 blazarclient/v1/shell_commands/allocations.py,sha256=r92zczR04SFe5Dr-hxBwpajpVXP6pP-7cUk9yIDTmME,5222
 blazarclient/v1/shell_commands/floatingips.py,sha256=x9Ygy_-oysFntIk3Qb9bG3U236S_JPFMjb5I3CwDlIU,2905
 blazarclient/v1/shell_commands/hosts.py,sha256=Mg7ZmnaFla8mLFTf5LVr_BuSTva-O6vnXLF8c3awQKU,6533
-blazarclient/v1/shell_commands/leases.py,sha256=gKI0RrooeqxBgrWv7tv9oyyXG6NQ06QhZaz_DTDqTpQ,18799
-python_blazarclient-4.0.1.dist-info/AUTHORS,sha256=Vb9LFgCErhb6wS_MXgOusQebjJBZuhVSqoN1W86ZKZw,2379
-python_blazarclient-4.0.1.dist-info/LICENSE,sha256=CeipvOyAZxBGUsFoaFqwkx54aPnIKEtm9a5u2uXxEws,10142
-python_blazarclient-4.0.1.dist-info/METADATA,sha256=L9dj4CAZvq-QQXf1vQTam0vYW8-LTd9W2x3EUGb4GCg,2341
-python_blazarclient-4.0.1.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
-python_blazarclient-4.0.1.dist-info/entry_points.txt,sha256=GeegiiG8GncGF7f6jonugjHhqNEYVaWe6TbYLhyhPWk,1687
-python_blazarclient-4.0.1.dist-info/pbr.json,sha256=ZwMsUXin22TlJiDEZnXyJBIw2Oh_5v9hDV86TIBC9lU,46
-python_blazarclient-4.0.1.dist-info/top_level.txt,sha256=yQx5ICRTYACa8B3aVm1rnJI6miXR0odH3BkwmoKD-0E,13
-python_blazarclient-4.0.1.dist-info/RECORD,,
+blazarclient/v1/shell_commands/leases.py,sha256=P0KTucuTJibGbl14W9eU7IdtIFotfJM9wVL8bWNp88w,18762
+python_blazarclient-4.2.0.dist-info/AUTHORS,sha256=DntWJBcJ5OK-o_id5Bhla7dS8TxnqilXkDB9veGr-44,2492
+python_blazarclient-4.2.0.dist-info/LICENSE,sha256=CeipvOyAZxBGUsFoaFqwkx54aPnIKEtm9a5u2uXxEws,10142
+python_blazarclient-4.2.0.dist-info/METADATA,sha256=bHFCDvuuQJc2n6kdon2OTTqTOK3_OBIxt6vMGOnh9_4,2340
+python_blazarclient-4.2.0.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
+python_blazarclient-4.2.0.dist-info/entry_points.txt,sha256=GeegiiG8GncGF7f6jonugjHhqNEYVaWe6TbYLhyhPWk,1687
+python_blazarclient-4.2.0.dist-info/pbr.json,sha256=LUclCjnbsj4BzZtiu6GiFpsQ1wTZMqdPMSuS04wESZA,46
+python_blazarclient-4.2.0.dist-info/top_level.txt,sha256=yQx5ICRTYACa8B3aVm1rnJI6miXR0odH3BkwmoKD-0E,13
+python_blazarclient-4.2.0.dist-info/RECORD,,

python_blazarclient-4.2.0.dist-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "20c3119", "is_release": true}

python_blazarclient-4.0.1.dist-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "8eabd1e", "is_release": true}