api-ref: Update to current state of Keystone V3 support

Use 'project' instead of 'tenant' in descriptions. Accept either 'tenant_id' or 'project_id' in requests. Return both 'tenant_id' or 'project_id' in responses. Related Blueprint: keystone-v3 Change-Id: I606f7399dfb824ba08922470f6e46b0a150af33b
2016-09-19 23:03:03 -04:00 · 2016-09-19 23:03:03 -04:00 · 429e5c2c95
parent 4b02ff4198
commit 429e5c2c95
146 changed files with 686 additions and 601 deletions
--- a/api-ref/source/v2/flavors.inc
+++ b/api-ref/source/v2/flavors.inc
@ -38,9 +38,8 @@ Show service profile details

 Shows details for a service profile.

-This operation returns a service profile object by ID. If you are
-not an administrative user and the object is not visible to your
-tenant account, the service returns the HTTP ``Forbidden (403)``
+This operation returns a service profile object by ID. If the object is not
+visible by policy, the service returns the HTTP ``Forbidden (403)``
 response code.

 Normal response codes: 200
@ -143,7 +142,7 @@ List service profiles

 .. rest_method::  GET /v2.0/service_profiles

-Lists all service profiles visible for the tenant account.
+Lists all service profiles visible to the project.

 The list can be empty.

@ -237,7 +236,7 @@ List flavors

 .. rest_method::  GET /v2.0/flavors

-Lists all flavors visible for the tenant account.
+Lists all flavors visible to the project.

 The list can be empty.

@ -386,9 +385,8 @@ Show flavor details

 Shows details for a flavor.

-This operation returns a flavor object by ID. If you are not an
-administrative user and the flavor object is not visible to your
-tenant account, the service returns the HTTP ``Forbidden (403)``
+This operation returns a flavor object by ID. If the flavor object is not
+visible by policy, the service returns the HTTP ``Forbidden (403)``
 response code.

 Normal response codes: 200
--- a/api-ref/source/v2/floatingips.inc
+++ b/api-ref/source/v2/floatingips.inc
@ -13,11 +13,10 @@ List floating IPs

 .. rest_method::  GET /v2.0/floatingips

-Lists floating IPs that are accessible to the tenant who submits the request.
+Lists floating IPs visible to the user.

-Default policy settings return only those floating IPs that are
-owned by the tenant who submits the request, unless an admin user
-submits the request.
+Default policy settings return only the floating IPs owned by the user's
+project, unless the user has admin role.

 This example request lists floating IPs in JSON format:

@ -45,7 +44,8 @@ Response Parameters

   - router_id: router_id
   - status: status
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - floating_network_id: floating_network_id
   - fixed_ip_address: fixed_ip_address
   - floating_ip_address: floating_ip_address
@ -126,7 +126,8 @@ Request
 .. rest_parameters:: parameters.yaml

   - floatingip: floatingip
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - floating_network_id: floating_network_id
   - fixed_ip_address: fixed_ip_address
   - floating_ip_address: floating_ip_address
@ -146,7 +147,8 @@ Response Parameters
   - router_id: router_id
   - status: status
   - floatingip: floatingip
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - floating_network_id: floating_network_id
   - fixed_ip_address: fixed_ip_address
   - floating_ip_address: floating_ip_address
@ -195,7 +197,8 @@ Response Parameters
   - router_id: router_id
   - status: status
   - floatingip: floatingip
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - floating_network_id: floating_network_id
   - fixed_ip_address: fixed_ip_address
   - floating_ip_address: floating_ip_address
@ -256,7 +259,8 @@ Response Parameters
   - router_id: router_id
   - status: status
   - floatingip: floatingip
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - floating_network_id: floating_network_id
   - fixed_ip_address: fixed_ip_address
   - floating_ip_address: floating_ip_address
--- a/api-ref/source/v2/fwaas.inc
+++ b/api-ref/source/v2/fwaas.inc
@ -13,7 +13,7 @@ firewalls to protect your networks.

 The FWaaS extension enables you to:

- Apply firewall rules on traffic entering and leaving tenant
+- Apply firewall rules on traffic entering and leaving project
  networks.

 - Apply TCP, UDP, ICMP, or protocol-agnostic rules.
@ -25,14 +25,14 @@ The FWaaS extension enables you to:

 This extension introduces these resources:

- ``firewall``. A logical firewall resource that a tenant can
+- ``firewall``. A logical firewall resource that a project can
  instantiate and manage. A firewall can have one firewall policy.

 - ``firewall_policy``. An ordered collection of firewall rules. You
-  can share a firewall policy across tenants. You can include a
+  can share a firewall policy across projects. You can include a
  firewall policy as part of an audit workflow so that an
  authorized relevant entity can audit the firewall policy. This
-  entity can differ from the tenant who created, or the tenants
+  entity can differ from the user who created, or the projects
  that use, the firewall policy.

 - ``firewall_rule``. A collection of attributes, such as ports and
@ -79,7 +79,8 @@ Response Parameters

   - name: name
   - firewall_rules: firewall_rules
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - firewall_list: firewall_list
   - audited: audited
   - shared: shared
@ -100,7 +101,7 @@ Show firewall policy details
 Shows details for a firewall policy.

 If the user is not an administrative user and the firewall policy
-object does not belong to the tenant account, this call returns the
+object does not belong to the project, this call returns the
 ``Forbidden (403)`` response code.

 Normal response codes: 200
@ -122,7 +123,8 @@ Response Parameters
   - firewall_policy: firewall_policy
   - name: name
   - firewall_rules: firewall_rules
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - audited: audited
   - shared: shared
   - id: id
@ -166,7 +168,8 @@ Response Parameters
   - firewall_policy: firewall_policy
   - name: name
   - firewall_rules: firewall_rules
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - audited: audited
   - shared: shared
   - id: id
@ -217,7 +220,8 @@ Response Parameters

   - name: name
   - firewall_rules: firewall_rules
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - audited: audited
   - firewall_policies: firewall_policies
   - shared: shared
@ -247,7 +251,8 @@ Request
   - firewall_rules_id: firewall_rules_id
   - firewall_policy: firewall_policy
   - name: name
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - shared: shared
   - audited: audited
   - description: description
@ -266,7 +271,8 @@ Response Parameters
   - firewall_policy: firewall_policy
   - name: name
   - firewall_rules: firewall_rules
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - audited: audited
   - shared: shared
   - id: id
@ -280,7 +286,7 @@ Show firewall rule details
 Shows details for a firewall rule.

 If the user is not an administrative user and the firewall rule
-object does not belong to the tenant account, this call returns the
+object does not belong to the project, this call returns the
 ``Forbidden (403)`` response code.

 Normal response codes: 200
@ -302,7 +308,8 @@ Response Parameters
   - firewall_rule: firewall_rule
   - description: description
   - source_ip_address: source_ip_address
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - enabled: enabled
   - protocol: protocol
   - source_port: source_port
@ -340,7 +347,8 @@ Request

   - firewall_rule: firewall_rule
   - description: description
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - enabled: enabled
   - ip_version: ip_version
   - destination_ip_address: destination_ip_address
@ -366,7 +374,8 @@ Response Parameters
   - firewall_rule: firewall_rule
   - description: description
   - source_ip_address: source_ip_address
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - enabled: enabled
   - protocol: protocol
   - source_port: source_port
@ -410,7 +419,7 @@ Show firewall details
 Shows details for a firewall.

 If the user is not an administrative user and the firewall object
-does not belong to the tenant account, this call returns the
+does not belong to the project, this call returns the
 ``Forbidden (403)`` response code.

 Normal response codes: 200
@ -434,7 +443,8 @@ Response Parameters
   - description: description
   - admin_state_up: admin_state_up
   - firewall: firewall
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - firewall_policy_id: firewall_policy_id
   - id: id
   - name: name
@ -488,7 +498,8 @@ Response Parameters
   - description: description
   - admin_state_up: admin_state_up
   - firewall: firewall
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - firewall_policy_id: firewall_policy_id
   - id: id
   - name: name
@ -539,7 +550,8 @@ Response Parameters
   - protocol: protocol
   - description: description
   - source_ip_address: source_ip_address
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - enabled: enabled
   - id: id
   - ip_version: ip_version
@ -575,7 +587,8 @@ Request

   - firewall_rule: firewall_rule
   - description: description
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - enabled: enabled
   - ip_version: ip_version
   - destination_ip_address: destination_ip_address
@ -600,7 +613,8 @@ Response Parameters
   - firewall_rule: firewall_rule
   - description: description
   - source_ip_address: source_ip_address
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - enabled: enabled
   - protocol: protocol
   - source_port: source_port
@ -639,7 +653,8 @@ Response Parameters
   - router_ids: router_ids
   - description: description
   - admin_state_up: admin_state_up
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - firewall_policy_id: firewall_policy_id
   - firewalls: firewalls
   - id: id
@ -693,7 +708,8 @@ Response Parameters
   - description: description
   - admin_state_up: admin_state_up
   - firewall: firewall
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - firewall_policy_id: firewall_policy_id
   - id: id
   - name: name
@ -730,7 +746,8 @@ Response Parameters

   - name: name
   - firewall_rules: firewall_rules
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - firewall_list: firewall_list
   - audited: audited
   - shared: shared
--- a/api-ref/source/v2/intro.inc
+++ b/api-ref/source/v2/intro.inc
@ -35,11 +35,14 @@ Networking service must provide an authentication token in **X-Auth-Token**
 request header. You obtain the token by authenticating to the Keystone
 endpoint.

-When Keystone is enabled, the ``tenant_id`` attribute is not required in create
-requests because the tenant ID is derived from the authentication token.
+When Keystone is enabled, the ``project_id`` attribute is not required in create
+requests because the project ID is derived from the authentication token.
+
+NOTE: Currently the Networking API accepts the deprecated ``tenant_id``
+attribute for the project ID for backward compatibility.

 The default authorization settings allow only administrative users to create
-resources on behalf of a different tenant.
+resources on behalf of a different project.

 OpenStack Networking uses information received from Keystone to authorize user
 requests. OpenStack Networking handles the following types of authorization
@ -67,6 +70,20 @@ Request format
 The Networking API v2.0 only accepts requests with the JSON data serialization
 format. The ``Content-Type`` header is ignored.

+Tenant and project attributes in requests
+-----------------------------------------
+
+Starting with the Newton release of the Networking service, the Networking API
+accepts the ``project_id`` attribute in addition to the ``tenant_id`` attribute
+in requests. The ``tenant_id`` attribute is accepted for backward compatibility.
+If both the ``project_id`` and the ``tenant_id`` attribute are provided in the
+same request, their values must be identical.
+
+To determine whether a Networking API v2.0 endpoint supports the ``project_id``
+attribute in requests, check that the ``project-id`` API extension is enabled
+(see Extensions_).
+
+
 Response format
 ---------------

@ -81,6 +98,19 @@ Query extension

    - **GET** *publicURL*/networks.json

+Tenant and project attributes in responses
+------------------------------------------
+
+Starting with the Newton release of the Networking service, the Networking API
+returns a ``project_id`` attribute in responses, while still returning a
+``tenant_id`` attribute for backward compatibility. The values will always be
+identical.
+
+To determine whether a Networking API v2.0 endpoint returns the ``project_id``
+attribute in responses, check that the ``project-id`` API extension is enabled
+(see Extensions_).
+
+
 Filtering and column selection
 ==============================

@ -230,6 +260,7 @@ To determine if pagination is supported, a user can check whether the
                "status": "ACTIVE",
                "subnets": [],
                "tenant_id": "20bd52ff3e1b40039c312395b04683cf"
+                "project_id": "20bd52ff3e1b40039c312395b04683cf"
            },
            {
                "admin_state_up": true,
@ -243,6 +274,7 @@ To determine if pagination is supported, a user can check whether the
                "status": "ACTIVE",
                "subnets": [],
                "tenant_id": "20bd52ff3e1b40039c312395b04683cf"
+                "project_id": "20bd52ff3e1b40039c312395b04683cf"
            }
        ],
        "networks_links": [
@ -289,6 +321,7 @@ The last page won't show the "next" links
                "status": "ACTIVE",
                "subnets": [],
                "tenant_id": "c05140b3dc7c4555afff9fab6b58edc2"
+                "project_id": "c05140b3dc7c4555afff9fab6b58edc2"
            }
        ],
        "networks_links": [
@ -321,6 +354,9 @@ the background.
 To determine if sorting is supported, a user can check whether the 'sorting'
 extension API is available.

+
+.. _Extensions:
+
 Extensions
 ==========

--- a/api-ref/source/v2/lbaas-v1.inc
+++ b/api-ref/source/v2/lbaas-v1.inc
@ -9,7 +9,7 @@ LBaaS 1.0 (DEPRECATED)
 ======================

 The Load-Balancer-as-a-Service (LBaaS) v1.0 extension pairs with
-the Networking v2.0 API to enable OpenStack tenants to manage load
+the Networking v2.0 API to enable OpenStack projects to manage load
 balancers for their VMs. With this extension, you can load-balance
 client traffic from one network to application services, such as
 VMs, on the same network.
@ -69,7 +69,8 @@ Response Parameters
   - description: description
   - health_monitors: health_monitors
   - subnet_id: subnet_id
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - admin_state_up: admin_state_up
   - vip_id: vip_id
   - health_monitors_status: health_monitors_status
@ -105,7 +106,8 @@ Request
   - description: description
   - admin_state_up: admin_state_up
   - subnet_id: subnet_id
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - pool: pool
   - name: name

@ -126,7 +128,8 @@ Response Parameters
   - description: description
   - health_monitors: health_monitors
   - subnet_id: subnet_id
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - admin_state_up: admin_state_up
   - vip_id: vip_id
   - health_monitors_status: health_monitors_status
@ -165,7 +168,8 @@ Response Parameters
   - description: description
   - health_monitors: health_monitors
   - subnet_id: subnet_id
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - admin_state_up: admin_state_up
   - vip_id: vip_id
   - health_monitors_status: health_monitors_status
@ -221,7 +225,8 @@ Response Parameters
   - description: description
   - health_monitors: health_monitors
   - subnet_id: subnet_id
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - admin_state_up: admin_state_up
   - vip_id: vip_id
   - health_monitors_status: health_monitors_status
@ -282,7 +287,8 @@ Response Parameters
   - description: description
   - admin_state_up: admin_state_up
   - subnet_id: subnet_id
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - connection_limit: connection_limit
   - pool_id: pool_id
   - session_persistence: session_persistence
@ -317,7 +323,8 @@ Request
   - description: description
   - admin_state_up: admin_state_up
   - subnet_id: subnet_id
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - connection_limit: connection_limit
   - pool_id: pool_id
   - session_persistence: session_persistence
@ -343,7 +350,8 @@ Response Parameters
   - description: description
   - admin_state_up: admin_state_up
   - subnet_id: subnet_id
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - connection_limit: connection_limit
   - pool_id: pool_id
   - session_persistence: session_persistence
@ -382,7 +390,8 @@ Response Parameters
   - description: description
   - admin_state_up: admin_state_up
   - subnet_id: subnet_id
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - connection_limit: connection_limit
   - pool_id: pool_id
   - session_persistence: session_persistence
@ -440,7 +449,8 @@ Response Parameters
   - description: description
   - admin_state_up: admin_state_up
   - subnet_id: subnet_id
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - connection_limit: connection_limit
   - pool_id: pool_id
   - session_persistence: session_persistence
@ -497,7 +507,8 @@ Response Parameters
   - status_description: status_description
   - weight: weight
   - admin_state_up: admin_state_up
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - pool_id: pool_id
   - members: members
   - address: address
@ -526,7 +537,8 @@ Request

   - weight: weight
   - admin_state_up: admin_state_up
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - pool_id: pool_id
   - member: member
   - address: address
@ -547,7 +559,8 @@ Response Parameters
   - status_description: status_description
   - weight: weight
   - admin_state_up: admin_state_up
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - pool_id: pool_id
   - member: member
   - address: address
@ -580,7 +593,8 @@ Response Parameters
   - status_description: status_description
   - weight: weight
   - admin_state_up: admin_state_up
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - pool_id: pool_id
   - member: member
   - address: address
@ -629,7 +643,8 @@ Response Parameters
   - status_description: status_description
   - weight: weight
   - admin_state_up: admin_state_up
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - pool_id: pool_id
   - member: member
   - address: address
@ -679,7 +694,8 @@ Response Parameters
 .. rest_parameters:: parameters.yaml

   - health_monitors: health_monitors
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - admin_state_up: admin_state_up
   - delay: delay
   - expected_codes: expected_codes
@ -712,7 +728,8 @@ Request
 .. rest_parameters:: parameters.yaml

   - health_monitor: health_monitor
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - admin_state_up: admin_state_up
   - delay: delay
   - expected_codes: expected_codes
@ -734,7 +751,8 @@ Response Parameters
 .. rest_parameters:: parameters.yaml

   - health_monitor: health_monitor
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - admin_state_up: admin_state_up
   - delay: delay
   - expected_codes: expected_codes
@ -769,7 +787,8 @@ Response Parameters
 .. rest_parameters:: parameters.yaml

   - health_monitor: health_monitor
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - admin_state_up: admin_state_up
   - delay: delay
   - expected_codes: expected_codes
@ -824,7 +843,8 @@ Response Parameters
 .. rest_parameters:: parameters.yaml

   - health_monitor: health_monitor
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - admin_state_up: admin_state_up
   - delay: delay
   - expected_codes: expected_codes
--- a/api-ref/source/v2/lbaas-v2.inc
+++ b/api-ref/source/v2/lbaas-v2.inc
@ -9,7 +9,7 @@ LBaaS 2.0 (STABLE)
 ==================

 The Load-Balancer-as-a-Service (LBaaS) version 2.0 extension pairs with the
-Networking 2.0 API to enable OpenStack tenants to manage load balancers for
+Networking 2.0 API to enable OpenStack projects to manage load balancers for
 their VMs. With this extension you can load- balance client traffic from one
 network to application services, such as VMs, on the same network.

@ -43,7 +43,7 @@ List load balancers

 .. rest_method::  GET /v2.0/lbaas/loadbalancers

-Lists all load balancers for the tenant account.
+Lists all load balancers for the project.

 The list might be empty.

@ -62,7 +62,8 @@ Response Parameters
   - description: description
   - admin_state_up: admin_state_up
   - loadbalancers: loadbalancers
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - provisioning_status: provisioning_status
   - listeners: listeners
   - vip_address: vip_address
@ -111,16 +112,16 @@ You can configure all documented features of the load balancer at
 creation time by specifying the additional elements or attributes
 in the request.

-Administrative users can specify a tenant ID that is different than
-their own to create load balancers for other tenants.
+Administrative users can specify a project ID that is different than
+their own to create load balancers for other projects.

 **Example: Create a load balancer**

- ``tenant_id``. Admin only. Required to create a load balancer for
-  another tenant.
+- ``project_id``. Admin only. Required to create a load balancer for
+  another project.

 - ``vip_subnet_id``. The network on which to allocate the VIP
-  address for the load balancer. A tenant can only create load
+  address for the load balancer. A project can only create load
  balancer VIPs on networks that the policy authorizes, such as her
  own networks or shared or provider networks.

@ -143,8 +144,8 @@ You can configure all documented features of the load balancer at
 creation time by specifying the additional elements or attributes
 in the request.

-Administrative users can specify a tenant ID that is different than
-their own to create load balancers for other tenants.
+Administrative users can specify a project ID that is different than
+their own to create load balancers for other projects.

 If you own the subnet where you want to create the load balancer
 VIP, you can specify a ``vip_address`` attribute. If you omit the
@ -172,7 +173,8 @@ Request

   - description: description
   - admin_state_up: admin_state_up
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - vip_address: vip_address
   - provider: provider
   - vip_subnet_id: vip_subnet_id
@ -192,7 +194,8 @@ Response Parameters

   - description: description
   - admin_state_up: admin_state_up
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - provisioning_status: provisioning_status
   - listeners: listeners
   - vip_address: vip_address
@ -213,7 +216,7 @@ Shows details for a load balancer.

 This operation returns a load balancer object, by ID. If you are
 not an administrative user and the load balancer object does not
-belong to your tenant account, the service returns the HTTP
+belong to your project, the service returns the HTTP
 ``Forbidden (403)`` response code.

 Normal response codes: 200
@ -230,7 +233,8 @@ Response Parameters

   - description: description
   - admin_state_up: admin_state_up
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - provisioning_status: provisioning_status
   - listeners: listeners
   - vip_address: vip_address
@ -291,7 +295,8 @@ Response Parameters

   - description: description
   - admin_state_up: admin_state_up
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - provisioning_status: provisioning_status
   - listeners: listeners
   - vip_address: vip_address
@ -314,7 +319,7 @@ Remove load balancer

 .. rest_method::  DELETE /v2.0/lbaas/loadbalancers/{loadbalancer_id}

-Removes a load balancer and its associated configuration from the tenant account.
+Removes a load balancer and its associated configuration from the project.

 The API immediately purges any and all configuration data. You
 cannot recover it.
@ -335,7 +340,7 @@ Shows the status tree for a load balancer.

 This operation returns a status tree for a load balancer object, by
 load balancer ID. If you are not an administrative user and the
-load balancer object does not belong to the tenant account, the API
+load balancer object does not belong to the project, the API
 returns the ``Forbidden (403)`` response code.

 If the operation succeeds, the returned element is a status tree
@ -378,7 +383,7 @@ List listeners
 Lists all listeners.

 This operation lists all listeners that are associated with your
-tenant account.
+project.

 The list might be empty.

@ -402,7 +407,8 @@ Response Parameters
   - default_tls_container_ref: default_tls_container_ref
   - admin_state_up: admin_state_up
   - loadbalancers: loadbalancers
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - sni_container_refs: sni_container_refs
   - connection_limit: connection_limit
   - listeners: listeners
@ -430,11 +436,11 @@ returned. The object contains a unique identifier.

 At a minimum, you must specify these listener attributes:

- ``tenant_id``. Admin only. Required to create a listener for
-  another tenant.
+- ``project_id``. Admin only. Required to create a listener for
+  another project.

 - ``loadbalancer_id``. The load balancer on which to provision this
-  listener. A tenant can only create listeners on load balancers
+  listener. A project can only create listeners on load balancers
  that the policy authorizes. For example, her own load balancers.

 - ``description``. The load balancer description.
@ -476,8 +482,8 @@ You can configure all documented features of the listener at
 creation time by specifying the additional elements or attributes
 in the request.

-Administrative users can specify a tenant ID that is different than
-their own to create listeners for other tenants.
+Administrative users can specify a project ID that is different than
+their own to create listeners for other projects.

 To update a listener, the load balancer to which to attach must
 have an ``ACTIVE`` provisioning status.
@ -494,7 +500,8 @@ Request
   - description: description
   - default_tls_container_ref: default_tls_container_ref
   - admin_state_up: admin_state_up
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - sni_container_refs: sni_container_refs
   - connection_limit: connection_limit
   - listener: listener
@ -519,7 +526,8 @@ Response Parameters
   - default_tls_container_ref: default_tls_container_ref
   - admin_state_up: admin_state_up
   - loadbalancers: loadbalancers
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - sni_container_refs: sni_container_refs
   - connection_limit: connection_limit
   - listener: listener
@ -559,7 +567,8 @@ Response Parameters
   - default_tls_container_ref: default_tls_container_ref
   - admin_state_up: admin_state_up
   - loadbalancers: loadbalancers
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - sni_container_refs: sni_container_refs
   - connection_limit: connection_limit
   - listener: listener
@ -584,7 +593,7 @@ This operation updates the attributes of a listener. Upon
 successful validation of the request, the service returns the HTTP
 ``Accepted (202)`` response code.

-Note: You cannot update the ``listener_id``, ``tenant_id``,
+Note: You cannot update the ``listener_id``, ``project_id``,
 ``loadbalancer_id``, ``loadbalancers``, ``default_pool_id``,
 ``protocol``, and ``protocol_port`` attributes. Attempting to
 update an immutable attribute results in the HTTP ``Immutable
@ -608,7 +617,8 @@ Request
   - description: description
   - default_tls_container_ref: default_tls_container_ref
   - admin_state_up: admin_state_up
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - sni_container_refs: sni_container_refs
   - connection_limit: connection_limit
   - listener: listener
@ -633,7 +643,8 @@ Response Parameters
   - default_tls_container_ref: default_tls_container_ref
   - admin_state_up: admin_state_up
   - loadbalancers: loadbalancers
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - sni_container_refs: sni_container_refs
   - connection_limit: connection_limit
   - listener: listener
@ -655,7 +666,7 @@ Remove listener
 Removes a listener.

 This operation removes a listener and its associated configuration
-from the tenant account. The API immediately purges any and all
+from the project. The API immediately purges any and all
 configuration data. You cannot recover it.

 You cannot delete a listener if the load balancer to which it is
@ -675,7 +686,7 @@ List pools

 .. rest_method::  GET /v2.0/lbaas/pools

-Lists all pools that are associated with your tenant account.
+Lists all pools that are associated with your project.

 The list might be empty.

@ -699,7 +710,8 @@ Response Parameters
   - description: description
   - health_monitors: health_monitors
   - subnet_id: subnet_id
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - admin_state_up: admin_state_up
   - vip_id: vip_id
   - members: members
@ -727,8 +739,8 @@ response object, which contains a unique ID.

 At a minimum, you must specify these pool attributes:

- ``tenant_id``. Admin only. Required to create a pool for another
-  tenant.
+- ``project_id``. Admin only. Required to create a pool for another
+  project.

 - ``protocol``. The protocol for which this pool and its members
  listen. A valid value is ``TCP``, ``HTTP``, or ``HTTPS``.
@ -762,8 +774,8 @@ and submit the request again.
 Users can configure all documented features at creation time by
 providing the additional elements or attributes in the request.

-Administrative users can specify a tenant ID that is different than
-their own to create pools for other tenants.
+Administrative users can specify a project ID that is different than
+their own to create pools for other projects.

 To update a pool, the load balancer to which to attach must have an
 ``ACTIVE`` provisioning status.
@ -780,7 +792,8 @@ Request
   - description: description
   - admin_state_up: admin_state_up
   - subnet_id: subnet_id
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - listener_id: listener_id
   - name: name

@ -802,7 +815,8 @@ Response Parameters
   - vip_id: vip_id
   - admin_state_up: admin_state_up
   - subnet_id: subnet_id
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - session_persistence: session_persistence
   - healthmonitor_id: healthmonitor_id
   - health_monitors_status: health_monitors_status
@ -820,7 +834,7 @@ Shows details for a pool.

 This operation shows details for a pool, by ID. If you are not an
 administrative user and the pool object does not belong to your
-tenant account, the call returns the HTTP ``Forbidden (403)``
+project, the call returns the HTTP ``Forbidden (403)``
 response code.

 If this operation succeeds, it returns a ``pool`` element.
@ -845,7 +859,8 @@ Response Parameters
   - description: description
   - health_monitors: health_monitors
   - subnet_id: subnet_id
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - admin_state_up: admin_state_up
   - vip_id: vip_id
   - members: members
@ -870,7 +885,7 @@ This operation updates the attributes of a pool. Upon successful
 validation of the request, the service returns the HTTP ``Accepted
 (202)`` response code.

-Note: You cannot update the pool UUID, ``tenant_id``,
+Note: You cannot update the pool UUID, ``project_id``,
 ``listener_id``, ``listeners``, ``health_monitor_id``,
 ``protocol``, and ``members`` immutable attributes. If you try to
 update any of these attributes, the service returns the HTTP
@ -911,7 +926,8 @@ Response Parameters
   - description: description
   - health_monitors: health_monitors
   - subnet_id: subnet_id
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - admin_state_up: admin_state_up
   - vip_id: vip_id
   - members: members
@ -933,7 +949,7 @@ Remove pool
 Removes a pool.

 This operation removes a pool and its associated configuration from
-the tenant account. The API immediately purges any and all
+the project. The API immediately purges any and all
 configuration data. You cannot recover it.

 You cannot delete a pool if the load balancer to which it is
@ -954,7 +970,7 @@ List pool members
 Lists members of a pool.

 Lists all members that are associated with a pool that is
-associated with your tenant account. The list of members includes
+associated with your project. The list of members includes
 only members that belong to the pool object identified by
 ``pool_id``.

@ -978,7 +994,8 @@ Response Parameters
   - status_description: status_description
   - weight: weight
   - admin_state_up: admin_state_up
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - pool_id: pool_id
   - members: members
   - address: address
@ -1005,8 +1022,8 @@ returns a response object, which contains a unique ID.

 At a minimum, you must specify these pool attributes:

- ``tenant_id``. Admin only. Required to create a pool for another
-  tenant.
+- ``project_id``. Admin only. Required to create a pool for another
+  project.

 - ``address``. The IP address of the member to receive traffic from
  the load balancer.
@ -1032,8 +1049,8 @@ correct the error and submit the request again.
 To configure all documented member features at creation time,
 specify additional elements or attributes in the request.

-Administrative users can specify a tenant ID that is different than
-their own to create members for other tenants.
+Administrative users can specify a project ID that is different than
+their own to create members for other projects.

 To update a member, the load balancer must have an ``ACTIVE``
 provisioning status.
@ -1048,7 +1065,8 @@ Request
   - member: member
   - subnet_id: subnet_id
   - protocol_port: protocol_port
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - address: address

 Request Example
@ -1066,7 +1084,8 @@ Response Parameters
   - weight: weight
   - admin_state_up: admin_state_up
   - subnet_id: subnet_id
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - member: member
   - address: address
   - protocol_port: protocol_port
@ -1082,7 +1101,7 @@ Shows details for a pool member.
 This operation returns a member object identified by ``member_id``
 that belongs to a pool object identified by ``pool_id``. If you are
 not an administrative user and the pool or member object does not
-belong to your tenant account, the service returns the HTTP
+belong to your project, the service returns the HTTP
 ``Forbidden (403)`` response code.

 If this operation succeeds, it returns a pool element.
@ -1105,7 +1124,8 @@ Response Parameters
   - status_description: status_description
   - weight: weight
   - admin_state_up: admin_state_up
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - pool_id: pool_id
   - member: member
   - address: address
@ -1128,7 +1148,7 @@ Updates attributes for a pool member.
 Upon successful validation of the request, the service returns the
 HTTP ``OK (200)`` response code.

-Note: You cannot update the member UUID, ``tenant_id``,
+Note: You cannot update the member UUID, ``project_id``,
 ``address``, ``protocol_port``, and ``subnet_id`` attributes. If
 you attempt to update any of these attributes, the service returns
 the HTTP ``Immutable (422)`` response code.
@ -1165,7 +1185,8 @@ Response Parameters
   - status_description: status_description
   - weight: weight
   - admin_state_up: admin_state_up
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - pool_id: pool_id
   - member: member
   - address: address
@ -1183,7 +1204,7 @@ Remove member from pool

 .. rest_method::  DELETE /v2.0/lbaas/pools/{pool_id}/members/{member_id}

-Removes a member from a pool and its associated configuration from the tenant account.
+Removes a member from a pool and its associated configuration from the project.

 The API immediately purges any and all configuration data. You
 cannot recover it.
@ -1208,7 +1229,7 @@ List health monitors
 Lists health monitors.

 This operation lists all health monitors that are associated with
-your tenant account.
+your project.

 This operation returns a list, which might be empty.

@ -1225,7 +1246,8 @@ Response Parameters
 .. rest_parameters:: parameters.yaml

   - health_monitors: health_monitors
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - admin_state_up: admin_state_up
   - delay: delay
   - expected_codes: expected_codes
@ -1257,8 +1279,8 @@ returns a response object. The object contains a unique identifier.

 At a minimum, you must specify these health monitor attributes:

- ``tenant_id``. Admin only. Required to create a health monitor for
-  another tenant.
+- ``project_id``. Admin only. Required to create a health monitor for
+  another project.

 - ``type``. The type of health monitor. A valid value is ``TCP``,
  ``HTTP``, or ``HTTPS``.
@ -1297,8 +1319,8 @@ You can configure all documented features of the health monitor at
 creation time by specifying the additional elements or attributes
 in the request.

-Administrative users can specify a tenant ID that is different than
-their own to create health monitors for other tenants.
+Administrative users can specify a project ID that is different than
+their own to create health monitors for other projects.

 To update a health monitor, the load balancer to which to attach
 must have an ``ACTIVE`` provisioning status.
@ -1311,7 +1333,8 @@ Request
 .. rest_parameters:: parameters.yaml

   - health_monitor: health_monitor
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - admin_state_up: admin_state_up
   - delay: delay
   - expected_codes: expected_codes
@ -1333,7 +1356,8 @@ Response Parameters
 .. rest_parameters:: parameters.yaml

   - health_monitor: health_monitor
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - admin_state_up: admin_state_up
   - delay: delay
   - expected_codes: expected_codes
@ -1354,7 +1378,7 @@ Shows details for a health monitor.

 This operation returns a health monitor object, by health monitor
 ID. If you are not an administrative user and the health monitor
-object does not belong to your tenant account, the service returns
+object does not belong to your project, the service returns
 the HTTP ``Forbidden (403)`` response code.

 Example: Show health monitor details
@ -1372,7 +1396,8 @@ Response Parameters
 .. rest_parameters:: parameters.yaml

   - health_monitor: health_monitor
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - admin_state_up: admin_state_up
   - delay: delay
   - expected_codes: expected_codes
@ -1400,7 +1425,7 @@ Updates a health monitor.
 Upon successful validation of the request, the service returns the
 HTTP ``Accepted (202)`` response code.

-Note: The health monitor UUID, ``tenant_id``, ``pool_id``, and type
+Note: The health monitor UUID, ``project_id``, ``pool_id``, and type
 are immutable attributes and cannot be updated. If you specify an
 unsupported attribute, the service returns the HTTP ``Immutable
 (422)`` response code.
@ -1435,7 +1460,8 @@ Response Parameters
 .. rest_parameters:: parameters.yaml

   - health_monitor: health_monitor
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - admin_state_up: admin_state_up
   - delay: delay
   - expected_codes: expected_codes
@ -1458,7 +1484,7 @@ Remove health monitor

 .. rest_method::  DELETE /v2.0/lbaas/health_monitors/{health_monitor_id}

-Removes a health monitor and its associated configuration from the tenant account.
+Removes a health monitor and its associated configuration from the project.

 The API immediately purges any and all configuration data. You
 cannot recover it.
--- a/api-ref/source/v2/metering.inc
+++ b/api-ref/source/v2/metering.inc
@ -16,7 +16,7 @@ List metering labels

 .. rest_method::  GET /v2.0/metering/metering-labels

-Lists all L3 metering labels that belong to the tenant.
+Lists all L3 metering labels that belong to the project.

 The list shows the UUID for each metering label.

@ -33,7 +33,8 @@ Response Parameters
 .. rest_parameters:: parameters.yaml

   - description: description
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - metering_labels: metering_labels
   - shared: shared
   - id: id
@ -76,7 +77,8 @@ Response Parameters
 .. rest_parameters:: parameters.yaml

   - description: description
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - metering_label: metering_label
   - shared: shared
   - id: id
@ -104,7 +106,8 @@ Response Parameters
 .. rest_parameters:: parameters.yaml

   - description: description
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - metering_label: metering_label
   - shared: shared
   - id: id
@ -133,7 +136,7 @@ List metering label rules

 .. rest_method::  GET /v2.0/metering/metering-label-rules

-Lists a summary of all L3 metering label rules that belong to the tenant.
+Lists a summary of all L3 metering label rules that belong to the project.

 The list shows the UUID for each metering label rule.

--- a/api-ref/source/v2/network-ip-availability.inc
+++ b/api-ref/source/v2/network-ip-availability.inc
@ -38,7 +38,8 @@ Response Parameters
   - used_ips: used_ips
   - subnet_ip_availability: subnet_ip_availability
   - network_id: network_id_3
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - total_ips: total_ips
   - network_ip_availability: network_ip_availability
   - subnet_id: subnet_id
@ -75,7 +76,8 @@ Response Parameters
   - used_ips: used_ips
   - subnet_ip_availability: subnet_ip_availability
   - network_id: network_id_3
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - total_ips: total_ips
   - subnet_id: subnet_id
   - subnet_name: subnet_name
--- a/api-ref/source/v2/network-provider.inc
+++ b/api-ref/source/v2/network-provider.inc
@ -50,7 +50,8 @@ Response Parameters
   - name: name
   - provider:physical_network: provider:physical_network
   - admin_state_up: admin_state_up
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - provider:segmentation_id: provider:segmentation_id
   - mtu: mtu
   - shared: shared
@ -88,7 +89,8 @@ Request
   - network: network
   - provider:physical_network: provider:physical_network
   - admin_state_up: admin_state_up
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - provider:network_type: provider:network_type
   - shared: shared
   - port_security_enabled: port_security_enabled
@ -113,7 +115,8 @@ Response Parameters
   - network: network
   - provider:physical_network: provider:physical_network
   - admin_state_up: admin_state_up
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - provider:segmentation_id: provider:segmentation_id
   - mtu: mtu
   - shared: shared
@ -149,7 +152,7 @@ List networks (provider network)

 .. rest_method::  GET /v2.0/networks

-Lists networks that are accessible to the tenant who submits the request.
+Lists networks that are accessible to the user who submits the request.

 Normal response codes: 200

@ -170,7 +173,8 @@ Response Parameters
   - name: name
   - provider:physical_network: provider:physical_network
   - admin_state_up: admin_state_up
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - networks: networks
   - mtu: mtu
   - shared: shared
@ -204,7 +208,8 @@ Request
   - network: network
   - provider:physical_network: provider:physical_network
   - admin_state_up: admin_state_up
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - provider:network_type: provider:network_type
   - shared: shared
   - port_security_enabled: port_security_enabled
@ -228,7 +233,8 @@ Response Parameters
   - network: network
   - provider:physical_network: provider:physical_network
   - admin_state_up: admin_state_up
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - provider:segmentation_id: provider:segmentation_id
   - mtu: mtu
   - shared: shared
--- a/api-ref/source/v2/networks-multi-provider-ext.inc
+++ b/api-ref/source/v2/networks-multi-provider-ext.inc
@ -62,7 +62,8 @@ Response Parameters
   - network: network
   - provider:physical_network: provider:physical_network
   - admin_state_up: admin_state_up
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - segments: segments
   - provider:segmentation_id: provider:segmentation_id
   - mtu: mtu
@ -83,7 +84,9 @@ List networks with multiple segment mappings

 .. rest_method::  GET /v2.0/networks

-Lists networks that are accessible to the tenant who submits the request. Networks with multiple segments include the ``segments`` list in the response.
+Lists networks that are accessible to the user who submits the
+request. Networks with multiple segments include the ``segments`` list
+in the response.

 Normal response codes: 200

@ -103,7 +106,8 @@ Response Parameters
   - name: name
   - provider:physical_network: provider:physical_network
   - admin_state_up: admin_state_up
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - segments: segments
   - mtu: mtu
   - shared: shared
@ -137,7 +141,8 @@ Request
   - network: network
   - provider:physical_network: provider:physical_network
   - admin_state_up: admin_state_up
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - segments: segments
   - provider:network_type: provider:network_type
   - shared: shared
@ -162,7 +167,8 @@ Response Parameters
   - network: network
   - provider:physical_network: provider:physical_network
   - admin_state_up: admin_state_up
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - provider:segmentation_id: provider:segmentation_id
   - mtu: mtu
   - shared: shared
--- a/api-ref/source/v2/networks-vlan-transparency-ext.inc
+++ b/api-ref/source/v2/networks-vlan-transparency-ext.inc
@ -52,7 +52,8 @@ Response Parameters
   - subnets: subnets
   - network: network
   - admin_state_up: admin_state_up
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - mtu: mtu
   - shared: shared
   - vlan_transparent: vlan_transparent
@ -90,7 +91,8 @@ Response Parameters
   - subnets: subnets
   - name: name
   - admin_state_up: admin_state_up
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - mtu: mtu
   - vlan_transparent: vlan_transparent
   - shared: shared
@ -121,7 +123,8 @@ Request
   - router:external: router:external
   - network: network
   - admin_state_up: admin_state_up
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - shared: shared
   - vlan_transparent: vlan_transparent
   - port_security_enabled: port_security_enabled
@ -143,7 +146,8 @@ Response Parameters
   - subnets: subnets
   - network: network
   - admin_state_up: admin_state_up
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - mtu: mtu
   - shared: shared
   - vlan_transparent: vlan_transparent
--- a/api-ref/source/v2/networks.inc
+++ b/api-ref/source/v2/networks.inc
@ -50,7 +50,8 @@ Response Parameters
   - availability_zones: availability_zones
   - name: name
   - admin_state_up: admin_state_up
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - updated_at: updated_at
   - changed_at: changed_at
   - mtu: mtu
@ -107,7 +108,8 @@ Response Parameters
   - availability_zones: availability_zones
   - name: name
   - admin_state_up: admin_state_up
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - mtu: mtu
   - qos_policy_id: qos_policy_id
   - subnets: subnets
@ -142,7 +144,7 @@ List networks

 .. rest_method::  GET /v2.0/networks

-Lists networks to which the tenant has access.
+Lists networks to which the user has access.

 Use the ``fields`` query parameter to filter the response. For
 information, see `Filtering and Column Selection <https://wiki.open
@ -173,7 +175,8 @@ Response Parameters
   - availability_zones: availability_zones
   - name: name
   - admin_state_up: admin_state_up
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - networks: networks
   - mtu: mtu
   - subnets: subnets
@ -195,7 +198,7 @@ Create network
 Creates a network.

 A request body is optional. An administrative user can specify
-another tenant UUID, which is the tenant who owns the network, in
+another project ID, which is the project that owns the network, in
 the request body.

 Error response codes: 201,401,400
@ -220,7 +223,8 @@ Response Parameters
   - availability_zones: availability_zones
   - name: name
   - admin_state_up: admin_state_up
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - mtu: mtu
   - qos_policy_id: qos_policy_id
   - subnets: subnets
@ -250,7 +254,8 @@ Request
   - router:external: router:external
   - name: name
   - admin_state_up: admin_state_up
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - port_security_enabled: port_security_enabled
   - shared: shared
   - networks: networks
@ -271,7 +276,8 @@ Response Parameters
   - subnets: subnets
   - name: name
   - admin_state_up: admin_state_up
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - mtu: mtu
   - shared: shared
   - id: id
--- a/api-ref/source/v2/parameters.yaml
+++ b/api-ref/source/v2/parameters.yaml
@ -115,6 +115,18 @@ profile_id:
  in: path
  required: false
  type: string
+project_id:
+  description: |
+    The ID of the project.
+  in: path
+  required: true
+  type: string
+project_id-path:
+  description: |
+    The ID of the project.
+  in: path
+  required: true
+  type: string
 resource_id:
  description: |
    The UUID of resource which the tag is set on.
@ -169,12 +181,6 @@ tag:
  in: path
  required: false
  type: string
-tenant_id-path:
-  description: |
-    The ID of the tenant.
-  in: path
-  required: true
-  type: string
 vip_id_1:
  description: |
    The UUID for the VIP.
@ -671,37 +677,37 @@ default_prefixlen_1:
  type: integer
 default_quota:
  description: |
-    A per-tenant quota on the prefix space that can
-    be allocated from the subnet pool for tenant subnets. Default is
+    A per-project quota on the prefix space that can
+    be allocated from the subnet pool for project subnets. Default is
    no quota is enforced on allocations from the subnet pool. For IPv4
    subnet pools, ``default_quota`` is measured in units of /32. For
    IPv6 subnet pools, ``default_quota`` is measured units of /64. All
-    tenants that use the subnet pool have the same prefix quota
+    projects that use the subnet pool have the same prefix quota
    applied.
  in: body
  required: false
  type: integer
 default_quota_1:
  description: |
-    A per-tenant quota on the prefix space that can
-    be allocated from the subnet pool for tenant subnets. For IPv4
+    A per-project quota on the prefix space that can
+    be allocated from the subnet pool for project subnets. For IPv4
    subnet pools, ``default_quota`` is measured in units of /32. For
    IPv6 subnet pools, ``default_quota`` is measured units of /64. All
-    tenants that use the subnet pool have the same prefix quota
+    projects that use the subnet pool have the same prefix quota
    applied.
  in: body
  required: true
  type: integer
 default_quota_2:
  description: |
-    A per-tenant quota on the prefix space that can
-    be allocated from the subnet pool for tenant subnets. Default is
+    A per-project quota on the prefix space that can
+    be allocated from the subnet pool for project subnets. Default is
    no quota is enforced on allocations from the subnet pool. For IPv4
    subnet pools, ``default_quota`` is measured in units of /32. For
    IPv6 subnet pools, ``default_quota`` is measured units of /64. All
-    tenants that use the subnet pool have the same prefix quota
+    projects that use the subnet pool have the same prefix quota
    applied.  Updating this parameter has no effect on existing subnet
-    allocations. The existing subnet allocations for each tenant are
+    allocations. The existing subnet allocations for each project are
    counted against the updated prefix space quota.
  in: body
  required: false
@ -2795,6 +2801,14 @@ prefixes_2:
  in: body
  required: true
  type: array
+project_id-request:
+  description: |
+    The ID of the project that owns the resource.
+    Only administrative users can specify a project ID other than their own.
+    You cannot change this value through authorization policies.
+  in: body
+  required: false
+  type: string
 protocol:
  description: |
    The IP protocol. Valid value is ``icmp``,
@ -2939,59 +2953,59 @@ quota:
 quota-floatingip:
  description: |
    The number of floating IP addresses allowed for
-    each tenant.  A value of ``-1`` means no limit.
+    each project.  A value of ``-1`` means no limit.
  in: body
  required: true
  type: integer
 quota-network:
  description: |
-    The number of networks allowed for each tenant.
+    The number of networks allowed for each project.
  in: body
  required: true
  type: integer
 quota-port:
  description: |
-    The number of ports allowed for each tenant.
+    The number of ports allowed for each project.
  in: body
  required: true
  type: integer
 quota-rbac_policy:
  description: |
    The number of role-based access control (RBAC)
-    policies for each tenant.
+    policies for each project.
  in: body
  required: true
  type: integer
 quota-router:
  description: |
-    The number of routers allowed for each tenant.
+    The number of routers allowed for each project.
  in: body
  required: true
  type: integer
 quota-security_group:
  description: |
    The number of security groups allowed for each
-    tenant.
+    project.
  in: body
  required: true
  type: integer
 quota-security_group_rule:
  description: |
    The number of security group rules allowed for
-    each tenant.
+    each project.
  in: body
  required: true
  type: integer
 quota-subnet:
  description: |
-    The number of subnets allowed for each tenant.
+    The number of subnets allowed for each project.
  in: body
  required: true
  type: integer
 quota-subnetpool:
  description: |
    The number of subnet pools allowed for each
-    tenant.
+    project.
  in: body
  required: true
  type: integer
@ -3257,6 +3271,12 @@ router-port_id-request:
  in: body
  required: false
  type: string
+router-project_id-interface:
+  description: |
+    The ID of the project who owns the router interface.
+  in: body
+  required: true
+  type: string
 router-routes:
  description: |
    The extra routes configuration for L3 router.
@ -3294,12 +3314,6 @@ router-subnet_ids:
  in: body
  required: true
  type: array
-router-tenant_id-interface:
-  description: |
-    The ID of the tenant who owns the router interface.
-  in: body
-  required: true
-  type: string
 router:external:
  description: |
    Indicates whether this network is externally
@ -3500,14 +3514,14 @@ session_persistence_3:
 shared:
  description: |
    Admin-only. Indicates whether this network is
-    shared across all tenants.
+    shared across all projects.
  in: body
  required: false
  type: boolean
 shared_1:
  description: |
    Indicates whether this network is shared across
-    all tenants. By default, only administrative users can change this
+    all projects. By default, only administrative users can change this
    value.
  in: body
  required: true
@ -3515,29 +3529,29 @@ shared_1:
 shared_10:
  description: |
    Indicates whether this policy is shared across
-    all tenants.
+    all projects.
  in: body
  required: true
  type: boolean
 shared_11:
  description: |
    Indicates whether this subnet pool is shared
-    across all tenants.
+    across all projects.
  in: body
  required: true
  type: boolean
 shared_12:
  description: |
    Set to ``true`` to make this firewall policy
-    visible to other tenants. Default is ``false``.
+    visible to other projects. Default is ``false``.
  in: body
  required: false
  type: boolean
 shared_13:
  description: |
    Set to ``true`` to share this firewall rule with
-    other tenants. Other tenants can use a shared rule in firewall
-    policies that this tenant does not own. Valid value is ``true`` or
+    other projects. Other projects can use a shared rule in firewall
+    policies that this project does not own. Valid value is ``true`` or
    ``false``. Default is ``false``.
  in: body
  required: false
@ -3545,57 +3559,57 @@ shared_13:
 shared_2:
  description: |
    Indicates whether this metering label is shared
-    across all tenants.
+    across all projects.
  in: body
  required: false
  type: boolean
 shared_3:
  description: |
    Admin-only. Indicates whether this network is
-    shared across all tenants.
+    shared across all projects.
  in: body
  required: false
  type: boolean
 shared_4:
  description: |
    Set to ``true`` to share this policy with other
-    tenants.  Default is ``false``.
+    projects.  Default is ``false``.
  in: body
  required: false
  type: boolean
 shared_5:
  description: |
    Admin-only. Indicates whether this subnet pool is
-    shared across all tenants.
+    shared across all projects.
  in: body
  required: false
  type: boolean
 shared_6:
  description: |
    Indicates whether the firewall policy is shared
-    across all tenants.
+    across all projects.
  in: body
  required: true
  type: boolean
 shared_7:
  description: |
    Indicates whether this firewall rule is shared
-    with other tenants. Other tenants can use a shared rule in
-    firewall policies that this tenant does not own.
+    with other projects. Other projects can use a shared rule in
+    firewall policies that this project does not own.
  in: body
  required: true
  type: boolean
 shared_8:
  description: |
    Indicates whether this metering label is shared
-    across all tenants.
+    across all projects.
  in: body
  required: true
  type: boolean
 shared_9:
  description: |
    Indicates whether this network is shared across
-    all tenants.
+    all projects.
  in: body
  required: true
  type: boolean
@ -3734,15 +3748,15 @@ subnet_id_1:
  type: string
 subnet_id_3:
  description: |
-    (Deprecated) The subnet where the tenant wants
-    the VPN service.
+    (Deprecated) The subnet where the VPN service should
+    be provided.
  in: body
  required: false
  type: string
 subnet_id_4:
  description: |
-    (Deprecated) The subnet where the tenant wants
-    the VPN service.
+    (Deprecated) The subnet where the VPN service should
+    be provided.
  in: body
  required: true
  type: string
@ -3806,282 +3820,7 @@ tags:
  type: array
 tenant_id:
  description: |
-    The ID of the tenant who owns the resource.
-  in: body
-  required: true
-  type: string
-tenant_id-request:
-  description: |
-    The ID of the tenant who owns the resource.
-    Only administrative users can specify a tenant UUID other than their own.
-    You cannot change this value through authorization policies.
-  in: body
-  required: false
-  type: string
-tenant_id_1:
-  description: |
-    The UUID of the tenant.
-  in: body
-  required: true
-  type: string
-tenant_id_10:
-  description: |
-    The UUID of the tenant who owns the load
-    balancer. Only administrative users can specify a tenant UUID
-    other than their own.
-  in: body
-  required: true
-  type: string
-tenant_id_11:
-  description: |
-    The UUID of the tenant who owns the member. Only
-    administrative users can specify a tenant UUID other than their
-    own.
-  in: body
-  required: true
-  type: string
-tenant_id_12:
-  description: |
-    The UUID of the tenant who owns the member. Only
-    administrative users can specify a tenant UUID other than their
-    own.
-  in: body
-  required: false
-  type: string
-tenant_id_13:
-  description: |
-    The tenant UUID for the metering label.
-  in: body
-  required: true
-  type: string
-tenant_id_14:
-  description: |
-    The UUID of the tenant who owns the network. Only
-    administrative users can specify a tenant UUID other than their
-    own. You cannot change this value through authorization policies.
-  in: body
-  required: false
-  type: string
-tenant_id_15:
-  description: |
-    The tenant UUID of QoS policy owner. Only
-    administrative users can specify a tenant UUID other than their
-    own. You cannot change this value through authorization policies.
-  in: body
-  required: false
-  type: string
-tenant_id_16:
-  description: |
-    The UUID of the tenant who owns the pool. Only
-    administrative users can specify a tenant UUID other than their
-    own.
-  in: body
-  required: false
-  type: string
-tenant_id_17:
-  description: |
-    The UUID of the tenant who owns the security
-    group rule. Only administrative users can specify a tenant UUID
-    other than their own.
-  in: body
-  required: true
-  type: string
-tenant_id_18:
-  description: |
-    The UUID of the tenant who owns the security
-    group. Only administrative users can specify a tenant UUID other
-    than their own.
-  in: body
-  required: false
-  type: string
-tenant_id_19:
-  description: |
-    The UUID of the tenant who owns the subnet pool.
-    Only administrative users can specify a tenant UUID other than
-    their own. You cannot change this value through authorization
-    policies.
-  in: body
-  required: false
-  type: string
-tenant_id_2:
-  description: |
-    The UUID of the tenant who owns the network. Only
-    administrative users can specify a tenant UUID other than their
-    own.
-  in: body
-  required: true
-  type: string
-tenant_id_20:
-  description: |
-    The UUID of the tenant who owns the VIP. Only
-    administrative users can specify a tenant UUID other than their
-    own.
-  in: body
-  required: false
-  type: string
-tenant_id_21:
-  description: |
-    Owner of the VPN endpoint group. Only
-    administrative users can specify a tenant UUID other than their
-    own.
-  in: body
-  required: true
-  type: string
-tenant_id_22:
-  description: |
-    Owner of the VPN service. Only administrative
-    users can specify a tenant UUID other than their own.
-  in: body
-  required: false
-  type: string
-tenant_id_23:
-  description: |
-    The UUID of the tenant who owns the firewall
-    policy.
-  in: body
-  required: true
-  type: string
-tenant_id_24:
-  description: |
-    The UUID of the tenant who owns the firewall
-    rule.
-  in: body
-  required: true
-  type: string
-tenant_id_25:
-  description: |
-    The UUID of the tenant who owns the health
-    monitor. Only administrative users can specify a tenant UUID other
-    than their own.
-  in: body
-  required: true
-  type: string
-tenant_id_26:
-  description: |
-    The owner of the VPN service. Only administrative
-    users can specify a tenant UUID other than their own.
-  in: body
-  required: true
-  type: string
-tenant_id_27:
-  description: |
-    Owner of the VPN service. Only administrative
-    users can specify a tenant UUID other than their own.
-  in: body
-  required: true
-  type: string
-tenant_id_28:
-  description: |
-    The UUID of the tenant who owns the VIP. Only
-    administrative users can specify a tenant UUID other than their
-    own.
-  in: body
-  required: true
-  type: string
-tenant_id_29:
-  description: |
-    The UUID of the tenant who owns the network.
-  in: body
-  required: true
-  type: string
-tenant_id_3:
-  description: |
-    The owner of the firewall service. Only
-    administrative users can specify a tenant UUID other than their
-    own.
-  in: body
-  required: true
-  type: string
-tenant_id_30:
-  description: |
-    The UUID of tenant or project.
-  in: body
-  required: true
-  type: string
-tenant_id_31:
-  description: |
-    The UUID of the tenant who owns the QoS policy.
-  in: body
-  required: true
-  type: string
-tenant_id_32:
-  description: |
-    The UUID of the tenant who owns the pool. Only
-    administrative users can specify a tenant UUID other than their
-    own.
-  in: body
-  required: true
-  type: string
-tenant_id_34:
-  description: |
-    The UUID of the tenant who owns the subnet pool.
-  in: body
-  required: true
-  type: string
-tenant_id_35:
-  description: |
-    The UUID of the tenant.
-  in: body
-  required: true
-  type: string
-tenant_id_36:
-  description: |
-    The owner of the firewall policy. Only
-    administrative users can specify a tenant UUID other than their
-    own.
-  in: body
-  required: false
-  type: string
-tenant_id_37:
-  description: |
-    The UUID of the tenant who owns the firewall
-    rule. Only administrative users can specify a tenant UUID other
-    than their own.
-  in: body
-  required: true
-  type: string
-tenant_id_4:
-  description: |
-    The UUID of the tenant. Only administrative users
-    can specify a tenant UUID other than their own.
-  in: body
-  required: false
-  type: string
-tenant_id_5:
-  description: |
-    The UUID of the tenant who owns the health
-    monitor. Only administrative users can specify a tenant UUID other
-    than their own.
-  in: body
-  required: false
-  type: string
-tenant_id_6:
-  description: |
-    The owner of the IKE policy. Only administrative
-    users can specify a tenant UUID other than their own.
-  in: body
-  required: true
-  type: string
-tenant_id_7:
-  description: |
-    Owner of the IPSec policy. Only administrative
-    users can specify a tenant UUID other than their own.
-  in: body
-  required: true
-  type: string
-tenant_id_8:
-  description: |
-    Owner of the IPSec connection. Only
-    administrative users can specify a tenant UUID other than their
-    own.
-  in: body
-  required: true
-  type: string
-tenant_id_9:
-  description: |
-    The UUID of the tenant who owns the listener.
-    Only administrative users can specify a tenant UUID other than
-    their own.
+    The ID of the project that owns the resource.
  in: body
  required: true
  type: string
--- a/api-ref/source/v2/port-binding.inc
+++ b/api-ref/source/v2/port-binding.inc
@ -83,7 +83,7 @@ List ports (port binding)

 .. rest_method::  GET /v2.0/ports

-Lists ports to which the tenant has access.
+Lists ports to which the user has access.

 Normal response codes: 200

--- a/api-ref/source/v2/ports.inc
+++ b/api-ref/source/v2/ports.inc
@ -47,7 +47,8 @@ Response Parameters
   - port: port
   - subnet_id: subnet_id
   - device_owner: device_owner
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - mac_address: mac_address
   - port_security_enabled: port_security_enabled
   - fixed_ips: fixed_ips
@ -103,7 +104,8 @@ Request
   - opt_name: opt_name
   - subnet_id: subnet_id
   - device_owner: device_owner
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - mac_address: mac_address
   - ip_address: ip_address
   - port: port
@ -136,7 +138,8 @@ Response Parameters
   - port: port
   - subnet_id: subnet_id
   - device_owner: device_owner
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - mac_address: mac_address
   - port_security_enabled: port_security_enabled
   - fixed_ips: fixed_ips
@ -174,10 +177,10 @@ List ports

 .. rest_method::  GET /v2.0/ports

-Lists ports to which the tenant has access.
+Lists ports to which the user has access.

 Default policy settings return only those ports that are owned by
-the tenant who submits the request, unless the request is submitted
+the project of the user who submits the request, unless the request is submitted
 by a user with administrative rights. Users can control which
 attributes are returned by using the fields query parameter. You
 can use query parameters to filter the response.For information,
@ -210,7 +213,8 @@ Response Parameters
   - ports: ports
   - subnet_id: subnet_id
   - device_owner: device_owner
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - mac_address: mac_address
   - port_security_enabled: port_security_enabled
   - fixed_ips: fixed_ips
@ -250,7 +254,8 @@ Request
   - opt_name: opt_name
   - subnet_id: subnet_id
   - device_owner: device_owner
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - mac_address: mac_address
   - ip_address: ip_address
   - port: port
@ -282,7 +287,8 @@ Response Parameters
   - port: port
   - subnet_id: subnet_id
   - device_owner: device_owner
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - mac_address: mac_address
   - port_security_enabled: port_security_enabled
   - fixed_ips: fixed_ips
@ -315,7 +321,8 @@ Request
   - opt_name: opt_name
   - subnet_id: subnet_id
   - device_owner: device_owner
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - mac_address: mac_address
   - ip_address: ip_address
   - ports: ports
@ -347,7 +354,8 @@ Response Parameters
   - ports: ports
   - subnet_id: subnet_id
   - device_owner: device_owner
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - mac_address: mac_address
   - port_security_enabled: port_security_enabled
   - fixed_ips: fixed_ips
--- a/api-ref/source/v2/qos.inc
+++ b/api-ref/source/v2/qos.inc
@ -117,7 +117,7 @@ List QoS policies

 .. rest_method::  GET /v2.0/qos/policies

-Lists all QoS policies that are associated with your tenant account.
+Lists all QoS policies associated with your project.

 The list might be empty.

@ -137,7 +137,8 @@ Response Parameters
   - bandwidth_limit_rules: bandwidth_limit_rules
   - description: description
   - policy_id: policy_id
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - dscp_marking_rules: dscp_marking_rules
   - policies: policies
   - shared: shared
@ -167,7 +168,7 @@ If the caller is not an administrative user, this call returns the
 HTTP ``Forbidden (403)`` response code.

 Users with an administrative role can create policies on behalf of
-other tenants by specifying a tenant UUID that is different than
+other projects by specifying a project ID that is different than
 their own.

 Error response codes: 201,404,409,401,413,503,500
@ -178,7 +179,8 @@ Request
 .. rest_parameters:: parameters.yaml

   - description: description
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - policy: policy
   - shared: shared
   - type: type
@ -196,7 +198,8 @@ Response Parameters
 .. rest_parameters:: parameters.yaml

   - description: description
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - policy: policy
   - shared: shared
   - id: id
@ -394,7 +397,8 @@ Response Parameters
   - bandwidth_limit_rules: bandwidth_limit_rules
   - description: description
   - policy_id: policy_id
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - dscp_marking_rules: dscp_marking_rules
   - policy: policy
   - shared: shared
@ -429,7 +433,8 @@ Request
 .. rest_parameters:: parameters.yaml

   - description: description
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - policy: policy
   - shared: shared
   - type: type
@ -448,7 +453,8 @@ Response Parameters
 .. rest_parameters:: parameters.yaml

   - description: description
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - policy: policy
   - shared: shared
   - id: id
--- a/api-ref/source/v2/quotas.inc
+++ b/api-ref/source/v2/quotas.inc
@ -8,17 +8,17 @@
 Quotas extension (quotas)
 =========================

-Lists default quotas, current quotas for tenants who have non-default quota
-values, and shows, updates, and resets quotas for a tenant.
+Lists default quotas, current quotas for projects with non-default quota
+values, and shows, updates, and resets quotas for a project.

 A quota value of ``-1`` means that quota has no limit.

-List quotas for tenants with non-default quota values
-=====================================================
+List quotas for projects with non-default quota values
+======================================================

 .. rest_method::  GET /v2.0/quotas

-Lists quotas for tenants who have non-default quota values.
+Lists quotas for projects with non-default quota values.

 Normal response codes: 200

@ -49,12 +49,12 @@ Response Example
 .. literalinclude:: samples/quotas/quotas-list-response.json
   :language: javascript

-List quotas for a tenant
-========================
+List quotas for a project
+=========================

-.. rest_method::  GET /v2.0/quotas/{tenant_id}
+.. rest_method::  GET /v2.0/quotas/{project_id}

-Lists quotas for a tenant.
+Lists quotas for a project.

 Normal response codes: 200

@ -65,7 +65,8 @@ Request

 .. rest_parameters:: parameters.yaml

-   - tenant_id: tenant_id-path
+   - tenant_id: project_id-path
+   - project_id: project_id-path

 Response Parameters
 -------------------
@ -86,15 +87,15 @@ Response Parameters
 Response Example
 ----------------

-.. literalinclude:: samples/quotas/quotas-list-for-tenant-response.json
+.. literalinclude:: samples/quotas/quotas-list-for-project-response.json
   :language: javascript

-Update quota for a tenant
-=========================
+Update quota for a project
+==========================

-.. rest_method::  PUT /v2.0/quotas/{tenant_id}
+.. rest_method::  PUT /v2.0/quotas/{project_id}

-Updates quotas for a tenant. Use when non-default quotas are desired.
+Updates quotas for a project. Use when non-default quotas are desired.

 Normal response codes: 200

@ -115,7 +116,8 @@ Request
   - router: quota-router
   - rbac_policy: quota-rbac_policy
   - port: quota-port
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id

 Request Example
 ---------------
@ -138,7 +140,8 @@ Response Parameters
   - router: quota-router
   - rbac_policy: quota-rbac_policy
   - port: quota-port
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id

 Response Example
 ----------------
@ -146,12 +149,12 @@ Response Example
 .. literalinclude:: samples/quotas/quotas-update-response.json
   :language: javascript

-Reset quota for a tenant
-========================
+Reset quota for a project
+=========================

-.. rest_method::  DELETE /v2.0/quotas/{tenant_id}
+.. rest_method::  DELETE /v2.0/quotas/{project_id}

-Resets quotas to default values for a tenant.
+Resets quotas to default values for a project.

 Error response codes: 204, 401, 403, 404

@ -160,14 +163,15 @@ Request

 .. rest_parameters:: parameters.yaml

-   - tenant_id: tenant_id-path
+   - tenant_id: project_id-path
+   - project_id: project_id-path

-List default quotas for a tenant
-================================
+List default quotas for a project
+=================================

-.. rest_method::  GET /v2.0/quotas/{tenant_id}/default
+.. rest_method::  GET /v2.0/quotas/{project_id}/default

-Lists default quotas for a tenant.
+Lists default quotas for a project.

 Normal response codes: 200

@ -178,7 +182,8 @@ Request

 .. rest_parameters:: parameters.yaml

-   - tenant_id: tenant_id-path
+   - tenant_id: project_id-path
+   - project_id: project_id-path

 Response Parameters
 -------------------
@ -199,5 +204,5 @@ Response Parameters
 Response Example
 ----------------

-.. literalinclude:: samples/quotas/quotas-list-for-tenant-response.json
+.. literalinclude:: samples/quotas/quotas-list-for-project-response.json
   :language: javascript
--- a/api-ref/source/v2/routers.inc
+++ b/api-ref/source/v2/routers.inc
@ -45,7 +45,8 @@ Response Parameters

   - routers: routers
   - id: router-id-body
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - name: name
   - description: description
   - admin_state_up: admin_state_up
@ -95,7 +96,8 @@ Request
 .. rest_parameters:: parameters.yaml

   - router: router
-   - tenant_id: tenant_id-request
+   - tenant_id: project_id-request
+   - project_id: project_id-request
   - name: name-request
   - description: description-request
   - admin_state_up: admin_state_up-request
@ -120,7 +122,8 @@ Response Parameters

   - router: router
   - id: router-id-body
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - name: name
   - description: description
   - admin_state_up: admin_state_up
@ -175,7 +178,8 @@ Response Parameters

   - router: router
   - id: router-id-body
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - name: name
   - description: description
   - admin_state_up: admin_state_up
@ -239,7 +243,8 @@ Response Parameters

   - router: router
   - id: router-id-body
-   - tenant_id: tenant_id
+   - tenant_id: project_id
+   - project_id: project_id
   - name: name
   - description: description
   - admin_state_up: admin_state_up
@ -373,7 +378,8 @@ Response Parameters
   - id: router-id-body
   - subnet_id: router-subnet_id
   - subnet_ids: router-subnet_ids
-   - tenant_id: router-tenant_id-interface
+   - tenant_id: router-project_id-interface
+   - project_id: router-project_id-interface
   - port_id: router-port_id
   - network_id: router-network_id-interface

@ -446,7 +452,8 @@ Response Parameters
   - id: router-id-body
   - subnet_id: router-subnet_id
   - subnet_ids: router-subnet_ids
-   - tenant_id: router-tenant_id-interface
+   - tenant_id: router-project_id-interface
+   - project_id: router-project_id-interface
   - port_id: router-port_id
   - network_id: router-network_id-interface

--- a/api-ref/source/v2/samples/firewalls/firewall-create-response.json
+++ b/api-ref/source/v2/samples/firewalls/firewall-create-response.json
@ -9,6 +9,7 @@
        "router_ids": [
            "650bfd2f-7766-4a0d-839f-218f33e16998"
        ],
+        "project_id": "45977fa2dbd7482098dd68d0d8970117",
        "tenant_id": "45977fa2dbd7482098dd68d0d8970117"
    }
 }
--- a/api-ref/source/v2/samples/firewalls/firewall-policies-list-response.json
+++ b/api-ref/source/v2/samples/firewalls/firewall-policies-list-response.json
@ -9,6 +9,7 @@
            "id": "c69933c1-b472-44f9-8226-30dc4ffd454c",
            "name": "test-policy",
            "shared": false,
+            "project_id": "45977fa2dbd7482098dd68d0d8970117",
            "tenant_id": "45977fa2dbd7482098dd68d0d8970117"
        }
    ]
--- a/api-ref/source/v2/samples/firewalls/firewall-policy-create-response.json
+++ b/api-ref/source/v2/samples/firewalls/firewall-policy-create-response.json
@ -8,6 +8,7 @@
        "id": "c69933c1-b472-44f9-8226-30dc4ffd454c",
        "name": "test-policy",
        "shared": false,
+        "project_id": "45977fa2dbd7482098dd68d0d8970117",
        "tenant_id": "45977fa2dbd7482098dd68d0d8970117"
    }
 }
--- a/api-ref/source/v2/samples/firewalls/firewall-policy-insert-rule-response.json
+++ b/api-ref/source/v2/samples/firewalls/firewall-policy-insert-rule-response.json
@ -10,5 +10,6 @@
    "id": "c69933c1-b472-44f9-8226-30dc4ffd454c",
    "name": "test-policy",
    "shared": false,
+    "project_id": "45977fa2dbd7482098dd68d0d8970117",
    "tenant_id": "45977fa2dbd7482098dd68d0d8970117"
 }
--- a/api-ref/source/v2/samples/firewalls/firewall-policy-remove-rule-response.json
+++ b/api-ref/source/v2/samples/firewalls/firewall-policy-remove-rule-response.json
@ -9,5 +9,6 @@
    "id": "c69933c1-b472-44f9-8226-30dc4ffd454c",
    "name": "test-policy",
    "shared": false,
+    "project_id": "45977fa2dbd7482098dd68d0d8970117",
    "tenant_id": "45977fa2dbd7482098dd68d0d8970117"
 }
--- a/api-ref/source/v2/samples/firewalls/firewall-policy-show-response.json
+++ b/api-ref/source/v2/samples/firewalls/firewall-policy-show-response.json
@ -8,6 +8,7 @@
        "id": "c69933c1-b472-44f9-8226-30dc4ffd454c",
        "name": "test-policy",
        "shared": false,
+        "project_id": "45977fa2dbd7482098dd68d0d8970117",
        "tenant_id": "45977fa2dbd7482098dd68d0d8970117"
    }
 }
--- a/api-ref/source/v2/samples/firewalls/firewall-policy-update-response.json
+++ b/api-ref/source/v2/samples/firewalls/firewall-policy-update-response.json
@ -9,6 +9,7 @@
        "id": "c69933c1-b472-44f9-8226-30dc4ffd454c",
        "name": "test-policy",
        "shared": false,
+        "project_id": "45977fa2dbd7482098dd68d0d8970117",
        "tenant_id": "45977fa2dbd7482098dd68d0d8970117"
    }
 }
--- a/api-ref/source/v2/samples/firewalls/firewall-rule-create-response.json
+++ b/api-ref/source/v2/samples/firewalls/firewall-rule-create-response.json
@ -14,6 +14,7 @@
        "shared": false,
        "source_ip_address": null,
        "source_port": null,
+        "project_id": "45977fa2dbd7482098dd68d0d8970117",
        "tenant_id": "45977fa2dbd7482098dd68d0d8970117"
    }
 }
--- a/api-ref/source/v2/samples/firewalls/firewall-rule-show-response.json
+++ b/api-ref/source/v2/samples/firewalls/firewall-rule-show-response.json
@ -14,6 +14,7 @@
        "shared": false,
        "source_ip_address": null,
        "source_port": null,
+        "project_id": "45977fa2dbd7482098dd68d0d8970117",
        "tenant_id": "45977fa2dbd7482098dd68d0d8970117"
    }
 }
--- a/api-ref/source/v2/samples/firewalls/firewall-rule-update-response.json
+++ b/api-ref/source/v2/samples/firewalls/firewall-rule-update-response.json
@ -14,6 +14,7 @@
        "shared": true,
        "source_ip_address": null,
        "source_port": null,
+        "project_id": "45977fa2dbd7482098dd68d0d8970117",
        "tenant_id": "45977fa2dbd7482098dd68d0d8970117"
    }
 }
--- a/api-ref/source/v2/samples/firewalls/firewall-rules-list-response.json
+++ b/api-ref/source/v2/samples/firewalls/firewall-rules-list-response.json
@ -15,6 +15,7 @@
            "shared": false,
            "source_ip_address": null,
            "source_port": null,
+            "project_id": "45977fa2dbd7482098dd68d0d8970117",
            "tenant_id": "45977fa2dbd7482098dd68d0d8970117"
        }
    ]
--- a/api-ref/source/v2/samples/firewalls/firewall-show-response.json
+++ b/api-ref/source/v2/samples/firewalls/firewall-show-response.json
@ -9,6 +9,7 @@
        "router_ids": [
            "650bfd2f-7766-4a0d-839f-218f33e16998"
        ],
+        "project_id": "45977fa2dbd7482098dd68d0d8970117",
        "tenant_id": "45977fa2dbd7482098dd68d0d8970117"
    }
 }
--- a/api-ref/source/v2/samples/firewalls/firewall-update-response.json
+++ b/api-ref/source/v2/samples/firewalls/firewall-update-response.json
@ -9,6 +9,7 @@
        "router_ids": [
            "650bfd2f-7766-4a0d-839f-218f33e16998"
        ],
+        "project_id": "45977fa2dbd7482098dd68d0d8970117",
        "tenant_id": "45977fa2dbd7482098dd68d0d8970117"
    }
 }
--- a/api-ref/source/v2/samples/firewalls/firewalls-list-response.json
+++ b/api-ref/source/v2/samples/firewalls/firewalls-list-response.json
@ -10,6 +10,7 @@
            "router_ids": [
                "650bfd2f-7766-4a0d-839f-218f33e16998"
            ],
+            "project_id": "45977fa2dbd7482098dd68d0d8970117",
            "tenant_id": "45977fa2dbd7482098dd68d0d8970117"
        }
    ]
--- a/api-ref/source/v2/samples/floatingips/floating-ips-list-response.json
+++ b/api-ref/source/v2/samples/floatingips/floating-ips-list-response.json
@ -2,6 +2,7 @@
    "floatingips": [
        {
            "router_id": "d23abc8d-2991-4a55-ba98-2aaea84cc72f",
+            "project_id": "4969c491a3c74ee4af974e6d800c62de",
            "tenant_id": "4969c491a3c74ee4af974e6d800c62de",
            "floating_network_id": "376da547-b977-4cfe-9cba-275c80debf57",
            "fixed_ip_address": "10.0.0.3",
@ -12,6 +13,7 @@
        },
        {
            "router_id": null,
+            "project_id": "4969c491a3c74ee4af974e6d800c62de",
            "tenant_id": "4969c491a3c74ee4af974e6d800c62de",
            "floating_network_id": "376da547-b977-4cfe-9cba-275c80debf57",
            "fixed_ip_address": null,
--- a/api-ref/source/v2/samples/floatingips/floatingip-create-response.json
+++ b/api-ref/source/v2/samples/floatingips/floatingip-create-response.json
@ -7,6 +7,7 @@
        "port_id": "ce705c24-c1ef-408a-bda3-7bbd946164ab",
        "router_id": "d23abc8d-2991-4a55-ba98-2aaea84cc72f",
        "status": "ACTIVE",
+        "project_id": "4969c491a3c74ee4af974e6d800c62de",
        "tenant_id": "4969c491a3c74ee4af974e6d800c62de"
    }
 }
--- a/api-ref/source/v2/samples/floatingips/floatingip-disassociate-response.json
+++ b/api-ref/source/v2/samples/floatingips/floatingip-disassociate-response.json
@ -4,6 +4,7 @@
        "router_id": "d23abc8d-2991-4a55-ba98-2aaea84cc72f",
        "fixed_ip_address": null,
        "floating_ip_address": "172.24.4.228",
+        "project_id": "4969c491a3c74ee4af974e6d800c62de",
        "tenant_id": "4969c491a3c74ee4af974e6d800c62de",
        "status": "ACTIVE",
        "port_id": null,
--- a/api-ref/source/v2/samples/floatingips/floatingip-show-response.json
+++ b/api-ref/source/v2/samples/floatingips/floatingip-show-response.json
@ -4,6 +4,7 @@
        "router_id": "d23abc8d-2991-4a55-ba98-2aaea84cc72f",
        "fixed_ip_address": "10.0.0.3",
        "floating_ip_address": "172.24.4.228",
+        "project_id": "4969c491a3c74ee4af974e6d800c62de",
        "tenant_id": "4969c491a3c74ee4af974e6d800c62de",
        "status": "ACTIVE",
        "port_id": "ce705c24-c1ef-408a-bda3-7bbd946164ab",
--- a/api-ref/source/v2/samples/floatingips/floatingip-update-response.json
+++ b/api-ref/source/v2/samples/floatingips/floatingip-update-response.json
@ -4,6 +4,7 @@
        "router_id": "d23abc8d-2991-4a55-ba98-2aaea84cc72f",
        "fixed_ip_address": "10.0.0.4",
        "floating_ip_address": "172.24.4.228",
+        "project_id": "4969c491a3c74ee4af974e6d800c62de",
        "tenant_id": "4969c491a3c74ee4af974e6d800c62de",
        "status": "ACTIVE",
        "port_id": "fc861431-0e6c-4842-a0ed-e2363f9bc3a8",
--- a/api-ref/source/v2/samples/lbaas/healthmonitor-create-response.json
+++ b/api-ref/source/v2/samples/lbaas/healthmonitor-create-response.json
@ -1,6 +1,7 @@
 {
    "health_monitor": {
        "admin_state_up": true,
+        "project_id": "eabfefa3fd1740a88a47ad98e132d238",
        "tenant_id": "eabfefa3fd1740a88a47ad98e132d238",
        "delay": 1,
        "expected_codes": "200,201,202",
--- a/api-ref/source/v2/samples/lbaas/healthmonitor-show-response.json
+++ b/api-ref/source/v2/samples/lbaas/healthmonitor-show-response.json
@ -1,6 +1,7 @@
 {
    "health_monitor": {
        "admin_state_up": true,
+        "project_id": "eabfefa3fd1740a88a47ad98e132d238",
        "tenant_id": "eabfefa3fd1740a88a47ad98e132d238",
        "delay": 1,
        "expected_codes": "200,201,202",
--- a/api-ref/source/v2/samples/lbaas/healthmonitor-update-response.json
+++ b/api-ref/source/v2/samples/lbaas/healthmonitor-update-response.json
@ -1,6 +1,7 @@
 {
    "health_monitor": {
        "admin_state_up": false,
+        "project_id": "eabfefa3fd1740a88a47ad98e132d238",
        "tenant_id": "eabfefa3fd1740a88a47ad98e132d238",
        "delay": 2,
        "expected_codes": "200",
--- a/api-ref/source/v2/samples/lbaas/healthmonitors-list-response.json
+++ b/api-ref/source/v2/samples/lbaas/healthmonitors-list-response.json
@ -2,6 +2,7 @@
    "health_monitors": [
        {
            "admin_state_up": true,
+            "project_id": "eabfefa3fd1740a88a47ad98e132d238",
            "tenant_id": "eabfefa3fd1740a88a47ad98e132d238",
            "delay": 1,
            "expected_codes": "200,201,202",
--- a/api-ref/source/v2/samples/lbaas/listener-create-response.json
+++ b/api-ref/source/v2/samples/lbaas/listener-create-response.json
@ -13,6 +13,7 @@
        "name": "listener1",
        "protocol": "HTTP",
        "protocol_port": 80,
+        "project_id": "1a3e005cf9ce40308c900bcb08e5320c",
        "tenant_id": "1a3e005cf9ce40308c900bcb08e5320c",
        "default_tls_container_ref": "https://barbican.endpoint/containers/a36c20d0-18e9-42ce-88fd-82a35977ee8c",
        "sni_container_refs": [
--- a/api-ref/source/v2/samples/lbaas/listener-show-response.json
+++ b/api-ref/source/v2/samples/lbaas/listener-show-response.json
@ -13,6 +13,7 @@
        "name": "",
        "protocol": "HTTP",
        "protocol_port": 80,
+        "project_id": "3e4d8bec50a845fcb09e03a4375c691d",
        "tenant_id": "3e4d8bec50a845fcb09e03a4375c691d",
        "default_tls_container_ref": "https://barbican.endpoint/containers/a36c20d0-18e9-42ce-88fd-82a35977ee8c",
        "sni_container_refs": [
--- a/api-ref/source/v2/samples/lbaas/listener-update-response.json
+++ b/api-ref/source/v2/samples/lbaas/listener-update-response.json
@ -13,6 +13,7 @@
        "name": "listener2",
        "protocol": "HTTP",
        "protocol_port": 80,
+        "project_id": "1a3e005cf9ce40308c900bcb08e5320c",
        "tenant_id": "1a3e005cf9ce40308c900bcb08e5320c",
        "default_tls_container_ref": "https://barbican.endpoint/containers/a36c20d0-18e9-42ce-88fd-82a35977ee8c",
        "sni_container_refs": [
--- a/api-ref/source/v2/samples/lbaas/listeners-list-response.json
+++ b/api-ref/source/v2/samples/lbaas/listeners-list-response.json
@ -14,6 +14,7 @@
            "name": "",
            "protocol": "HTTP",
            "protocol_port": 80,
+            "project_id": "3e4d8bec50a845fcb09e03a4375c691d",
            "tenant_id": "3e4d8bec50a845fcb09e03a4375c691d",
            "default_tls_container_ref": "https://barbican.endpoint/containers/a36c20d0-18e9-42ce-88fd-82a35977ee8c",
            "sni_container_refs": [
--- a/api-ref/source/v2/samples/lbaas/loadbalancer-create-request.json
+++ b/api-ref/source/v2/samples/lbaas/loadbalancer-create-request.json
@ -2,6 +2,7 @@
    "loadbalancer": {
        "name": "loadbalancer1",
        "description": "simple lb",
+        "project_id": "b7c1a69e88bf4b21a8148f787aef2081",
        "tenant_id": "b7c1a69e88bf4b21a8148f787aef2081",
        "vip_subnet_id": "013d3059-87a4-45a5-91e9-d721068ae0b2",
        "vip_address": "10.0.0.4",
--- a/api-ref/source/v2/samples/lbaas/loadbalancer-create-response.json
+++ b/api-ref/source/v2/samples/lbaas/loadbalancer-create-response.json
@ -7,6 +7,7 @@
        "name": "loadbalancer1",
        "operating_status": "ONLINE",
        "provisioning_status": "ACTIVE",
+        "project_id": "b7c1a69e88bf4b21a8148f787aef2081",
        "tenant_id": "b7c1a69e88bf4b21a8148f787aef2081",
        "vip_address": "10.0.0.4",
        "vip_subnet_id": "013d3059-87a4-45a5-91e9-d721068ae0b2",
--- a/api-ref/source/v2/samples/lbaas/loadbalancer-show-response.json
+++ b/api-ref/source/v2/samples/lbaas/loadbalancer-show-response.json
@ -2,6 +2,7 @@
    "loadbalancer": {
        "description": "simple lb",
        "admin_state_up": true,
+        "project_id": "1a3e005cf9ce40308c900bcb08e5320c",
        "tenant_id": "1a3e005cf9ce40308c900bcb08e5320c",
        "provisioning_status": "ACTIVE",
        "listeners": [],
--- a/api-ref/source/v2/samples/lbaas/loadbalancer-update-response.json
+++ b/api-ref/source/v2/samples/lbaas/loadbalancer-update-response.json
@ -7,6 +7,7 @@
        "name": "loadbalancer2",
        "operating_status": "ONLINE",
        "provisioning_status": "PENDING_UPDATE",
+        "project_id": "b7c1a69e88bf4b21a8148f787aef2081",
        "tenant_id": "b7c1a69e88bf4b21a8148f787aef2081",
        "vip_address": "10.0.0.4",
        "vip_subnet_id": "013d3059-87a4-45a5-91e9-d721068ae0b2"
--- a/api-ref/source/v2/samples/lbaas/loadbalancers-list-response.json
+++ b/api-ref/source/v2/samples/lbaas/loadbalancers-list-response.json
@ -3,6 +3,7 @@
        {
            "description": "simple lb",
            "admin_state_up": true,
+            "project_id": "1a3e005cf9ce40308c900bcb08e5320c",
            "tenant_id": "1a3e005cf9ce40308c900bcb08e5320c",
            "provisioning_status": "ACTIVE",
            "listeners": [],
--- a/api-ref/source/v2/samples/lbaas/member-create-response.json
+++ b/api-ref/source/v2/samples/lbaas/member-create-response.json
@ -5,6 +5,7 @@
        "status_description": null,
        "weight": 1,
        "address": "10.0.1.22",
+        "project_id": "eabfefa3fd1740a88a47ad98e132d238",
        "tenant_id": "eabfefa3fd1740a88a47ad98e132d238",
        "protocol_port": 90,
        "id": "cf024846-7516-4e3a-b0fb-6590322c836f",
--- a/api-ref/source/v2/samples/lbaas/member-show-response.json
+++ b/api-ref/source/v2/samples/lbaas/member-show-response.json
@ -5,6 +5,7 @@
        "status_description": null,
        "weight": 1,
        "address": "10.0.1.22",
+        "project_id": "eabfefa3fd1740a88a47ad98e132d238",
        "tenant_id": "eabfefa3fd1740a88a47ad98e132d238",
        "protocol_port": 90,
        "id": "cf024846-7516-4e3a-b0fb-6590322c836f",
--- a/api-ref/source/v2/samples/lbaas/member-update-response.json
+++ b/api-ref/source/v2/samples/lbaas/member-update-response.json
@ -5,6 +5,7 @@
        "status_description": null,
        "weight": 5,
        "address": "10.0.1.22",
+        "project_id": "eabfefa3fd1740a88a47ad98e132d238",
        "tenant_id": "eabfefa3fd1740a88a47ad98e132d238",
        "protocol_port": 90,
        "id": "cf024846-7516-4e3a-b0fb-6590322c836f",
--- a/api-ref/source/v2/samples/lbaas/members-list-response.json
+++ b/api-ref/source/v2/samples/lbaas/members-list-response.json
@ -6,6 +6,7 @@
            "status_description": null,
            "weight": 1,
            "address": "10.0.1.22",
+            "project_id": "eabfefa3fd1740a88a47ad98e132d238",
            "tenant_id": "eabfefa3fd1740a88a47ad98e132d238",
            "protocol_port": 90,
            "id": "cf024846-7516-4e3a-b0fb-6590322c836f",
--- a/api-ref/source/v2/samples/lbaas/pool-create-response.json
+++ b/api-ref/source/v2/samples/lbaas/pool-create-response.json
@ -12,6 +12,7 @@
        "name": "my-pool",
        "admin_state_up": true,
        "subnet_id": "e301aed0-d9e7-498a-977c-1bbfaf14ed5d",
+        "project_id": "eabfefa3fd1740a88a47ad98e132d238",
        "tenant_id": "eabfefa3fd1740a88a47ad98e132d238",
        "health_monitors_status": [],
        "provider": "haproxy"
--- a/api-ref/source/v2/samples/lbaas/pool-list-resp.json
+++ b/api-ref/source/v2/samples/lbaas/pool-list-resp.json
@ -14,6 +14,7 @@
            "members": [],
            "name": "pool1",
            "protocol": "HTTP",
+            "project_id": "1a3e005cf9ce40308c900bcb08e5320c",
            "tenant_id": "1a3e005cf9ce40308c900bcb08e5320c"
        }
    ]
--- a/api-ref/source/v2/samples/lbaas/pool-members-list-response.json
+++ b/api-ref/source/v2/samples/lbaas/pool-members-list-response.json
@ -6,6 +6,7 @@
            "id": "9a7aff27-fd41-4ec1-ba4c-3eb92c629313",
            "protocol_port": 80,
            "subnet_id": "013d3059-87a4-45a5-91e9-d721068ae0b2",
+            "project_id": "1a3e005cf9ce40308c900bcb08e5320c",
            "tenant_id": "1a3e005cf9ce40308c900bcb08e5320c",
            "weight": 1
        }
--- a/api-ref/source/v2/samples/lbaas/pool-show-response.json
+++ b/api-ref/source/v2/samples/lbaas/pool-show-response.json
@ -16,6 +16,7 @@
        "name": "pool1",
        "admin_state_up": true,
        "subnet_id": "aa547115-d710-4d6d-bb2c-b038d9c2704b",
+        "project_id": "eabfefa3fd1740a88a47ad98e132d238",
        "tenant_id": "eabfefa3fd1740a88a47ad98e132d238",
        "health_monitors_status": [
            {
--- a/api-ref/source/v2/samples/lbaas/pool-update-response.json
+++ b/api-ref/source/v2/samples/lbaas/pool-update-response.json
@ -16,6 +16,7 @@
        "name": "SuperPool",
        "admin_state_up": true,
        "subnet_id": "aa547115-d710-4d6d-bb2c-b038d9c2704b",
+        "project_id": "eabfefa3fd1740a88a47ad98e132d238",
        "tenant_id": "eabfefa3fd1740a88a47ad98e132d238",
        "health_monitors_status": [
            {
--- a/api-ref/source/v2/samples/lbaas/pools-list-response.json
+++ b/api-ref/source/v2/samples/lbaas/pools-list-response.json
@ -17,6 +17,7 @@
            "name": "pool1",
            "admin_state_up": true,
            "subnet_id": "aa547115-d710-4d6d-bb2c-b038d9c2704b",
+            "project_id": "eabfefa3fd1740a88a47ad98e132d238",
            "tenant_id": "eabfefa3fd1740a88a47ad98e132d238",
            "health_monitors_status": [
                {
--- a/api-ref/source/v2/samples/lbaas/pools-list-response2.json
+++ b/api-ref/source/v2/samples/lbaas/pools-list-response2.json
@ -14,6 +14,7 @@
            "members": [],
            "name": "pool1",
            "protocol": "HTTP",
+            "project_id": "1a3e005cf9ce40308c900bcb08e5320c",
            "tenant_id": "1a3e005cf9ce40308c900bcb08e5320c"
        }
    ]
--- a/api-ref/source/v2/samples/lbaas/vip-create-response.json
+++ b/api-ref/source/v2/samples/lbaas/vip-create-response.json
@ -11,6 +11,7 @@
        "name": "NewVip",
        "admin_state_up": true,
        "subnet_id": "0ba2ef27-0054-4b28-a8fa-f215e8079272",
+        "project_id": "e68c3e65e1f34ee9b2357d0fe418a78b",
        "tenant_id": "e68c3e65e1f34ee9b2357d0fe418a78b",
        "connection_limit": -1,
        "pool_id": "105320c3-8416-4997-9c1c-4098b95fdaca",
--- a/api-ref/source/v2/samples/lbaas/vip-show-response.json
+++ b/api-ref/source/v2/samples/lbaas/vip-show-response.json
@ -11,6 +11,7 @@
        "name": "my-Vip",
        "admin_state_up": true,
        "subnet_id": "aa547115-d710-4d6d-bb2c-b038d9c2704b",
+        "project_id": "eabfefa3fd1740a88a47ad98e132d238",
        "tenant_id": "eabfefa3fd1740a88a47ad98e132d238",
        "connection_limit": -1,
        "pool_id": "5a9a3e9e-d1aa-448e-af37-a70171f2a332",
--- a/api-ref/source/v2/samples/lbaas/vip-update-response.json
+++ b/api-ref/source/v2/samples/lbaas/vip-update-response.json
@ -11,6 +11,7 @@
        "name": "NewVip",
        "admin_state_up": true,
        "subnet_id": "0ba2ef27-0054-4b28-a8fa-f215e8079272",
+        "project_id": "e68c3e65e1f34ee9b2357d0fe418a78b",
        "tenant_id": "e68c3e65e1f34ee9b2357d0fe418a78b",
        "connection_limit": 1000,
        "pool_id": "105320c3-8416-4997-9c1c-4098b95fdaca",
--- a/api-ref/source/v2/samples/lbaas/vips-list-response.json
+++ b/api-ref/source/v2/samples/lbaas/vips-list-response.json
@ -12,6 +12,7 @@
            "name": "my-Vip",
            "admin_state_up": true,
            "subnet_id": "aa547115-d710-4d6d-bb2c-b038d9c2704b",
+            "project_id": "eabfefa3fd1740a88a47ad98e132d238",
            "tenant_id": "eabfefa3fd1740a88a47ad98e132d238",
            "connection_limit": -1,
            "pool_id": "5a9a3e9e-d1aa-448e-af37-a70171f2a332",
--- a/api-ref/source/v2/samples/metering/metering-label-create-response.json
+++ b/api-ref/source/v2/samples/metering/metering-label-create-response.json
@ -1,5 +1,6 @@
 {
    "metering_label": {
+        "project_id": "45345b0ee1ea477fac0f541b2cb79cd4",
        "tenant_id": "45345b0ee1ea477fac0f541b2cb79cd4",
        "description": "description of label1",
        "name": "label1",
--- a/api-ref/source/v2/samples/metering/metering-label-show-response.json
+++ b/api-ref/source/v2/samples/metering/metering-label-show-response.json
@ -1,5 +1,6 @@
 {
    "metering_label": {
+        "project_id": "45345b0ee1ea477fac0f541b2cb79cd4",
        "tenant_id": "45345b0ee1ea477fac0f541b2cb79cd4",
        "description": "label1 description",
        "name": "label1",
--- a/api-ref/source/v2/samples/metering/metering-labels-list-response.json
+++ b/api-ref/source/v2/samples/metering/metering-labels-list-response.json
@ -1,6 +1,7 @@
 {
    "metering_labels": [
        {
+            "project_id": "45345b0ee1ea477fac0f541b2cb79cd4",
            "tenant_id": "45345b0ee1ea477fac0f541b2cb79cd4",
            "description": "label1 description",
            "name": "label1",
@ -8,6 +9,7 @@
            "shared": false
        },
        {
+            "project_id": "45345b0ee1ea477fac0f541b2cb79cd4",
            "tenant_id": "45345b0ee1ea477fac0f541b2cb79cd4",
            "description": "label2 description",
            "name": "label2",
--- a/api-ref/source/v2/samples/network-ip-availability/network-ip-availability-list.json
+++ b/api-ref/source/v2/samples/network-ip-availability/network-ip-availability-list.json
@ -21,6 +21,7 @@
                    "used_ips": 1
                }
            ],
+            "project_id": "1a02cc95f1734fcc9d3c753818f03002",
            "tenant_id": "1a02cc95f1734fcc9d3c753818f03002",
            "total_ips": 253,
            "used_ips": 2
@ -46,6 +47,7 @@
                    "used_ips": 2
                }
            ],
+            "project_id": "d56d3b8dd6894a508cf41b96b522328c",
            "tenant_id": "d56d3b8dd6894a508cf41b96b522328c",
            "total_ips": 18446744073709552000,
            "used_ips": 4
--- a/api-ref/source/v2/samples/network-ip-availability/network-ip-availability-show.json
+++ b/api-ref/source/v2/samples/network-ip-availability/network-ip-availability-show.json
@ -20,6 +20,7 @@
            }
        ],
        "network_id": "6801d9c8-20e6-4b27-945d-62499f00002e",
+        "project_id": "d56d3b8dd6894a508cf41b96b522328c",
        "tenant_id": "d56d3b8dd6894a508cf41b96b522328c",
        "total_ips": 18446744073709552000,
        "network_name": "private"
--- a/api-ref/source/v2/samples/networks/network-create-response.json
+++ b/api-ref/source/v2/samples/networks/network-create-response.json
@ -4,6 +4,7 @@
        "subnets": [],
        "name": "net1",
        "admin_state_up": true,
+        "project_id": "9bacb3c5d39d41a79512987f338cf177",
        "tenant_id": "9bacb3c5d39d41a79512987f338cf177",
        "qos_policy_id": "6a8454ade84346f59e8d40665f878b2e",
        "router:external": false,
--- a/api-ref/source/v2/samples/networks/network-multi-create-response.json
+++ b/api-ref/source/v2/samples/networks/network-multi-create-response.json
@ -4,6 +4,7 @@
        "subnets": [],
        "name": "net1",
        "admin_state_up": true,
+        "project_id": "9bacb3c5d39d41a79512987f338cf177",
        "tenant_id": "9bacb3c5d39d41a79512987f338cf177",
        "qos_policy_id": "6a8454ade84346f59e8d40665f878b2e",
        "segments": [
--- a/api-ref/source/v2/samples/networks/network-provider-create-response.json
+++ b/api-ref/source/v2/samples/networks/network-provider-create-response.json
@ -6,6 +6,7 @@
        "name": "net1",
        "provider:physical_network": "8bab8453-1bc9-45af-8c70-f83aa9b50453",
        "admin_state_up": true,
+        "project_id": "9bacb3c5d39d41a79512987f338cf177",
        "tenant_id": "9bacb3c5d39d41a79512987f338cf177",
        "router:external": false,
        "provider:network_type": "vlan",
--- a/api-ref/source/v2/samples/networks/network-provider-show-response.json
+++ b/api-ref/source/v2/samples/networks/network-provider-show-response.json
@ -12,6 +12,7 @@
        "provider:physical_network": null,
        "router:external": false,
        "admin_state_up": true,
+        "project_id": "4fd44f30292945e481c7b8a0c8908869",
        "tenant_id": "4fd44f30292945e481c7b8a0c8908869",
        "provider:network_type": "local",
        "mtu": 0,
--- a/api-ref/source/v2/samples/networks/network-provider-update-response.json
+++ b/api-ref/source/v2/samples/networks/network-provider-update-response.json
@ -9,6 +9,7 @@
        "name": "sample_network_5_updated",
        "provider:physical_network": null,
        "admin_state_up": true,
+        "project_id": "4fd44f30292945e481c7b8a0c8908869",
        "tenant_id": "4fd44f30292945e481c7b8a0c8908869",
        "provider:network_type": "local",
        "router:external": false,
--- a/api-ref/source/v2/samples/networks/network-show-response.json
+++ b/api-ref/source/v2/samples/networks/network-show-response.json
@ -7,6 +7,7 @@
        "name": "private-network",
        "router:external": false,
        "admin_state_up": true,
+        "project_id": "4fd44f30292945e481c7b8a0c8908869",
        "tenant_id": "4fd44f30292945e481c7b8a0c8908869",
        "qos_policy_id": "6a8454ade84346f59e8d40665f878b2e",
        "created_at": "2016-03-08T20:19:41",
--- a/api-ref/source/v2/samples/networks/network-update-response.json
+++ b/api-ref/source/v2/samples/networks/network-update-response.json
@ -5,6 +5,7 @@
        "name": "sample_network_5_updated",
        "provider:physical_network": null,
        "admin_state_up": true,
+        "project_id": "4fd44f30292945e481c7b8a0c8908869",
        "tenant_id": "4fd44f30292945e481c7b8a0c8908869",
        "qos_policy_id": "6a8454ade84346f59e8d40665f878b2e",
        "provider:network_type": "local",
--- a/api-ref/source/v2/samples/networks/network-vlan-transparent-create-response.json
+++ b/api-ref/source/v2/samples/networks/network-vlan-transparent-create-response.json
@ -5,6 +5,7 @@
        "name": "net1",
        "admin_state_up": true,
        "vlan_transparent": true,
+        "project_id": "5831268f-1f52-49a7-88d5-bc0d7a74d523",
        "tenant_id": "5831268f-1f52-49a7-88d5-bc0d7a74d523",
        "router:external": false,
        "shared": false,
--- a/api-ref/source/v2/samples/networks/network-vlan-transparent-show-response.json
+++ b/api-ref/source/v2/samples/networks/network-vlan-transparent-show-response.json
@ -4,6 +4,7 @@
        "subnets": [],
        "name": "net1",
        "admin_state_up": true,
+        "project_id": "e926fd5a-e9f6-4dc8-8043-a352d974ceaf",
        "tenant_id": "e926fd5a-e9f6-4dc8-8043-a352d974ceaf",
        "router:external": false,
        "vlan_transparent": true,
--- a/api-ref/source/v2/samples/networks/networks-bulk-create-response.json
+++ b/api-ref/source/v2/samples/networks/networks-bulk-create-response.json
@ -6,6 +6,7 @@
            "name": "sample_network3",
            "provider:physical_network": null,
            "admin_state_up": true,
+            "project_id": "4fd44f30292945e481c7b8a0c8908869",
            "tenant_id": "4fd44f30292945e481c7b8a0c8908869",
            "qos_policy_id": "6a8454ade84346f59e8d40665f878b2e",
            "mtu": 0,
@ -19,6 +20,7 @@
            "name": "sample_network4",
            "provider:physical_network": null,
            "admin_state_up": true,
+            "project_id": "4fd44f30292945e481c7b8a0c8908869",
            "tenant_id": "4fd44f30292945e481c7b8a0c8908869",
            "qos_policy_id": "6a8454ade84346f59e8d40665f878b2e",
            "mtu": 0,
--- a/api-ref/source/v2/samples/networks/networks-list-response.json
+++ b/api-ref/source/v2/samples/networks/networks-list-response.json
@ -8,6 +8,7 @@
            "name": "private-network",
            "provider:physical_network": null,
            "admin_state_up": true,
+            "project_id": "4fd44f30292945e481c7b8a0c8908869",
            "tenant_id": "4fd44f30292945e481c7b8a0c8908869",
            "qos_policy_id": "6a8454ade84346f59e8d40665f878b2e",
            "provider:network_type": "local",
@ -25,6 +26,7 @@
            "name": "private",
            "provider:physical_network": null,
            "admin_state_up": true,
+            "project_id": "26a7980765d0414dbc1fc1f88cdb7e6e",
            "tenant_id": "26a7980765d0414dbc1fc1f88cdb7e6e",
            "qos_policy_id": "bfdb6c39f71e4d44b1dfbda245c50819",
            "provider:network_type": "local",
--- a/api-ref/source/v2/samples/networks/networks-multi-list-response.json
+++ b/api-ref/source/v2/samples/networks/networks-multi-list-response.json
@ -5,6 +5,7 @@
            "subnets": [],
            "name": "net1",
            "admin_state_up": true,
+            "project_id": "9bacb3c5d39d41a79512987f338cf177",
            "tenant_id": "9bacb3c5d39d41a79512987f338cf177",
            "qos_policy_id": "6a8454ade84346f59e8d40665f878b2e",
            "segments": [
@ -32,6 +33,7 @@
            "provider:physical_network": null,
            "router:external": true,
            "admin_state_up": true,
+            "project_id": "26a7980765d0414dbc1fc1f88cdb7e6e",
            "tenant_id": "26a7980765d0414dbc1fc1f88cdb7e6e",
            "qos_policy_id": "bfdb6c39f71e4d44b1dfbda245c50819",
            "provider:network_type": "local",
--- a/api-ref/source/v2/samples/networks/networks-multi-show-response.json
+++ b/api-ref/source/v2/samples/networks/networks-multi-show-response.json
@ -4,6 +4,7 @@
        "subnets": [],
        "name": "net1",
        "admin_state_up": true,
+        "project_id": "9bacb3c5d39d41a79512987f338cf177",
        "tenant_id": "9bacb3c5d39d41a79512987f338cf177",
        "qos_policy_id": "6a8454ade84346f59e8d40665f878b2e",
        "segments": [
--- a/api-ref/source/v2/samples/networks/networks-provider-list-response.json
+++ b/api-ref/source/v2/samples/networks/networks-provider-list-response.json
@ -12,6 +12,7 @@
            "name": "private-network",
            "provider:physical_network": null,
            "admin_state_up": true,
+            "project_id": "4fd44f30292945e481c7b8a0c8908869",
            "tenant_id": "4fd44f30292945e481c7b8a0c8908869",
            "provider:network_type": "local",
            "mtu": 0,
@ -32,6 +33,7 @@
            "name": "private",
            "provider:physical_network": null,
            "admin_state_up": true,
+            "project_id": "26a7980765d0414dbc1fc1f88cdb7e6e",
            "tenant_id": "26a7980765d0414dbc1fc1f88cdb7e6e",
            "provider:network_type": "local",
            "mtu": 0,
--- a/api-ref/source/v2/samples/networks/networks-vlan-transparent-list-response.json
+++ b/api-ref/source/v2/samples/networks/networks-vlan-transparent-list-response.json
@ -5,6 +5,7 @@
            "subnets": [],
            "name": "net1",
            "admin_state_up": true,
+            "project_id": "e252a863-92ee-480f-8bd8-71be77089499",
            "tenant_id": "e252a863-92ee-480f-8bd8-71be77089499",
            "shared": false,
            "router:external": false,
@ -18,6 +19,7 @@
            ],
            "name": "private",
            "admin_state_up": true,
+            "project_id": "109e5fae-d976-4791-84c7-6ae0bb3896c3",
            "tenant_id": "109e5fae-d976-4791-84c7-6ae0bb3896c3",
            "shared": true,
            "router:external": false,
--- a/api-ref/source/v2/samples/ports/port-bind-create-update-response.json
+++ b/api-ref/source/v2/samples/ports/port-bind-create-update-response.json
@ -6,6 +6,7 @@
        "allowed_address_pairs": [],
        "admin_state_up": true,
        "network_id": "a87cc70a-3e15-4acf-8205-9b711a3531b7",
+        "project_id": "d6700c0c9ffa4f1cb322cd4a1f3906fa",
        "tenant_id": "d6700c0c9ffa4f1cb322cd4a1f3906fa",
        "binding:vif_details": {},
        "binding:vnic_type": "normal",
--- a/api-ref/source/v2/samples/ports/port-bind-show-response.json
+++ b/api-ref/source/v2/samples/ports/port-bind-show-response.json
@ -6,6 +6,7 @@
        "allowed_address_pairs": [],
        "admin_state_up": true,
        "network_id": "a87cc70a-3e15-4acf-8205-9b711a3531b7",
+        "project_id": "7e02058126cc4950b75f9970368ba177",
        "tenant_id": "7e02058126cc4950b75f9970368ba177",
        "extra_dhcp_opts": [],
        "binding:vif_details": {
--- a/api-ref/source/v2/samples/ports/port-create-response.json
+++ b/api-ref/source/v2/samples/ports/port-create-response.json
@ -5,6 +5,7 @@
        "allowed_address_pairs": [],
        "admin_state_up": true,
        "network_id": "a87cc70a-3e15-4acf-8205-9b711a3531b7",
+        "project_id": "d6700c0c9ffa4f1cb322cd4a1f3906fa",
        "tenant_id": "d6700c0c9ffa4f1cb322cd4a1f3906fa",
        "device_owner": "",
        "mac_address": "fa:16:3e:c9:cb:f0",
--- a/api-ref/source/v2/samples/ports/port-show-response.json
+++ b/api-ref/source/v2/samples/ports/port-show-response.json
@ -5,6 +5,7 @@
        "allowed_address_pairs": [],
        "admin_state_up": true,
        "network_id": "a87cc70a-3e15-4acf-8205-9b711a3531b7",
+        "project_id": "7e02058126cc4950b75f9970368ba177",
        "tenant_id": "7e02058126cc4950b75f9970368ba177",
        "created_at": "2016-03-08T20:19:41",
        "extra_dhcp_opts": [],
--- a/api-ref/source/v2/samples/ports/port-update-response.json
+++ b/api-ref/source/v2/samples/ports/port-update-response.json
@ -20,6 +20,7 @@
        "name": "test-for-port-update",
        "admin_state_up": true,
        "network_id": "883fc383-5ea1-4c8b-8916-e1ddb0a9f365",
+        "project_id": "522eda8d23124b25bf03fe44f1986b74",
        "tenant_id": "522eda8d23124b25bf03fe44f1986b74",
        "binding:vif_details": {},
        "binding:vnic_type": "normal",
--- a/api-ref/source/v2/samples/ports/ports-bind-show-response.json
+++ b/api-ref/source/v2/samples/ports/ports-bind-show-response.json
@ -7,6 +7,7 @@
            "allowed_address_pairs": [],
            "admin_state_up": true,
            "network_id": "70c1db1f-b701-45bd-96e0-a313ee3430b3",
+            "project_id": "",
            "tenant_id": "",
            "extra_dhcp_opts": [],
            "binding:vif_details": {
@ -36,6 +37,7 @@
            "allowed_address_pairs": [],
            "admin_state_up": true,
            "network_id": "f27aa545-cbdd-4907-b0c6-c9e8b039dcc2",
+            "project_id": "d397de8a63f341818f198abb0966f6f3",
            "tenant_id": "d397de8a63f341818f198abb0966f6f3",
            "extra_dhcp_opts": [],
            "binding:vif_details": {
--- a/api-ref/source/v2/samples/ports/ports-bulk-create-response.json
+++ b/api-ref/source/v2/samples/ports/ports-bulk-create-response.json
@ -6,6 +6,7 @@
            "allowed_address_pairs": [],
            "admin_state_up": false,
            "network_id": "a87cc70a-3e15-4acf-8205-9b711a3531b7",
+            "project_id": "d6700c0c9ffa4f1cb322cd4a1f3906fa",
            "tenant_id": "d6700c0c9ffa4f1cb322cd4a1f3906fa",
            "device_owner": "",
            "mac_address": "fa:16:3e:48:b8:9f",
@ -27,6 +28,7 @@
            "allowed_address_pairs": [],
            "admin_state_up": false,
            "network_id": "a87cc70a-3e15-4acf-8205-9b711a3531b7",
+            "project_id": "d6700c0c9ffa4f1cb322cd4a1f3906fa",
            "tenant_id": "d6700c0c9ffa4f1cb322cd4a1f3906fa",
            "device_owner": "",
            "mac_address": "fa:16:3e:f4:73:df",
--- a/api-ref/source/v2/samples/ports/ports-list-response.json
+++ b/api-ref/source/v2/samples/ports/ports-list-response.json
@ -6,6 +6,7 @@
            "allowed_address_pairs": [],
            "admin_state_up": true,
            "network_id": "70c1db1f-b701-45bd-96e0-a313ee3430b3",
+            "project_id": "",
            "tenant_id": "",
            "extra_dhcp_opts": [],
            "device_owner": "network:router_gateway",
@ -26,6 +27,7 @@
            "allowed_address_pairs": [],
            "admin_state_up": true,
            "network_id": "f27aa545-cbdd-4907-b0c6-c9e8b039dcc2",
+            "project_id": "d397de8a63f341818f198abb0966f6f3",
            "tenant_id": "d397de8a63f341818f198abb0966f6f3",
            "extra_dhcp_opts": [],
            "device_owner": "network:router_interface",
--- a/api-ref/source/v2/samples/qos/policies-list-response.json
+++ b/api-ref/source/v2/samples/qos/policies-list-response.json
@ -1,6 +1,7 @@
 {
    "policies": [
        {
+            "project_id": "8d4c70a21fed4aeba121a1a429ba0d04",
            "tenant_id": "8d4c70a21fed4aeba121a1a429ba0d04",
            "id": "46ebaec0-0570-43ac-82f6-60d2b03168c4",
            "name": "10Mbit",
--- a/api-ref/source/v2/samples/qos/policy-create-response.json
+++ b/api-ref/source/v2/samples/qos/policy-create-response.json
@ -3,6 +3,7 @@
        "name": "10Mbit",
        "description": "This policy limits the ports to 10Mbit max.",
        "id": "46ebaec0-0570-43ac-82f6-60d2b03168c4",
+        "project_id": "8d4c70a21fed4aeba121a1a429ba0d04",
        "tenant_id": "8d4c70a21fed4aeba121a1a429ba0d04",
        "shared": false
    }
--- a/api-ref/source/v2/samples/qos/policy-show-response.json
+++ b/api-ref/source/v2/samples/qos/policy-show-response.json
@ -1,5 +1,6 @@
 {
    "policy": {
+        "project_id": "8d4c70a21fed4aeba121a1a429ba0d04",
        "tenant_id": "8d4c70a21fed4aeba121a1a429ba0d04",
        "id": "46ebaec0-0570-43ac-82f6-60d2b03168c4",
        "name": "10Mbit",
--- a/api-ref/source/v2/samples/qos/policy-update-response.json
+++ b/api-ref/source/v2/samples/qos/policy-update-response.json
@ -3,6 +3,7 @@
        "name": "10Mbit",
        "description": "This policy limits the ports to 10Mbit max.",
        "id": "46ebaec0-0570-43ac-82f6-60d2b03168c4",
+        "project_id": "8d4c70a21fed4aeba121a1a429ba0d04",
        "tenant_id": "8d4c70a21fed4aeba121a1a429ba0d04",
        "shared": false
    }
--- a/api-ref/source/v2/samples/quotas/quotas-list-for-project-response.json
+++ b/api-ref/source/v2/samples/quotas/quotas-list-for-project-response.json
--- a/api-ref/source/v2/samples/quotas/quotas-list-response.json
+++ b/api-ref/source/v2/samples/quotas/quotas-list-response.json
@ -4,6 +4,7 @@
            "subnet": 10,
            "network": 15,
            "floatingip": 50,
+            "project_id": "bab7d5c60cd041a0a36f7c4b6e1dd978",
            "tenant_id": "bab7d5c60cd041a0a36f7c4b6e1dd978",
            "subnetpool": -1,
            "security_group_rule": 100,
--- a/api-ref/source/v2/samples/routers/router-add-interface-response.json
+++ b/api-ref/source/v2/samples/routers/router-add-interface-response.json
@ -6,5 +6,6 @@
    "subnet_ids": [
        "a2f1f29d-571b-4533-907f-5803ab96ead1"
    ],
+    "project_id": "0bd18306d801447bb457a46252d82d13",
    "tenant_id": "0bd18306d801447bb457a46252d82d13"
 }
--- a/Show More
+++ b/Show More