From 81ceb74eb516884f875c506b63695eae5922a897 Mon Sep 17 00:00:00 2001 From: Doug Wiegley Date: Wed, 13 May 2015 18:47:02 -0600 Subject: [PATCH] Shorten the spec template greatly. Since neutron is moving to using RFE's for features, only the larger or contentious features will require specs. This change removes many of the spec sections that will become redundant with the information included in the RFE itself and the devref developer docs that are now expected with the code. Also, tweak the py27 test to accept both old and new spec formats Change-Id: I5aeb2cb39740ac85e0485f4e26d6fb380bd4d271 --- specs/skeleton.rst | 87 +------- specs/template.rst | 498 ++++--------------------------------------- tests/test_titles.py | 11 +- 3 files changed, 56 insertions(+), 540 deletions(-) diff --git a/specs/skeleton.rst b/specs/skeleton.rst index 11530074c..7ffc364de 100644 --- a/specs/skeleton.rst +++ b/specs/skeleton.rst @@ -5,7 +5,7 @@ http://creativecommons.org/licenses/by/3.0/legalcode ========================================== -Title of your blueprint +Title of your RFE ========================================== @@ -17,91 +17,6 @@ Proposed Change =============== -Data Model Impact ------------------ - - -REST API Impact ---------------- - - -Security Impact ---------------- - - -Notifications Impact --------------------- - - -Other End User Impact ---------------------- - - -Performance Impact ------------------- - - -IPv6 Impact ------------ - - -Other Deployer Impact ---------------------- - - -Developer Impact ----------------- - - -Community Impact ----------------- - - -Alternatives ------------- - - -Implementation -============== - -Assignee(s) ------------ - - -Work Items ----------- - - -Dependencies -============ - - -Testing -======= - -Tempest Tests -------------- - - -Functional Tests ----------------- - - -API Tests ---------- - - -Documentation Impact -==================== - -User Documentation ------------------- - - -Developer Documentation ------------------------ - - References ========== diff --git a/specs/template.rst b/specs/template.rst index 8c58bb558..d992541b3 100644 --- a/specs/template.rst +++ b/specs/template.rst @@ -4,24 +4,22 @@ http://creativecommons.org/licenses/by/3.0/legalcode -========================================== -Example Spec - The title of your blueprint -========================================== +==================================== +Example Spec - The title of your RFE +==================================== -Include the URL of your launchpad blueprint: +Include the URL of your launchpad RFE: -https://blueprints.launchpad.net/neutron/+spec/example +https://bugs.launchpad.net/neutron/+bug/example-id -Introduction paragraph -- why are we doing anything? A single paragraph of -prose that **operators, deployers, and developers** can understand. +Introduction paragraph -- why are we doing this feature? A single paragraph of +prose that **deployers, and developers, and operators** can understand. -If your specification proposes any changes to the Neutron REST API such -as changing parameters which can be returned or accepted, or even -the semantics of what happens when a client calls into the API, then -you should add the APIImpact flag to the commit message. Specifications with -the APIImpact flag can be found with the following query: - -https://review.openstack.org/#/q/status:open+project:openstack/neutron-specs+message:apiimpact,n,z +Do you even need to file a spec? Most features can be done by filing an RFE bug +and moving on with life. In most cases, filing an RFE and documenting your +design in the devref folder of neutron docs is sufficient. If the feature +seems very large or contentious, then the drivers team may request a spec, or +you can always file one if desired. Problem Description @@ -35,453 +33,47 @@ A detailed description of the problem: * For a major reworking of something existing it would describe the problems in that feature that are being addressed. +Note that the RFE filed for this feature will have a description already. This +section is not meant to simply duplicate that; you can simply refer to that +description if it is sufficient, and use this space to capture changes to +the description based on bug comments or feedback on the spec. + Proposed Change =============== -Here is where you cover the change you propose to make in detail. How do you -propose to solve this problem? +How do you propose to solve this problem? + +This section is optional, and provides an area to discuss your high-level +design at the same time as use cases, if desired. Note that by high-level, +we mean the "view from orbit" rough cut at how things will happen. + +This section should 'scope' the effort from a feature standpoint: how is the +'neutron end-to-end system' going to look like after this change? What Neutron +areas do you intend to touch and how do you intend to work on them? The list +below is not meant to be a template to fill in, but rather a jumpstart on the +sorts of areas to consider in your proposed change description. + +* Am I going to see new CLI commands? +* How do you intend to support or affect aspects like: + * Address Management, e.g. IPv6, DHCP + * Routing, e.g. DVR/HA + * Plugins, ML2 Drivers, e.g. OVS, LinuxBridge + * Agents, e.g. metadata + * High level services, e.g. *-aas. + * Scheduling, quota, and policy management, e.g. admin vs user rights + * API and extensions + * Clients + * Impact on services or out-of-tree plugins/drivers +* What do you intend to not support in the initial release? + +You do not need to detail API or data model changes. Details at that level of +granularity belong in the neutron devref docs. -If this is one part of a larger effort make it clear where this piece ends. In -other words, what's the scope of this effort? - -Data Model Impact ------------------ - -Changes which require modifications to the data model often have a wider impact -on the system. The community often has strong opinions on how the data model -should be evolved, from both a functional and performance perspective. It is -therefore important to capture and gain agreement as early as possible on any -proposed changes to the data model. - -Questions which need to be addressed by this section include: - -* What new data objects and/or database schema changes is this going to require? - -* What database migrations will accompany this change. - -* How will the initial set of new data objects be generated, for example if you - need to take into account existing instances, or modify other existing data - describe how that will work. - -REST API Impact ---------------- - -For each API resource to be implemented using Neutron's attribute map -facility (see the neutron.api.v2.attributes), describe the resource -collection and specify the name, type, and other essential details of -each new or modified attribute. A table similar to the following may -be used: - -+----------+-------+---------+---------+------------+--------------+ -|Attribute |Type |Access |Default |Validation/ |Description | -|Name | | |Value |Conversion | | -+==========+=======+=========+=========+============+==============+ -|id |string |RO, all |generated|N/A |identity | -| |(UUID) | | | | | -+----------+-------+---------+---------+------------+--------------+ -|name |string |RW, all |'' |string |human-readable| -| | | | | |name | -+----------+-------+---------+---------+------------+--------------+ -|color |string |RW, admin|'red' |'red', |color | -| | | | |'yellow', or|indicating | -| | | | |'green' |state | -+----------+-------+---------+---------+------------+--------------+ - - -Here is the other example of the table using csv-table - - -.. csv-table:: CSVTable - :header: Attribute Name,Type,Access,Default Value,Validation Conversion,Description - - id,string (UUID),"RO, all",generated,N/A,identity - name,string,"RW, all","''",string,human-readable name - color,string,"RW, admin",red,"'red', 'yellow' or 'green'",color indicating state - - -Each API method which is either added or changed that does not use -Neutron's attribute map facility should have the following: - -* Specification for the method - - * A description of what the method does suitable for use in - user documentation - - * Method type (POST/PUT/GET/DELETE) - - * Normal http response code(s) - - * Expected error http response code(s) - - * A description for each possible error code should be included - describing semantic errors which can cause it such as - inconsistent parameters supplied to the method, or when an - instance is not in an appropriate state for the request to - succeed. Errors caused by syntactic problems covered by the JSON - schema defintion do not need to be included. - - * URL for the resource - - * Parameters which can be passed via the url - - * JSON schema definition for the body data if allowed - - * JSON schema definition for the response data if any - -* Example use case including typical API samples for both data supplied - by the caller and the response - -* Discuss any API policy changes, and discuss what things a deployer needs to - think about when defining their API policy. This is in reference to the - policy.json file. - -Note that the schema should be defined as restrictively as -possible. Parameters which are required should be marked as such and -only under exceptional circumstances should additional parameters -which are not defined in the schema be permitted (eg -additionaProperties should be False). - -Reuse of existing predefined parameter types such as regexps for -passwords and user defined names is highly encouraged. - -Security Impact ---------------- - -Describe any potential security impact on the system. Some of the items to -consider include: - -* Does this change touch sensitive data such as tokens, keys, or user data? - -* Does this change alter the API in a way that may impact security, such as - a new way to access sensitive information or a new way to login? - -* Does this change involve cryptography or hashing? - -* Does this change require the use of sudo or any elevated privileges? - -* Does this change involve using or parsing user-provided data? This could - be directly at the API level or indirectly such as changes to a cache layer. - -* Can this change enable a resource exhaustion attack, such as allowing a - single API interaction to consume significant server resources? Some examples - of this include launching subprocesses for each connection, or entity - expansion attacks in XML. - -For more detailed guidance, please see the OpenStack Security Guidelines -[#security_guidelines]_ as a reference. These guidelines are a work in -progress and are designed to help you identify security best practices. -For further information, feel free to reach out to the OpenStack Security -Group at openstack-security@lists.openstack.org. - -.. [#security_guidelines] OpenStack Security Guidelines - https://wiki.openstack.org/wiki/Security/Guidelines - -Notifications Impact --------------------- - -Please specify any changes to notifications. Be that an extra notification, -changes to an existing notification, or removing a notification. - -Other End User Impact ---------------------- - -Aside from the API, are there other ways a user will interact with this feature? - -* Does this change have an impact on python-neutronclient? What does the user - interface there look like? - -Performance Impact ------------------- - -Describe any potential performance impact on the system, for example -how often will new code be called, and is there a major change to the calling -pattern of existing code. - -Examples of things to consider here include: - -* A periodic task might look like a small addition but if it calls conductor or - another service the load is multiplied by the number of nodes in the system. - -* A small change in a utility function or a commonly used decorator can have a - large impacts on performance. - -* Calls which result in a database queries (whether direct or via conductor) can - have a profound impact on performance when called in critical sections of the - code. - -* Will the change include any locking, and if so what considerations are there on - holding the lock? - -IPv6 Impact ------------ - -Describe if this change will have an effect on IPv6 in Neutron. You should also -document here how your change will work with the existing IPv6 infrastructure -in Neutron. - -* Does this change work with IPv6? - -* Does this change require Neutron changes to facilitate working with IPv6? - -* Describe how this change will work when deployed with IPv6 tenant networks. - -Other Deployer Impact ---------------------- - -Discuss things that will affect how you deploy and configure OpenStack -that have not already been mentioned, such as: - -* What config options are being added? Should they be more generic than - proposed (for example a flag that other hypervisor drivers might want to - implement as well)? Are the default values ones which will work well in - real deployments? - -* Is this a change that takes immediate effect after its merged, or is it - something that has to be explicitly enabled? - -* If this change is a new binary, how would it be deployed? - -* Please state anything that those doing continuous deployment, or those - upgrading from the previous release, need to be aware of. Also describe - any plans to deprecate configuration values or features. For example, if we - change the directory name that instances are stored in, how do we handle - instance directories created before the change landed? Do we move them? Do - we have a special case in the code? Do we assume that the operator will - recreate all the instances in their cloud? - -* Does this require downtime or manual intervention to apply when upgrading? - -Developer Impact ----------------- - -Discuss things that will affect other developers working on OpenStack, -such as: - -* If the blueprint proposes a change to the API, discussion of how other - plugins would implement the feature is required. - -Community Impact ----------------- - -Describe how this change fits in with the direction the Neutron community is -going. - -* Has the change been discussed on mailing lists, at the weekly Neutron - meeting, or at a Design Summit? - -* Does the change fit with the direction of the Neutron community? - -Alternatives ------------- - -What other ways could we do this thing? Why aren't we using those? This doesn't -have to be a full literature review, but it should demonstrate that thought has -been put into why the proposed solution is an appropriate one. - - -Implementation -============== - -Assignee(s) ------------ - -Who is leading the writing of the code? Or is this a blueprint where you're -throwing it out there to see who picks it up? - -If more than one person is working on the implementation, please designate the -primary author and contact. - -Primary assignee: - - -Other contributors: - - -Work Items ----------- - -Work items or tasks -- break the feature up into the things that need to be -done to implement it. Those parts might end up being done by different people, -but we're mostly trying to understand the timeline for implementation. - - -Dependencies -============ - -* Include specific references to specs and/or blueprints in neutron, or in other - projects, that this one either depends on or is related to. - -* If this requires functionality of another project that is not currently used - by Neutron (such as the glance v2 API when we previously only required v1), - document that fact. - -* Does this feature require any new library dependencies or code otherwise not - included in OpenStack? Or does it depend on a specific version of library? - - -Testing -======= - -Please discuss how the change will be tested. We especially want to know what -tempest tests will be added. It is assumed that unit test coverage will be -added so that doesn't need to be mentioned explicitly, but discussion of why -you think unit tests are sufficient and we don't need to add more tempest -tests would need to be included. - -Is this untestable in gate given current limitations (specific hardware / -software configurations available)? If so, are there mitigation plans (3rd -party testing, gate enhancements, etc). - -Tempest Tests -------------- - -List new, changed, or deleted Tempest tests in this section. If a blueprint -has been filed in the Tempest specs repository, please cross reference that -blueprint here. - -Functional Tests ----------------- - -Please document any functional tests which this change will require. New -features will require functional tests before being allowed to be merged. -Code refactors may require functional tests. - -API Tests ---------- - -Add changes to API tests in this section. This is required if the change is -adding, removing, or changing any API related code in Neutron. - - -Documentation Impact -==================== - -What is the impact on the docs team of this change? Some changes might require -donating resources to the docs team to have the documentation updated. Don't -repeat details discussed above, but please reference them here. - -User Documentation ------------------- - -Specify any User Documentation which needs to be changed. Reference the guides -which need updating due to this change. - -Developer Documentation ------------------------ - -If API changes are being made, specify the developer API documentation which -will be updated to reflect the new changes here. References ========== Please add any useful references here. You are not required to have any reference. Moreover, this specification should still make sense when your -references are unavailable. Examples of what you could include are: - -* Links to mailing list or IRC discussions - -* Links to notes from a summit session - -* Links to relevant research, if appropriate - -* Related specifications as appropriate (e.g. link any vendor documentation) - -* Anything else you feel it is worthwhile to refer to - - -NOTE: Please remove everything from here and down. This section is meant to -show examples of how to format the spec. - -Some notes about using this template: - -* Your spec should be in ReSTructured text, like this template. - -* Please wrap text at 80 columns. - -* The filename in the git repository should match the launchpad URL, for - example a URL of: https://blueprints.launchpad.net/neutron/+spec/awesome-thing - should be named awesome-thing.rst - -* Please do not delete any of the sections in this template. If you have - nothing to say for a whole section, just write: None - -* For help with syntax, see http://sphinx-doc.org/rest.html - -* To test out your formatting, build the docs using tox, or see: - http://rst.ninjs.org - -* If you would like to provide a diagram with your spec, text representations - are preferred. http://asciiflow.com/ is a very nice tool to assist with - making ascii diagrams. blockdiag is another tool. These are described below. - If you require an image (screenshot) for your BP, attaching that to the BP - and checking it in is also accepted. However, text representations are prefered. - -* Diagram examples - -asciiflow:: - - +----------+ +-----------+ +----------+ - | A | | B | | C | - | +-----+ +--------+ | - +----------+ +-----------+ +----------+ - -blockdiag - -.. blockdiag:: - - blockdiag sample { - a -> b -> c; - } - -actdiag - -.. actdiag:: - - actdiag { - write -> convert -> image - lane user { - label = "User" - write [label = "Writing reST"]; - image [label = "Get diagram IMAGE"]; - } - lane actdiag { - convert [label = "Convert reST to Image"]; - } - } - -nwdiag - -.. nwdiag:: - - nwdiag { - network dmz { - address = "210.x.x.x/24" - - web01 [address = "210.x.x.1"]; - web02 [address = "210.x.x.2"]; - } - network internal { - address = "172.x.x.x/24"; - - web01 [address = "172.x.x.1"]; - web02 [address = "172.x.x.2"]; - db01; - db02; - } - } - - -seqdiag - -.. seqdiag:: - - seqdiag { - browser -> webserver [label = "GET /index.html"]; - browser <-- webserver; - browser -> webserver [label = "POST /blog/comment"]; - webserver -> database [label = "INSERT comment"]; - webserver <-- database; - browser <-- webserver; - } +references are unavailable. diff --git a/tests/test_titles.py b/tests/test_titles.py index 0acaaec01..6bc2278f7 100644 --- a/tests/test_titles.py +++ b/tests/test_titles.py @@ -40,8 +40,17 @@ class TestTitles(testtools.TestCase): return titles def _check_titles(self, filename, expect, actual): + # TODO(dougwig): old style specs get a pass + old = [ + 'Dependencies', + 'Documentation Impact', + 'Implementation', + 'Testing', + ] + old += expect + missing_sections = [x for x in expect if x not in actual] - extra_sections = [x for x in actual if x not in expect] + extra_sections = [x for x in actual if x not in old] msgs = [] if missing_sections: