From 5189109d60e8b16608b981ff550ff51af5ac9fc4 Mon Sep 17 00:00:00 2001
From: Diane Fleming <diane.fleming@rackspace.com>
Date: Fri, 22 Feb 2013 13:05:02 -0600
Subject: [PATCH] Corrected virtual_interfaces to os-virtual-interfaces

bug: 1114311

Change-Id: I527358b58b0d37e5055730cc233e3c3cc50f956f
author: Diane Fleming
---
 api-ref/src/docbkx/api-ref.xml                |  8 +++----
 .../os-virtual-interfaces/vifs-list-resp.xml  |  3 ++-
 .../src/ext/os-virtual-interfaces.wadl        | 23 +++++++++++++++----
 3 files changed, 24 insertions(+), 10 deletions(-)
 mode change 100755 => 100644 api-ref/src/docbkx/api-ref.xml

diff --git a/api-ref/src/docbkx/api-ref.xml b/api-ref/src/docbkx/api-ref.xml
old mode 100755
new mode 100644
index aba2ba81a..ef5a736ac
--- a/api-ref/src/docbkx/api-ref.xml
+++ b/api-ref/src/docbkx/api-ref.xml
@@ -136,9 +136,8 @@
     </section>
     <section xml:id="ext-os-extended-status">
       <title>Extended Instance Status</title>
-      <para>Shows extended attributes, vm_state, task_state, and
-        power_state, for a specific server instance or in the detailed
-        response for all servers. </para>
+      <para>Adds vm_state, task_state, and power_state to detailed
+        server responses.</para>
       <wadl:resources
         href="../wadls/compute-api/src/ext/os-extended-status.wadl"
         xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
@@ -303,7 +302,8 @@
     </section>
     <section xml:id="ext-os-virtual-interfaces">
       <title>Virtual Interfaces</title>
-      <para>Lists the virtual interfaces for running instances.</para>
+      <para>Lists the virtual interfaces for a specified server
+        instance.</para>
       <wadl:resources
         href="../wadls/compute-api/src/ext/os-virtual-interfaces.wadl"
         xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
diff --git a/api-ref/src/wadls/compute-api/src/api_samples/os-virtual-interfaces/vifs-list-resp.xml b/api-ref/src/wadls/compute-api/src/api_samples/os-virtual-interfaces/vifs-list-resp.xml
index 73aafe09b..f9c0602a9 100644
--- a/api-ref/src/wadls/compute-api/src/api_samples/os-virtual-interfaces/vifs-list-resp.xml
+++ b/api-ref/src/wadls/compute-api/src/api_samples/os-virtual-interfaces/vifs-list-resp.xml
@@ -1,4 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <virtual_interfaces xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <virtual_interface id="94edf7aa-565a-469a-8f45-656b4acf8229" mac_address="fa:16:3e:7d:31:9a"/>
+  <virtual_interface id="94edf7aa-565a-469a-8f45-656b4acf8229" 
+                     mac_address="fa:16:3e:7d:31:9a"/>
 </virtual_interfaces>
\ No newline at end of file
diff --git a/api-ref/src/wadls/compute-api/src/ext/os-virtual-interfaces.wadl b/api-ref/src/wadls/compute-api/src/ext/os-virtual-interfaces.wadl
index 0c04e73d3..c2ee98ff3 100644
--- a/api-ref/src/wadls/compute-api/src/ext/os-virtual-interfaces.wadl
+++ b/api-ref/src/wadls/compute-api/src/ext/os-virtual-interfaces.wadl
@@ -3,8 +3,16 @@
 <!-- (C) 2012 OpenStack LLC., All Rights Reserved -->
 
 <application xmlns="http://wadl.dev.java.net/2009/02"
-             xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"
-             xmlns:wadl="http://wadl.dev.java.net/2009/02">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:db="http://docbook.org/ns/docbook"
+    xmlns:csapi="http://docs.openstack.org/compute/api/v2"
+    xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"
+    xmlns:common="http://docs.openstack.org/common/api/v1.0"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xmlns:atom="http://www.w3.org/2005/Atom"
+    xsi:schemaLocation="http://docs.openstack.org/compute/api/v2/xsd/api.xsd
+    http://docs.openstack.org/common/api/v1.0/xsd/api-common.xsd">
 
     <resources base="https://servers.api.openstack.com">
         <resource id="version" type="#VersionDetails" path="v2/">
@@ -23,7 +31,7 @@
                                 </p>
                             </doc>
                         </param>
-                        <resource path="virtual_interfaces">
+                        <resource path="os-virtual-interfaces">
                             <method href="#getVirtualInterfaces"/>
                         </resource>
                     </resource>
@@ -34,12 +42,17 @@
 
     <method name="POST" id="getVirtualInterfaces">
         <wadl:doc xmlns="http://www.w3.org/1999/xhtml" xml:lang="EN">
-            <p xmlns="http://www.w3.org/1999/xhtml">View the virtual interfaces used in an instance.</p>
+            <p xmlns="http://www.w3.org/1999/xhtml">Lists the virtual interfaces for a specified instance.</p>
         </wadl:doc>
         <response status="202">
             <representation mediaType="application/json">
                 <doc xml:lang="EN">
-                    <xsdxt:code href="samples/virtual_interfaces_response.json" />
+                    <xsdxt:code href="../api_samples/os-virtual-interfaces/vifs-list-resp.json" />
+                </doc>
+            </representation>
+            <representation mediaType="application/xml">
+                <doc xml:lang="EN">
+                    <xsdxt:code href="../api_samples/os-virtual-interfaces/vifs-list-resp.xml" />
                 </doc>
             </representation>
         </response>