From 5a0fddf3c1d1631ca50187e5d9a48d4034fd3eed Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.de>
Date: Fri, 29 Nov 2013 10:22:03 +0100
Subject: [PATCH] Rename Metering API to Telemetry API

Rename all occurences and adjust file names as well

Change-Id: I6e5f3ee393390aa9075dbd1ec6ae1c20e90fd7ee
---
 .../src/docbkx/api-quick-start-onepager.xml            |  2 +-
 api-ref/pom.xml                                        |  2 +-
 api-ref/src/docbkx/api-ref-compute.xml                 |  0
 .../{api-ref-metering.xml => api-ref-telemetry.xml}    | 10 +++++-----
 api-ref/src/docbkx/api-ref.xml                         |  4 ++--
 .../src/v2/os-telemetry-api-2.0.wadl}                  |  0
 6 files changed, 9 insertions(+), 9 deletions(-)
 mode change 100755 => 100644 api-ref/src/docbkx/api-ref-compute.xml
 rename api-ref/src/docbkx/{api-ref-metering.xml => api-ref-telemetry.xml} (83%)
 rename api-ref/src/wadls/{metering-api/src/v2/os-metering-api-2.0.wadl => telemetry-api/src/v2/os-telemetry-api-2.0.wadl} (100%)

diff --git a/api-quick-start/src/docbkx/api-quick-start-onepager.xml b/api-quick-start/src/docbkx/api-quick-start-onepager.xml
index 10434d366..dcbdb4970 100644
--- a/api-quick-start/src/docbkx/api-quick-start-onepager.xml
+++ b/api-quick-start/src/docbkx/api-quick-start-onepager.xml
@@ -11,7 +11,7 @@
         OpenStack services work together to meet your cloud needs:
         Identity Service, Compute, Image Service, Block Storage
         Service, Networking, Object Storage, Orchestration, and
-        Metering. With the <link xlink:href="http://www.trystack.org/"
+        Telemetry. With the <link xlink:href="http://www.trystack.org/"
             >TryStack</link> OpenStack installation, these services
         work together in the background of the installation.</para>
     <para>After you authenticate through the Identity Service, you can
diff --git a/api-ref/pom.xml b/api-ref/pom.xml
index 1cbaf43b9..fe585e661 100644
--- a/api-ref/pom.xml
+++ b/api-ref/pom.xml
@@ -46,7 +46,7 @@
             api-ref-compute.xml, api-ref-image.xml,
             api-ref-networking.xml, api-ref-objectstorage.xml,
             api-ref-blockstorage.xml, api-ref-orchestration.xml,
-            api-ref-metering.xml </includes>
+            api-ref-telemetry.xml </includes>
           <profileSecurity>reviewer</profileSecurity>
           <branding>openstack</branding>
           <trimWadlUriCount>1</trimWadlUriCount>
diff --git a/api-ref/src/docbkx/api-ref-compute.xml b/api-ref/src/docbkx/api-ref-compute.xml
old mode 100755
new mode 100644
diff --git a/api-ref/src/docbkx/api-ref-metering.xml b/api-ref/src/docbkx/api-ref-telemetry.xml
similarity index 83%
rename from api-ref/src/docbkx/api-ref-metering.xml
rename to api-ref/src/docbkx/api-ref-telemetry.xml
index 9d6b0552b..41b02b3e5 100644
--- a/api-ref/src/docbkx/api-ref-metering.xml
+++ b/api-ref/src/docbkx/api-ref-telemetry.xml
@@ -20,7 +20,7 @@
   xmlns:wadl="http://wadl.dev.java.net/2009/02"
   version="5.0-extension RackBook-2.0" xml:id="api.openstack.org">
   <info>
-    <title>OpenStack Metering API</title>
+    <title>OpenStack Telemetry API</title>
     <copyright>
       <year>2013-2013</year>
     </copyright>
@@ -28,11 +28,11 @@
       <para/>
     </legalnotice>
   </info>
-  <chapter xml:id="metering-api">
-    <title>Metering API v2.0</title>
-    <para>Manages all metering operations.</para>
+  <chapter xml:id="telemetry-api">
+    <title>Telemetry API v2.0</title>
+    <para>Manages all telemetry operations.</para>
     <wadl:resources
-      href="../wadls/metering-api/src/v2/os-metering-api-2.0.wadl"
+      href="../wadls/telemetry-api/src/v2/os-telemetry-api-2.0.wadl"
       xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
   </chapter>
 </book>
diff --git a/api-ref/src/docbkx/api-ref.xml b/api-ref/src/docbkx/api-ref.xml
index 811d261ed..47bc6f2b1 100644
--- a/api-ref/src/docbkx/api-ref.xml
+++ b/api-ref/src/docbkx/api-ref.xml
@@ -66,8 +66,8 @@
             >Orchestration API</link></para>
       </listitem>
       <listitem>
-        <para><link xlink:href="api-ref-metering.html"
-            >Metering API</link></para>
+        <para><link xlink:href="api-ref-telemetry.html"
+            >Telemetry API</link></para>
       </listitem>
     </itemizedlist>
     <para>You must install the packages for each API separately. After
diff --git a/api-ref/src/wadls/metering-api/src/v2/os-metering-api-2.0.wadl b/api-ref/src/wadls/telemetry-api/src/v2/os-telemetry-api-2.0.wadl
similarity index 100%
rename from api-ref/src/wadls/metering-api/src/v2/os-metering-api-2.0.wadl
rename to api-ref/src/wadls/telemetry-api/src/v2/os-telemetry-api-2.0.wadl