From 0d5178d10fd0b1e61c855d354dbf4caed143d987 Mon Sep 17 00:00:00 2001 From: Glenn Matthews Date: Mon, 13 Feb 2017 13:26:36 -0500 Subject: [PATCH 1/5] It's 2017 now --- COPYRIGHT.txt | 2 +- LICENSE.txt | 2 +- docs/conf.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt index 9bbbfd9..4669d39 100644 --- a/COPYRIGHT.txt +++ b/COPYRIGHT.txt @@ -1,6 +1,6 @@ Common OVF Tool (COT) -Copyright (c) 2013-2016 by the following developers: +Copyright (c) 2013-2017 by the following developers: Glenn F. Matthews Kevin A. Keim Quol Fontana diff --git a/LICENSE.txt b/LICENSE.txt index 7c8397e..16e762d 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2013-2016 the COT project developers. +Copyright (c) 2013-2017 the COT project developers. See the COPYRIGHT.txt file at the top-level directory of this distribution and at https://github.com/glennmatthews/cot/blob/master/COPYRIGHT.txt diff --git a/docs/conf.py b/docs/conf.py index 7687728..d565406 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -293,7 +293,7 @@ def autodoc_skip_member(app, what, name, obj, skip, options): # General information about the project. project = u'Common OVF Tool (COT)' -copyright = u'2013-2016, the COT project developers' +copyright = u'2013-2017, the COT project developers' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the From ec69406d16d8532caa181e58dc392439e7ed52ef Mon Sep 17 00:00:00 2001 From: Glenn Matthews Date: Mon, 13 Feb 2017 13:28:44 -0500 Subject: [PATCH 2/5] It's 2017 now --- COT/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/COT/__init__.py b/COT/__init__.py index 3c4b745..137c317 100644 --- a/COT/__init__.py +++ b/COT/__init__.py @@ -1,5 +1,5 @@ # September 2013, Glenn F. Matthews -# Copyright (c) 2013-2016 the COT project developers. +# Copyright (c) 2013-2017 the COT project developers. # See the COPYRIGHT.txt file at the top-level directory of this distribution # and at https://github.com/glennmatthews/cot/blob/master/COPYRIGHT.txt. # @@ -74,5 +74,5 @@ __version_long__ = ( """Common OVF Tool (COT), version """ + __version__ + - """\nCopyright (C) 2013-2016 the COT project developers.""" + """\nCopyright (C) 2013-2017 the COT project developers.""" ) From 7d11406e340f5c0e08723731b4684668832c567e Mon Sep 17 00:00:00 2001 From: Glenn Matthews Date: Tue, 14 Feb 2017 10:30:44 -0500 Subject: [PATCH 3/5] update tox example output --- CONTRIBUTING.rst | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index f7e9b91..0b2ee3c 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -98,9 +98,13 @@ coverage_ (``pip install coverage``) then run ``tox`` from the COT directory: ... py34 runtests: commands[0] | coverage run --append setup.py test --quiet ... + py35 runtests: commands[0] | coverage run --append setup.py test --quiet + ... + py36 runtests: commands[0] | coverage run --append setup.py test --quiet + ... pypy runtests: commands[0] | coverage run --append setup.py test --quiet ... - flake8 runtests: commands[0] | flake8 --verbose + flake8 runtests: commands[0] | flake8 ... pylint runtests: commands[0] | pylint COT ... @@ -108,22 +112,23 @@ coverage_ (``pip install coverage``) then run ``tox`` from the COT directory: ... stats runtests: commands[0] | coverage combine stats runtests: commands[1] | coverage report -i - Name Stmts Miss Cover - ----------------------------------------------- - COT/__init__.py 5 0 100% - COT/add_disk.py 166 1 99% - COT/add_file.py 45 0 100% - COT/cli.py 252 15 94% - COT/data_validation.py 88 0 100% - COT/deploy.py 148 4 97% - COT/deploy_esxi.py 201 28 86% - COT/edit_hardware.py 273 2 99% + Name Stmts Miss Branch BrPart Cover + ---------------------------------------------------------------------- + COT/__init__.py 5 0 0 0 100% + COT/add_disk.py 168 3 66 3 97% + COT/add_file.py 45 0 12 0 100% + COT/cli.py 254 15 95 9 93% + COT/data_validation.py 124 2 44 1 98% + COT/deploy.py 154 6 62 6 94% + COT/deploy_esxi.py 196 0 68 1 99% + COT/disks/__init__.py 23 0 10 0 100% + COT/disks/disk.py 56 1 20 1 97% ... - COT/vm_description.py 168 4 98% - COT/vm_factory.py 26 0 100% - COT/xml_file.py 120 0 100% - ----------------------------------------------- - TOTAL 4692 136 97% + COT/vm_description.py 166 4 4 0 98% + COT/vm_factory.py 26 0 4 0 100% + COT/xml_file.py 121 3 54 1 98% + ---------------------------------------------------------------------- + TOTAL 5122 114 1908 105 97% stats runtests: commands[2] | coverage html -i _______________ summary _______________ setup: commands succeeded @@ -131,6 +136,8 @@ coverage_ (``pip install coverage``) then run ``tox`` from the COT directory: py27: commands succeeded py33: commands succeeded py34: commands succeeded + py35: commands succeeded + py36: commands succeeded pypy: commands succeeded flake8: commands succeeded pylint: commands succeeded From 30a423fecd922a96fde54c732ed2122677fa3df0 Mon Sep 17 00:00:00 2001 From: Glenn Matthews Date: Tue, 21 Feb 2017 08:56:19 -0500 Subject: [PATCH 4/5] Remove 32 GiB memory limit on XRv9000 --- CHANGELOG.rst | 7 +++++++ COT/platforms/cisco_iosxrv_9000.py | 11 +++-------- COT/platforms/tests/test_cisco_iosxrv_9000.py | 5 ++--- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 28890e5..7f31a79 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -3,6 +3,13 @@ Change Log All notable changes to the COT project will be documented in this file. This project adheres to `Semantic Versioning`_. +`Unreleased`_ +------------- + +**Changed** + +- Removed 32 MiB memory limitation on Cisco IOS XRv 9000 platform. + `1.9.0`_ - 2017-02-13 --------------------- diff --git a/COT/platforms/cisco_iosxrv_9000.py b/COT/platforms/cisco_iosxrv_9000.py index 85ccd4a..b910c5c 100644 --- a/COT/platforms/cisco_iosxrv_9000.py +++ b/COT/platforms/cisco_iosxrv_9000.py @@ -1,5 +1,5 @@ # September 2016, Glenn F. Matthews -# Copyright (c) 2013-2016 the COT project developers. +# Copyright (c) 2013-2017 the COT project developers. # See the COPYRIGHT.txt file at the top-level directory of this distribution # and at https://github.com/glennmatthews/cot/blob/master/COPYRIGHT.txt. # @@ -15,9 +15,7 @@ import logging from COT.platforms.cisco_iosxrv import IOSXRv -from COT.data_validation import ( - ValueTooLowError, ValueTooHighError, validate_int, -) +from COT.data_validation import ValueTooLowError, validate_int logger = logging.getLogger(__name__) @@ -67,19 +65,16 @@ def validate_cpu_count(cls, cpus): @classmethod def validate_memory_amount(cls, mebibytes): - """Minimum 8 GiB, maximum 32 GiB. + """Minimum 8 GiB, no known maximum (128GiB+ is permitted). Args: mebibytes (int): RAM, in MiB. Raises: ValueTooLowError: if ``mebibytes`` is less than 8192 - ValueTooHighError: if ``mebibytes`` is more than 32768 """ if mebibytes < 8192: raise ValueTooLowError("RAM", str(mebibytes) + " MiB", "8 GiB") - elif mebibytes > 32768: - raise ValueTooHighError("RAM", str(mebibytes) + " MiB", "32 GiB") @classmethod def validate_nic_count(cls, count): diff --git a/COT/platforms/tests/test_cisco_iosxrv_9000.py b/COT/platforms/tests/test_cisco_iosxrv_9000.py index bf2731c..df4d6a4 100644 --- a/COT/platforms/tests/test_cisco_iosxrv_9000.py +++ b/COT/platforms/tests/test_cisco_iosxrv_9000.py @@ -1,7 +1,7 @@ # test_cisco_iosxrv_9000.py - Unit test cases for Cisco IOS XRv9k platform # # October 2016, Glenn F. Matthews -# Copyright (c) 2014-2016 the COT project developers. +# Copyright (c) 2014-2017 the COT project developers. # See the COPYRIGHT.txt file at the top-level directory of this distribution # and at https://github.com/glennmatthews/cot/blob/master/COPYRIGHT.txt. # @@ -52,8 +52,7 @@ def test_memory_amount(self): self.cls.validate_memory_amount, 8191) self.cls.validate_memory_amount(8192) self.cls.validate_memory_amount(32768) - self.assertRaises(ValueTooHighError, - self.cls.validate_memory_amount, 32769) + self.cls.validate_memory_amount(128 * 1024) def test_nic_count(self): """Test NIC range limits.""" From c922df3c74fd89eb7789a8f7216bcee86cb99aa9 Mon Sep 17 00:00:00 2001 From: Glenn Matthews Date: Tue, 21 Feb 2017 10:11:40 -0500 Subject: [PATCH 5/5] Bump version --- CHANGELOG.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 7f31a79..4b706de 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -3,8 +3,8 @@ Change Log All notable changes to the COT project will be documented in this file. This project adheres to `Semantic Versioning`_. -`Unreleased`_ -------------- +`1.9.1`_ - 2017-02-21 +--------------------- **Changed** @@ -650,6 +650,7 @@ Initial public release. .. _napoleon: http://www.sphinx-doc.org/en/latest/ext/napoleon.html .. _Unreleased: https://github.com/glennmatthews/cot/compare/master...develop +.. _1.9.1: https://github.com/glennmatthews/cot/compare/v1.9.0...v1.9.1 .. _1.9.0: https://github.com/glennmatthews/cot/compare/v1.8.2...v1.9.0 .. _1.8.2: https://github.com/glennmatthews/cot/compare/v1.8.1...v1.8.2 .. _1.8.1: https://github.com/glennmatthews/cot/compare/v1.8.0...v1.8.1