Replace "tenant_id" with "project_id"

Replace "tenant_id" with "project_id" in:
- Trunk service
- QoS plugin service

This is part of the remaining technical debt of the specs
https://specs.openstack.org/openstack/neutron-specs/specs/newton/moving-to-keystone-v3.html

Change-Id: I39d049bb506f24d1e1e2a35b659c93d0a22093f8
Blueprint: https://blueprints.launchpad.net/neutron/+spec/keystone-v3

neutron/services/qos/qos_plugin.py

@@ -442,14 +442,12 @@ class QoSPlugin(qos.QoSPluginBase):
 
         :returns: a QosPolicy object
         """
-        # NOTE(dasm): body 'policy' contains both tenant_id and project_id
-        # but only latter needs to be used to create QosPolicy object.
-        # We need to remove redundant keyword.
-        # This cannot be done in other place of stacktrace, because neutron
-        # needs to be backward compatible.
-        tenant_id = policy['policy'].pop('tenant_id', None)
+        # TODO(ralonsoh): "project_id" check and "tenant_id" removal will be
+        # unnecessary once we fully migrate to keystone V3.
         if not policy['policy'].get('project_id'):
-            policy['policy']['project_id'] = tenant_id
+            raise lib_exc.BadRequest(resource='QoS policy',
+                                     msg='Must have "policy_id"')
+        policy['policy'].pop('tenant_id', None)
         policy_obj = policy_object.QosPolicy(context, **policy['policy'])
         with db_api.CONTEXT_WRITER.using(context):
             policy_obj.create()

neutron/services/trunk/plugin.py

@@ -245,7 +245,7 @@ class TrunkPlugin(service_base.ServicePluginBase):
                                         id=uuidutils.generate_uuid(),
                                         name=trunk.get('name', ""),
                                         description=trunk_description,
-                                        project_id=trunk['tenant_id'],
+                                        project_id=trunk['project_id'],
                                         port_id=trunk['port_id'],
                                         status=constants.TRUNK_DOWN_STATUS,
                                         sub_ports=sub_ports)

neutron/tests/functional/services/trunk/test_plugin.py

@@ -31,7 +31,7 @@ class TestTrunkServicePlugin(ml2_test_base.ML2TestFramework):
         with self.port() as port:
             trunk_port_id = port['port']['id']
             trunk_req = {'port_id': trunk_port_id,
-                         'tenant_id': 'test_tenant',
+                         'project_id': 'test_tenant',
                          'sub_ports': []}
             trunk_res = self.trunk_plugin.create_trunk(self.context,
                                                        {'trunk': trunk_req})

neutron/tests/unit/services/qos/test_qos_plugin.py

@@ -504,7 +504,6 @@ class TestQosPlugin(base.BaseQosTestCase):
         tenant_policy = {
             'policy': {'id': policy_id,
                        'project_id': project_id,
-                       'tenant_id': project_id,
                        'name': 'test-policy',
                        'description': 'Test policy description',
                        'shared': True,

neutron/tests/unit/services/trunk/rpc/test_server.py

@@ -50,7 +50,7 @@ class TrunkSkeletonTest(test_plugin.Ml2PluginV2TestCase):
     def _create_test_trunk(self, port, subports=None):
         subports = subports if subports else []
         trunk = {'port_id': port['port']['id'],
-                 'tenant_id': 'test_tenant',
+                 'project_id': 'test_tenant',
                  'sub_ports': subports
                  }
         response = (

neutron/tests/unit/services/trunk/test_plugin.py

@@ -58,7 +58,7 @@ class TrunkPluginTestCase(test_plugin.Ml2PluginV2TestCase):
     def _create_test_trunk(self, port, subports=None):
         subports = subports if subports else []
         trunk = {'port_id': port['port']['id'],
-                 'tenant_id': 'test_tenant',
+                 'project_id': 'test_tenant',
                  'sub_ports': subports}
         response = (
             self.trunk_plugin.create_trunk(self.context, {'trunk': trunk}))

neutron/tests/unit/services/trunk/test_rules.py

@@ -239,7 +239,7 @@ class TrunkPortValidatorTestCase(test_plugin.Ml2PluginV2TestCase):
     def test_validate_port_parent_in_use_by_trunk(self):
         with self.port() as trunk_parent:
             trunk = {'port_id': trunk_parent['port']['id'],
-                     'tenant_id': 'test_tenant',
+                     'project_id': 'test_tenant',
                      'sub_ports': []}
             self.trunk_plugin.create_trunk(
                 self.context, {trunk_api.ALIAS: trunk})
@@ -252,7 +252,7 @@ class TrunkPortValidatorTestCase(test_plugin.Ml2PluginV2TestCase):
         with self.port() as trunk_parent,\
                  self.port() as subport:
             trunk = {'port_id': trunk_parent['port']['id'],
-                     'tenant_id': 'test_tenant',
+                     'project_id': 'test_tenant',
                      'sub_ports': [{'port_id': subport['port']['id'],
                                     'segmentation_type': 'vlan',
                                     'segmentation_id': 2}]}