Stable/mitaka

.coveragerc

@@ -1,7 +1,7 @@
 [run]
 branch = True
 source = nova
-omit = nova/tests/*,nova/openstack/*
+omit = nova/tests/*
 
 [report]
 ignore_errors = True

.gitignore

@@ -26,12 +26,16 @@ CA/
 ChangeLog
 coverage.xml
 cover/*
-covhtml
+covhtml/*
 dist/*
 doc/source/api/*
 doc/build/*
 api-guide/build/*
+api-ref/build/*
+placement-api-ref/build/*
 etc/nova/nova.conf.sample
+etc/nova/policy.yaml.sample
+etc/nova/policy.yaml.merged
 instances
 keeper
 keys
@@ -42,6 +46,7 @@ nova/tests/cover/*
 nova/vcsversion.py
 tools/conf/nova.conf*
 doc/source/_static/nova.conf.sample
+doc/source/_static/nova.policy.yaml.sample
 
  # Files created by releasenotes build
 releasenotes/build

.gitreview

@@ -2,4 +2,4 @@
 host=review.openstack.org
 port=29418
 project=openstack/nova.git
-defaultbranch=stable/mitaka
+defaultbranch=stable/pike

.testr.conf

@@ -6,3 +6,13 @@ test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
 
 test_id_option=--load-list $IDFILE
 test_list_option=--list
+# NOTE(cdent): The group_regex describes how testrepository will
+# group tests into the same process when running concurently. The
+# following insures that gabbi tests coming from the same YAML file
+# are all in the same process. This is important because each YAML
+# file represents an ordered sequence of HTTP requests. Note that
+# tests which do not match this regex will not be grouped in any
+# special way. See the following for more details.
+# http://testrepository.readthedocs.io/en/latest/MANUAL.html#grouping-tests
+# https://gabbi.readthedocs.io/en/latest/#purpose
+group_regex=nova\.tests\.functional\.api\.openstack\.placement\.test_placement_api(?:\.|_)([^_]+)

.zuul.yaml

@@ -0,0 +1,46 @@
+- job:
+    name: nova-tox-functional
+    parent: openstack-tox
+    description: |
+      Run tox-based functional tests for the OpenStack Nova project with Nova
+      specific irrelevant-files list. Uses tox with the ``functional``
+      environment.
+    irrelevant-files:
+      - ^.*\.rst$
+      - ^api-.*$
+      - ^doc/source/.*$
+      - ^nova/locale/.*$
+      - ^placement-api-ref/.*$
+      - ^releasenotes/.*$
+    vars:
+      tox_envlist: functional
+    timeout: 3600
+
+- job:
+    name: nova-tox-functional-py35
+    parent: openstack-tox
+    description: |
+      Run tox-based functional tests for the OpenStack Nova project
+      under cPython version 3.5. with Nova specific irrelevant-files list.
+      Uses tox with the ``functional-py35`` environment.
+    irrelevant-files:
+      - ^.*\.rst$
+      - ^api-.*$
+      - ^doc/source/.*$
+      - ^nova/locale/.*$
+      - ^placement-api-ref/.*$
+      - ^releasenotes/.*$
+    vars:
+      tox_envlist: functional-py35
+    timeout: 3600
+
+- project:
+    name: openstack/nova
+    check:
+      jobs:
+        - nova-tox-functional
+        - nova-tox-functional-py35
+    gate:
+      jobs:
+        - nova-tox-functional
+        - nova-tox-functional-py35

HACKING.rst

@@ -21,13 +21,10 @@ Nova Specific Commandments
   should be moved into a common module
 - [N313] capitalize help string
   Config parameter help strings should have a capitalized first letter
-- [N314] vim configuration should not be kept in source files.
 - [N316] Change assertTrue(isinstance(A, B)) by optimal assert like
   assertIsInstance(A, B).
 - [N317] Change assertEqual(type(A), B) by optimal assert like
   assertIsInstance(A, B)
-- [N318] Change assertEqual(A, None) or assertEqual(None, A) by optimal assert like
-  assertIsNone(A)
 - [N319] Validate that debug level logs are not translated.
 - [N320] Setting CONF.* attributes directly in tests is forbidden. Use
   self.flags(option=value) instead.
@@ -37,6 +34,7 @@ Nova Specific Commandments
 - [N324] Ensure that jsonutils.%(fun)s must be used instead of json.%(fun)s
 - [N325] str() and unicode() cannot be used on an exception.  Remove use or use six.text_type()
 - [N326] Translated messages cannot be concatenated.  String should be included in translated message.
+- [N327] Do not use xrange(). xrange() is not compatible with Python 3. Use range() or six.moves.range() instead.
 - [N328] Validate that LOG.info messages use _LI.
 - [N329] Validate that LOG.exception messages use _LE.
 - [N330] Validate that LOG.warning and LOG.warn messages use _LW.
@@ -57,8 +55,17 @@ Nova Specific Commandments
 - [N344] Python 3: do not use dict.iteritems.
 - [N345] Python 3: do not use dict.iterkeys.
 - [N346] Python 3: do not use dict.itervalues.
-- [N347] Provide enough help text for config options
 - [N348] Deprecated library function os.popen()
+- [N349] Check for closures in tests which are not used
+- [N350] Policy registration should be in the central location ``nova/policies/``
+- [N351] Do not use the oslo_policy.policy.Enforcer.enforce() method.
+- [N352] LOG.warn is deprecated. Enforce use of LOG.warning.
+- [N353] Validate that context objects is not passed in logging calls.
+- [N355] Enforce use of assertTrue/assertFalse
+- [N356] Enforce use of assertIs/assertIsNot
+- [N357] Use oslo_utils.uuidutils or uuidsentinel(in case of test cases) to
+  generate UUID instead of uuid4().
+- [N358] Return must always be followed by a space when returning a value.
 
 Creating Unit Tests
 -------------------
@@ -119,8 +126,8 @@ need with::
 
     apt-get install texlive-full imagemagick
 
-Then you can then use the ``build_latex_pdf.sh`` script in tools/ to take care
-of both the the sphinx latex generation and the latex compilation. For example::
+Then you can use the ``build_latex_pdf.sh`` script in tools/ to take care
+of both the sphinx latex generation and the latex compilation. For example::
 
     tools/build_latex_pdf.sh
 

README.rst

@@ -1,61 +1,74 @@
-OpenStack Nova README
-=====================
+========================
+Team and repository tags
+========================
 
-OpenStack Nova provides a cloud computing fabric controller,
-supporting a wide variety of virtualization technologies,
-including KVM, Xen, LXC, VMware, and more. In addition to
-its native API, it includes compatibility with the commonly
-encountered Amazon EC2 and S3 APIs.
+.. image:: https://governance.openstack.org/badges/nova.svg
+    :target: https://governance.openstack.org/reference/tags/index.html
 
-OpenStack Nova is distributed under the terms of the Apache
-License, Version 2.0. The full terms and conditions of this
-license are detailed in the LICENSE file.
+.. Change things from this point on
 
-Nova primarily consists of a set of Python daemons, though
-it requires and integrates with a number of native system
-components for databases, messaging and virtualization
-capabilities.
+OpenStack Nova
+==============
 
-To keep updated with new developments in the OpenStack project
-follow `@openstack <http://twitter.com/openstack>`_ on Twitter.
+OpenStack Nova provides a cloud computing fabric controller, supporting a wide
+variety of compute technologies, including: libvirt (KVM, Xen, LXC and more),
+Hyper-V, VMware, XenServer, OpenStack Ironic and PowerVM.
 
-To learn how to deploy OpenStack Nova, consult the documentation
-available online at:
+Use the following resources to learn more.
+
+API
+---
+
+To learn how to use Nova's API, consult the documentation available online at:
+
+- `Compute API Guide <https://developer.openstack.org/api-guide/compute/>`__
+- `Compute API Reference <https://developer.openstack.org/api-ref/compute/>`__
 
-   http://docs.openstack.org
+For more information on OpenStack APIs, SDKs and CLIs in general, refer to:
 
-For information about the different compute (hypervisor) drivers
-supported by Nova, read this page on the wiki:
+- `OpenStack for App Developers <https://www.openstack.org/appdev/>`__
+- `Development resources for OpenStack clouds
+  <https://developer.openstack.org/>`__
 
-   https://wiki.openstack.org/wiki/HypervisorSupportMatrix
+Operators
+---------
 
-In the unfortunate event that bugs are discovered, they should
-be reported to the appropriate bug tracker. If you obtained
-the software from a 3rd party operating system vendor, it is
-often wise to use their own bug tracker for reporting problems.
-In all other cases use the master OpenStack bug tracker,
+To learn how to deploy and configure OpenStack Nova, consult the documentation
+available online at:
+
+- `OpenStack Nova <https://docs.openstack.org/nova/>`__
+
+In the unfortunate event that bugs are discovered, they should be reported to
+the appropriate bug tracker. If you obtained the software from a 3rd party
+operating system vendor, it is often wise to use their own bug tracker for
+reporting problems. In all other cases use the master OpenStack bug tracker,
 available at:
 
-   http://bugs.launchpad.net/nova
+- `Bug Tracker <https://bugs.launchpad.net/nova>`__
+
+Developers
+----------
 
-Developers wishing to work on the OpenStack Nova project should
-always base their work on the latest Nova code, available from
-the master GIT repository at:
+For information on how to contribute to Nova, please see the contents of the
+CONTRIBUTING.rst.
 
-   https://git.openstack.org/cgit/openstack/nova
+Any new code must follow the development guidelines detailed in the HACKING.rst
+file, and pass all unit tests.
 
-Developers should also join the discussion on the mailing list,
-at:
+Further developer focused documentation is available at:
 
-   http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev
+- `Official Nova Documentation <https://docs.openstack.org/nova/>`__
+- `Official Client Documentation
+  <https://docs.openstack.org/python-novaclient/>`__
 
-Any new code must follow the development guidelines detailed
-in the HACKING.rst file, and pass all unit tests. Further
-developer focused documentation is available at:
+Other Information
+-----------------
 
-   http://docs.openstack.org/developer/nova/
+During each `Summit`_ and `Project Team Gathering`_, we agree on what the whole
+community wants to focus on for the upcoming release. The plans for nova can
+be found at:
 
-For information on how to contribute to Nova, please see the
-contents of the CONTRIBUTING.rst file.
+- `Nova Specs <http://specs.openstack.org/openstack/nova-specs/>`__
 
--- End of broadcast
+.. _Summit: https://www.openstack.org/summit/
+.. _Project Team Gathering: https://www.openstack.org/ptg/

api-guide/source/conf.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 # 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
@@ -88,7 +86,7 @@
 
 # source tree
 pwd = subprocess.Popen(
-    "pwd", stdout=subprocess.PIPE).communicate()[0].strip('\n')
+    "pwd", stdout=subprocess.PIPE).communicate()[0].decode().strip('\n')
 
 # html_context allows us to pass arbitrary values into the html template
 html_context = {"pwd": pwd,