Merge pull request #303 from arista-eosplus/develop

Release merge for 1.3.2

LICENSE

@@ -1,7 +1,7 @@
 License
 =======
 
-Copyright (c) 2013-2014, Arista Networks
+Copyright (c) 2013-2015, Arista Networks
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

Makefile

@@ -5,6 +5,8 @@
 #
 # useful targets:
 #   make sdist -- builds a source distribution
+#   make srpm -- builds a source rpm, input to mock
+#   make rpm -- builds a binary distribution
 #   make pylint -- source code checks
 #   make tests -- run the tests
 #   make test_server -- run all server tests (including neighbordb)
@@ -41,6 +43,18 @@ clean:
 	rm -rf MANIFEST
 	@echo "Cleaning up byte compiled python stuff"
 	find . -type f -regex ".*\.py[co]$$" -delete
+	@echo "Cleaning up rpmbuild stuff"
+	$(MAKE) -C rpm clean
+
+.PHONY: rpm srpm
+rpm: sdist
+	$(MAKE) -C rpm rpm-pkg
+
+srpm: sdist
+	$(MAKE) -C rpm srpm-pkg
+
+ztpserver.spec:
+	$(MAKE) -C rpm ../ztpserver.spec
 
 test_neighbordb: clean
 	PYTHONPATH=./ $(PYTHON)  ./test/server/test_ndb.py -v
@@ -74,5 +88,5 @@ python:
 install:
 	$(PYTHON) setup.py install
 
-sdist: clean
+sdist: clean ztpserver.spec
 	$(PYTHON) setup.py sdist 

VERSION

@@ -1 +1 @@
-1.4
+1.3.2

actions/add_config

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (c) 2014, Arista Networks, Inc.
+# Copyright (c) 2015, Arista Networks, Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

actions/copy_file

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (c) 2014, Arista Networks, Inc.
+# Copyright (c) 2015, Arista Networks, Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

actions/install_cli_plugin

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (c) 2014, Arista Networks, Inc.
+# Copyright (c) 2015, Arista Networks, Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

actions/install_extension

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (c) 2014, Arista Networks, Inc.
+# Copyright (c) 2015, Arista Networks, Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

actions/install_image

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (c) 2014, Arista Networks, Inc.
+# Copyright (c) 2015, Arista Networks, Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

actions/replace_config

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (c) 2014, Arista Networks, Inc.
+# Copyright (c) 2015, Arista Networks, Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

actions/run_bash_script

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (c) 2014, Arista Networks, Inc.
+# Copyright (c) 2015, Arista Networks, Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

actions/run_cli_commands

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (c) 2014, Arista Networks, Inc.
+# Copyright (c) 2015, Arista Networks, Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

actions/send_email

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (c) 2014, Arista Networks, Inc.
+# Copyright (c) 2015, Arista Networks, Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

actions/template

@@ -1,6 +1,6 @@
 #!/usr/bin/env python 
 #
-# Copyright (c) 2014, Arista Networks, Inc.
+# Copyright (c) 2015, Arista Networks, Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

actions/the_nick

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (c) 2014, Arista Networks, Inc.
+# Copyright (c) 2015, Arista Networks, Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

client/bootstrap

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (c) 2014, Arista Networks, Inc.
+# Copyright (c) 2015, Arista Networks, Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -864,7 +864,7 @@ class Server(object):
                                     headers=headers)
 
         log('Server response to GET config: contents=%s' % result.json())
-
+        
         status = result.status_code
         content = result.headers['content-type'].split(';')[0]
         if(status != HTTP_STATUS_OK or

conf/ztpserver.wsgi

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, Arista Networks, Inc.
+# Copyright (c) 2015, Arista Networks, Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

docs/ReleaseNotes1.3.2.rst

@@ -0,0 +1,34 @@
+Release 1.3.2
+-------------
+
+(Published March, 2015)
+
+The authoritative state for any known issue can be found in `GitHub issues <https://github.com/arista-eosplus/ztpserver/issues>`_.
+
+Bug fixes
+^^^^^^^^^
+
+* Prevented .node file from becoming corrupted on the server (`298 <https://github.com/arista-eosplus/ztpserver/issues/298>`_)
+    .. comment
+* Added .node filename to server-side logs (`297 <https://github.com/arista-eosplus/ztpserver/issues/297>`_)
+    .. comment
+* Change ``refresh_ztps`` script default to "master"
+    Refresh_ztps will, by default, update the installation to the latest released version.   Previously, the default was to the development branch which may still be accomplished with ``refresh_ztps --branch develop``.
+* Fixes to RPM packaging:
+
+    - Quieted chcon during install (`295 <https://github.com/arista-eosplus/    ztpserver/issues/295>`_)
+        .. comment
+    - Fixed issue where config files may not be kept during upgrade (`296 <https://github.com/arista-eosplus/    ztpserver/issues/296>`_)
+        .. comment
+    - Fixed issue with native rpmbuild due to changes in handling VERSION (`294 <https://github.com/arista-eosplus/    ztpserver/issues/294>`_)
+        .. comment
+
+* Documentation updates:
+
+    - Troubleshooting chapter  (`272 <https://github.com/arista-eosplus/    ztpserver/issues/272>`_)
+        .. comment
+    - Additional content in the ZTP Server Cookbook  (`289 <https://github.com/arista-eosplus/    ztpserver/issues/289>`_)
+        .. comment
+    - ZTP Server benchmarking results
+        .. comment
+

docs/actions.rst

@@ -44,15 +44,15 @@ Actions
 
 .. automodule:: actions.send_email
     :members:
-    
+
 :mod:`run_bash_script`
------------------
+----------------------
 
 .. automodule:: actions.run_bash_script
     :members:
-    
+
 :mod:`run_cli_commands`
------------------
+-----------------------
 
 .. automodule:: actions.run_cli_commands
     :members:

docs/conf.py

@@ -14,6 +14,7 @@
 # serve to show the default.
 
 import sys, os
+import re
 # on_rtd is whether we are on readthedocs.org, this line of code grabbed from docs.readthedocs.org
 on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
 
@@ -60,16 +61,22 @@
 
 # General information about the project.
 project = u'ZTPServer'
-copyright = u'2014, Arista Networks'       # pylint: disable=W0622
+copyright = u'2015, Arista Networks'       # pylint: disable=W0622
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '1.2.0'
+#version = '1.2.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.2.0'
+#release = '1.2.0'
+
+release = open('../VERSION').read().split()[0].strip()
+# Assume PEP 440 version strings
+p = re.compile('(\d+!)?((\d+)(.\d+)*(.\d+)*)(.?[a|b|rc]\d*)?(.post\d*)?(.dev\d*)?', re.IGNORECASE)
+vers =  p.search(release)
+version = vers.group(2)
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -83,7 +90,7 @@
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ['_build', 'old', 'exts']
+exclude_patterns = ['_build', 'old', 'exts', 'cookbook/_template.rst']
 
 # The reST default role (used for this markup: `text`) to use for all documents.
 #default_role = None

docs/config.rst

@@ -190,7 +190,7 @@ Static provisioning - overview
 
 A node can be statically configured on the server as follows:
 
-* create a new directory under ``[data_root]/nodes`, using the system's unique_id as the name
+* create a new directory under ``[data_root]/nodes``, using the system's unique_id as the name
 * create/symlink a *startup-config* or *definition* file in the newly-created folder
 * if topology validation is enabled, also create/symlink a *pattern* file
 * optionally, create *config-handler* script which is run whenever a PUT startup-config request succeeds

docs/cookbook.rst

@@ -16,6 +16,5 @@ ZTPServer Cookbook
    cookbook/definitions
    cookbook/actions
    cookbook/resourcePools
-   cookbook/templates
-   cookbook/troubleshooting
    cookbook/advanced
+   cookbook/ztpsVMonEOS

docs/cookbook/_template.rst

@@ -17,7 +17,7 @@ Objective
 Solution
 ^^^^^^^^
 
-.. code-block:: <code type>
+.. code-block:: codeType
 
   (add code here - note the empty line above and below)