api-ref: Merge v2 and v2-ext into one directory

Preparation of API-ref cleanup.

Part of blueprint neutron-in-tree-api-ref

Change-Id: I3d499d60b1687208a2b5882e9f655836c906a297

api-ref/source/index.rst

@@ -6,4 +6,3 @@ Networking Service APIs
    :maxdepth: 2
 
    v2/index
-   v2-ext/index

api-ref/source/v2-ext/index.rst

@@ -1,26 +0,0 @@
-:tocdepth: 2
-
-##############################
-Networking API v2.0 extensions
-##############################
-
-.. include:: extensions.inc
-.. include:: tag-ext.inc
-.. include:: network-provider.inc
-.. include:: networking-ip-availability-ext.inc
-.. include:: networks-multi-provider-ext.inc
-.. include:: networks-vlan-transparency-ext.inc
-.. include:: port-binding.inc
-.. include:: qos-ext.inc
-.. include:: quotas.inc
-.. include:: security-groups.inc
-.. include:: security_group_rules.inc
-.. include:: subnetpools-ext.inc
-.. include:: layer3-ext.inc
-.. include:: extraroute.inc
-.. include:: metering-labels-ext.inc
-.. include:: flavors-framework-v2.0.inc
-.. include:: lbaas-v2.inc
-.. include:: lbaas-v1.inc
-.. include:: fwaas-v2.0.inc
-.. include:: vpnaas.inc

api-ref/source/v2/index.rst

@@ -4,8 +4,30 @@
 Networking API v2.0
 ###################
 
-.. include:: versions-networks-v2.inc
+.. rest_expand_all::
+
+.. include:: versions.inc
+.. include:: extensions.inc
 .. include:: networks.inc
+.. include:: network-provider.inc
+.. include:: networks-multi-provider-ext.inc
+.. include:: networks-vlan-transparency-ext.inc
 .. include:: subnets.inc
 .. include:: ports.inc
+.. include:: port-binding.inc
+.. include:: subnetpools-ext.inc
+.. include:: layer3-ext.inc
+.. include:: extraroute.inc
+.. include:: security-groups.inc
+.. include:: security_group_rules.inc
+.. include:: quotas.inc
 .. include:: service-type.inc
+.. include:: flavors.inc
+.. include:: tag-ext.inc
+.. include:: networking-ip-availability-ext.inc
+.. include:: qos-ext.inc
+.. include:: metering-labels-ext.inc
+.. include:: lbaas-v2.inc
+.. include:: lbaas-v1.inc
+.. include:: fwaas-v2.0.inc
+.. include:: vpnaas.inc

api-ref/source/v2/network-provider.inc

@@ -36,7 +36,7 @@ Request
 
 .. rest_parameters:: parameters.yaml
 
-   - network_id: network_id
+   - network_id: network_id_3
 
 Response Parameters
 -------------------
@@ -94,7 +94,7 @@ Request
    - port_security_enabled: port_security_enabled
    - provider:segmentation_id: provider:segmentation_id
    - name: name
-   - network_id: network_id
+   - network_id: network_id_3
 
 Request Example
 ---------------
@@ -142,7 +142,7 @@ Request
 
 .. rest_parameters:: parameters.yaml
 
-   - network_id: network_id
+   - network_id: network_id_3
 
 List networks (provider network)
 ================================

api-ref/source/v2/networking-ip-availability-ext.inc

@@ -28,7 +28,7 @@ Request
 
 .. rest_parameters:: parameters.yaml
 
-   - network_id: network_id
+   - network_id: network_id_3
 
 Response Parameters
 -------------------
@@ -37,7 +37,7 @@ Response Parameters
 
    - used_ips: used_ips
    - subnet_ip_availability: subnet_ip_availability
-   - network_id: network_id
+   - network_id: network_id_3
    - tenant_id: tenant_id
    - total_ips: total_ips
    - network_ip_availability: network_ip_availability
@@ -74,7 +74,7 @@ Response Parameters
 
    - used_ips: used_ips
    - subnet_ip_availability: subnet_ip_availability
-   - network_id: network_id
+   - network_id: network_id_3
    - tenant_id: tenant_id
    - total_ips: total_ips
    - subnet_id: subnet_id

api-ref/source/v2/networks-multi-provider-ext.inc

@@ -49,7 +49,7 @@ Request
 
 .. rest_parameters:: parameters.yaml
 
-   - network_id: network_id
+   - network_id: network_id_3
 
 Response Parameters
 -------------------

api-ref/source/v2/networks-vlan-transparency-ext.inc

@@ -40,7 +40,7 @@ Request
 
 .. rest_parameters:: parameters.yaml
 
-   - network_id: network_id
+   - network_id: network_id_3
 
 Response Parameters
 -------------------

api-ref/source/v2/quotas.inc

@@ -38,7 +38,7 @@ Response Parameters
    - subnetpool: subnetpool
    - quotas: quotas
    - security_group_rule: security_group_rule
-   - security_group: security_group
+   - security_group: security_group_2
    - router: router
    - rbac_policy: rbac_policy
    - port: port
@@ -78,7 +78,7 @@ Response Parameters
    - subnetpool: subnetpool
    - quota: quota
    - security_group_rule: security_group_rule
-   - security_group: security_group
+   - security_group: security_group_2
    - router: router
    - rbac_policy: rbac_policy
    - port: port
@@ -111,7 +111,7 @@ Request
    - subnetpool: subnetpool
    - quota: quota
    - security_group_rule: security_group_rule
-   - security_group: security_group
+   - security_group: security_group_2
    - router: router
    - rbac_policy: rbac_policy
    - port: port
@@ -134,7 +134,7 @@ Response Parameters
    - subnetpool: subnetpool
    - quota: quota
    - security_group_rule: security_group_rule
-   - security_group: security_group
+   - security_group: security_group_2
    - router: router
    - rbac_policy: rbac_policy
    - port: port