Merge branch 'release/1.9.1'

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`_.
 
+`1.9.1`_ - 2017-02-21
+---------------------
+
+**Changed**
+
+- Removed 32 MiB memory limitation on Cisco IOS XRv 9000 platform.
+
 `1.9.0`_ - 2017-02-13
 ---------------------
 
@@ -643,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

CONTRIBUTING.rst

@@ -98,39 +98,46 @@ 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
   ...
   docs runtests: commands[0] | sphinx-build -W -b html -d ...
   ...
   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
     py26: commands succeeded
     py27: commands succeeded
     py33: commands succeeded
     py34: commands succeeded
+    py35: commands succeeded
+    py36: commands succeeded
     pypy: commands succeeded
     flake8: commands succeeded
     pylint: commands succeeded

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

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."""
 )

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):

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."""

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
 

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