Merge "Rename files to remove 'placement'"

doc/source/conf.py

@@ -58,7 +58,7 @@ bug_project = 'nova'
 bug_tag = 'docs'
 
 policy_generator_config_file = [
-    ('../../etc/placement/placement-policy-generator.conf',
+    ('../../etc/placement/policy-generator.conf',
      '_static/placement')
 ]
 

doc/source/configuration/index.rst

@@ -25,10 +25,10 @@ Policy
 Placement, like most OpenStack projects, uses a policy language to restrict
 permissions on REST API actions.
 
-* :doc:`Policy Reference <placement-policy>`: A complete
+* :doc:`Policy Reference <policy>`: A complete
   reference of all policy points in placement and what they impact.
 
-* :doc:`Sample Policy File <sample-placement-policy>`: A sample
+* :doc:`Sample Policy File <sample-policy>`: A sample
   placement policy file with inline documentation.
 
 
@@ -38,8 +38,8 @@ permissions on REST API actions.
 .. toctree::
    :hidden:
 
-   placement-policy
+   policy
-   sample-placement-policy
+   sample-policy
 
 .. TODO(efried):: get these working
    config

doc/source/configuration/policy.rst

@@ -4,7 +4,7 @@ Placement Policies
 
 The following is an overview of all available policies in Placement.
 For a sample configuration file, refer to
-:doc:`/configuration/sample-placement-policy`.
+:doc:`/configuration/sample-policy`.
 
 .. show-policy::
-   :config-file: etc/placement/placement-policy-generator.conf
+   :config-file: etc/placement/policy-generator.conf

doc/source/contributor/index.rst

@@ -318,21 +318,21 @@ number of tests it makes sense to have more YAML files with fewer tests,
 divided up by the arc of API interaction that they test.
 
 The gabbi tests are integrated into the functional tox target, loaded via
-``nova/tests/functional/api/openstack/placement/test_placement_api.py``. If you
+``nova/tests/functional/api/openstack/placement/test_api.py``. If you
 want to run just the gabbi tests one way to do so is::
 
-    tox -efunctional test_placement_api
+    tox -efunctional test_api
 
 If you want to run just one yaml file (in this example ``inventory.yaml``)::
 
-    tox -efunctional placement_api.inventory
+    tox -efunctional api.inventory
 
 It is also possible to run just one test from within one file. When you do this
 every test prior to the one you asked for will also be run. This is because
 the YAML represents a sequence of dependent requests. Select the test by using
 the name in the yaml file, replacing space with ``_``::
 
-    tox -efunctional placement_api.inventory_post_new_ipv4_address_inventory
+    tox -efunctional api.inventory_post_new_ipv4_address_inventory
 
 .. note:: ``tox.ini`` in the nova repository is configured by a ``group_regex``
           so that each gabbi YAML is considered a group. Thus, all tests in the

etc/placement/README-policy.yaml.txt

@@ -21,4 +21,4 @@ from the top level of the nova directory:
 
 For a pre-generated example of the latest placement policy.yaml, see:
 
-    https://docs.openstack.org/nova/latest/configuration/sample-placement-policy.html
+    https://docs.openstack.org/nova/latest/configuration/sample-policy.html

placement/conf/placement.py

@@ -42,8 +42,8 @@ is determined.
     cfg.StrOpt(
         'policy_file',
         # This default matches what is in
-        # etc/nova/placement-policy-generator.conf
+        # etc/nova/policy-generator.conf
-        default='placement-policy.yaml',
+        default='policy.yaml',
         help='The file that defines placement policies. This can be an '
              'absolute path or relative to the configuration file.'),
     cfg.StrOpt(

tox.ini

@@ -80,7 +80,7 @@ commands =
 # special way. See the following for more details.
 # http://stestr.readthedocs.io/en/latest/MANUAL.html#grouping-tests
 # https://gabbi.readthedocs.io/en/latest/#purpose
-  stestr --test-path=./placement/tests/functional --group_regex=placement\.tests\.functional\.test_placement_api(?:\.|_)([^_]+) run {posargs}
+  stestr --test-path=./placement/tests/functional --group_regex=placement\.tests\.functional\.test_api(?:\.|_)([^_]+) run {posargs}
   stestr slowest
 
 # TODO(gcb) Merge this into [testenv:functional] when functional tests are gating
@@ -108,7 +108,7 @@ commands =
 [testenv:genpolicy]
 envdir = {toxworkdir}/shared
 commands =
-  oslopolicy-sample-generator --config-file=etc/placement/placement-policy-generator.conf
+  oslopolicy-sample-generator --config-file=etc/placement/policy-generator.conf
 
 [testenv:cover]
 # TODO(stephenfin): Remove the PYTHON hack below in favour of a [coverage]