From 6bc51e4d2e33f1e66b2a15c7c824b125148cea9c Mon Sep 17 00:00:00 2001
From: jichenjc <jichenjc@cn.ibm.com>
Date: Wed, 23 Mar 2016 19:32:54 +0800
Subject: [PATCH] Fix os-virtual-interfaces and flavors api-ref

fix api-sample reference to flavors
make some changes to os-virtual-interfaces so don't talk
about microversion in contents(will add microversion later)
also, fix id param reference

Part of bp:api-ref-in-rst

Change-Id: I6eb8a14fce1c1048506cd5b990576ca5ecf44b6c
---
 api-ref/source/flavors.inc               | 8 ++++----
 api-ref/source/os-virtual-interfaces.inc | 4 +---
 api-ref/source/parameters.yaml           | 2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/api-ref/source/flavors.inc b/api-ref/source/flavors.inc
index 49b017f9f9..7e3054cfd6 100644
--- a/api-ref/source/flavors.inc
+++ b/api-ref/source/flavors.inc
@@ -66,7 +66,7 @@ Request
 
 **Example Create Flavor: JSON request**
 
-.. literalinclude:: ../../doc/api_samples/flavors/flavor-create-req.json
+.. literalinclude:: ../../doc/api_samples/flavor-manage/flavor-create-post-req.json
    :language: javascript
 
 Response
@@ -74,7 +74,7 @@ Response
 
 **Example Create Flavor: JSON request**
 
-.. literalinclude:: ../../doc/api_samples/flavors/flavor-create-resp.json
+.. literalinclude:: ../../doc/api_samples/flavor-manage/flavor-create-post-resp.json
    :language: javascript
 
 Show Flavor Details
@@ -102,7 +102,7 @@ Response
 
 **Example Show Flavor Details: JSON request**
 
-.. literalinclude:: ../../doc/api_samples/flavors/flavor-show-resp.json
+.. literalinclude:: ../../doc/api_samples/flavors/flavor-get-resp.json
    :language: javascript
 
 Delete Flavor
@@ -164,6 +164,6 @@ Response
 
 **Example List Flavors With Details: JSON request**
 
-.. literalinclude:: ../../doc/api_samples/flavors/flavors-list-detail-resp.json
+.. literalinclude:: ../../doc/api_samples/flavors/flavors-detail-resp.json
    :language: javascript
 
diff --git a/api-ref/source/os-virtual-interfaces.inc b/api-ref/source/os-virtual-interfaces.inc
index 30d3a559bd..4ddecd5997 100644
--- a/api-ref/source/os-virtual-interfaces.inc
+++ b/api-ref/source/os-virtual-interfaces.inc
@@ -19,8 +19,6 @@ The API v2 returns the network ID in the ``OS-EXT-VIF-NET:net_id`` response attr
 
 The API v2.1 base version does not return the network ID.
 
-The API v2.12 microversion returns the network ID in the ``net_id`` response attribute.
-
 Normal response codes: 200
 
 Error response codes: computeFault(400, 500), serviceUnavailable(503), badRequest(400),
@@ -40,7 +38,7 @@ Response
 .. rest_parameters:: parameters.yaml
 
   - virtual_interfaces: virtual_interfaces
-  - id: id
+  - id: virtual_interface_id
   - mac_address: mac_address
 
 **Example List Virtual Interfaces: JSON request**
diff --git a/api-ref/source/parameters.yaml b/api-ref/source/parameters.yaml
index 1da6089aa8..b4c46234e1 100644
--- a/api-ref/source/parameters.yaml
+++ b/api-ref/source/parameters.yaml
@@ -1089,7 +1089,7 @@ id_7:
   in: body
   required: true
   type: string
-id_8:
+virtual_interface_id:
   description: |
     The UUID of the virtual interface.
   in: body