From 1f645e85d7d249426b2aa7c3aa5c0bfcec2b6902 Mon Sep 17 00:00:00 2001
From: Brian Curtin <brian.curtin@rackspace.com>
Date: Tue, 8 Dec 2015 17:17:36 -0600
Subject: [PATCH] Remove the Metric proxy

This proxy class is not currently useful in any usable way so it just
pollutes the namespace of loaded proxy classes. It was added
to get the class started, but was not completed. Rather than offer a
proxy that only tells you what it can do but can't do anything, it's
removed. The resources that would populate a proxy class are left alone.

Change-Id: I30dbff0dbba26633d3b02ee5f0751b4224cef8f4
---
 doc/source/users/guides/metric.rst   |  8 --------
 doc/source/users/index.rst           |  2 --
 doc/source/users/proxies/metric.rst  | 16 ----------------
 openstack/profile.py                 |  5 +++--
 openstack/tests/unit/test_profile.py |  3 ---
 5 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 100644 doc/source/users/guides/metric.rst
 delete mode 100644 doc/source/users/proxies/metric.rst

diff --git a/doc/source/users/guides/metric.rst b/doc/source/users/guides/metric.rst
deleted file mode 100644
index e977d714..00000000
--- a/doc/source/users/guides/metric.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-Using OpenStack Metric
-======================
-
-Before working with the Metric service, you'll need to create a connection
-to your OpenStack cloud by following the :doc:`connect` user guide. This will
-provide you with the ``conn`` variable used in the examples below.
-
-.. TODO(thowe): Implement this guide
diff --git a/doc/source/users/index.rst b/doc/source/users/index.rst
index 7a25d7c8..fde06936 100644
--- a/doc/source/users/index.rst
+++ b/doc/source/users/index.rst
@@ -34,7 +34,6 @@ approach, this is where you'll want to begin.
    Identity <guides/identity>
    Image <guides/image>
    Key Management <guides/key_management>
-   Metric <guides/metric>
    Network <guides/network>
    Object Store <guides/object_store>
    Orchestration <guides/orchestration>
@@ -75,7 +74,6 @@ but listed below are the ones provided by this SDK by default.
    Identity <proxies/identity>
    Image <proxies/image>
    Key Management <proxies/key_management>
-   Metric <proxies/metric>
    Network <proxies/network>
    Object Store <proxies/object_store>
    Orchestration <proxies/orchestration>
diff --git a/doc/source/users/proxies/metric.rst b/doc/source/users/proxies/metric.rst
deleted file mode 100644
index e64904f1..00000000
--- a/doc/source/users/proxies/metric.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-Metric API
-==========
-
-For details on how to use metric, see :doc:`/users/guides/metric`
-
-.. automodule:: openstack.metric.v1._proxy
-
-The Metric Class
-----------------
-
-The metric high-level interface is available through the ``metric`` member of a
-:class:`~openstack.connection.Connection` object.  The ``metric`` member will
-only be added if the service is detected.
-
-.. autoclass:: openstack.metric.v1._proxy.Proxy
-   :members:
diff --git a/openstack/profile.py b/openstack/profile.py
index e6cbdd01..ac0f4317 100644
--- a/openstack/profile.py
+++ b/openstack/profile.py
@@ -64,7 +64,6 @@ from openstack.identity import identity_service
 from openstack.image import image_service
 from openstack.key_management import key_management_service
 from openstack.message import message_service
-from openstack.metric import metric_service
 from openstack import module_loader
 from openstack.network import network_service
 from openstack.object_store import object_store_service
@@ -95,7 +94,6 @@ class Profile(object):
         self._add_service(database_service.DatabaseService())
         self._add_service(identity_service.IdentityService())
         self._add_service(image_service.ImageService())
-        self._add_service(metric_service.MetricService())
         self._add_service(network_service.NetworkService())
         self._add_service(object_store_service.ObjectStoreService())
         self._add_service(orchestration_service.OrchestrationService())
@@ -104,6 +102,9 @@ class Profile(object):
         self._add_service(block_store_service.BlockStoreService())
         self._add_service(message_service.MessageService())
 
+        # NOTE: The Metric service is not added here as it currently
+        # only retrieves the /capabilities API.
+
         if plugins:
             for plugin in plugins:
                 self._load_plugin(plugin)
diff --git a/openstack/tests/unit/test_profile.py b/openstack/tests/unit/test_profile.py
index 9230ade5..8edb1d70 100644
--- a/openstack/tests/unit/test_profile.py
+++ b/openstack/tests/unit/test_profile.py
@@ -27,7 +27,6 @@ class TestProfile(base.TestCase):
             'key-manager',
             'messaging',
             'metering',
-            'metric',
             'network',
             'object-store',
             'orchestration',
@@ -49,8 +48,6 @@ class TestProfile(base.TestCase):
         self.assertEqual('v5', prof.get_filter('image').version)
         prof.set_version('metering', 'v6')
         self.assertEqual('v6', prof.get_filter('metering').version)
-        prof.set_version('metric', 'v9')
-        self.assertEqual('v9', prof.get_filter('metric').version)
         prof.set_version('network', 'v7')
         self.assertEqual('v7', prof.get_filter('network').version)
         prof.set_version('object-store', 'v8')