From 97e2795a68927b801c2dd9c8d704fb47b4794fe4 Mon Sep 17 00:00:00 2001
From: Bo Wang <bo.wang@easystack.cn>
Date: Tue, 12 Jan 2016 11:08:45 +0800
Subject: [PATCH] Delete some deprecated codes

Delete deprecated codes since Instance:<flavor> meter has been removed.

Change-Id: Ia7db1f74f84b9eac4c4612e3aba10878242ff23b
Partial-Bug: #1208365
---
 openstack_dashboard/api/ceilometer.py         | 22 -------------------
 .../test/api_tests/ceilometer_tests.py        | 13 -----------
 openstack_dashboard/test/helpers.py           |  2 +-
 3 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/openstack_dashboard/api/ceilometer.py b/openstack_dashboard/api/ceilometer.py
index 163c24e862..d16cedbd52 100644
--- a/openstack_dashboard/api/ceilometer.py
+++ b/openstack_dashboard/api/ceilometer.py
@@ -22,18 +22,6 @@ from horizon.utils.memoized import memoized  # noqa
 
 from openstack_dashboard.api import base
 from openstack_dashboard.api import keystone
-from openstack_dashboard.api import nova
-
-
-def get_flavor_names(request):
-    # TODO(lsmola) The flavors can be set per project,
-    # so it should show only valid ones.
-    try:
-        flavors = nova.flavor_list(request, None)
-        return [f.name for f in flavors]
-    except Exception:
-        return ['m1.tiny', 'm1.small', 'm1.medium',
-                'm1.large', 'm1.xlarge']
 
 
 def is_iterable(var):
@@ -1033,16 +1021,6 @@ class Meters(object):
                                  "packets on a VM network interface"),
             }),
         ])
-        # Adding flavor based meters into meters_info dict
-        # TODO(lsmola) this kind of meter will be probably deprecated
-        # https://bugs.launchpad.net/ceilometer/+bug/1208365 . Delete it then.
-        for flavor in get_flavor_names(self._request):
-            name = 'instance:%s' % flavor
-            meters_info[name] = dict(meters_info["instance:<type>"])
-
-            meters_info[name]['description'] = (
-                _('Duration of instance type %s (openstack flavor)') %
-                flavor)
 
         # TODO(lsmola) allow to set specific in local_settings. For all meters
         # because users can have their own agents and meters.
diff --git a/openstack_dashboard/test/api_tests/ceilometer_tests.py b/openstack_dashboard/test/api_tests/ceilometer_tests.py
index 55caa83d06..dc54cc6071 100644
--- a/openstack_dashboard/test/api_tests/ceilometer_tests.py
+++ b/openstack_dashboard/test/api_tests/ceilometer_tests.py
@@ -76,14 +76,9 @@ class CeilometerApiTests(test.APITestCase):
         for s in ret_list:
             self.assertIsInstance(s, api.ceilometer.Statistic)
 
-    @test.create_stubs({api.nova: ('flavor_list',),
-                        })
     def test_meters_list_all(self):
         meters = self.meters.list()
 
-        request = self.mox.CreateMock(http.HttpRequest)
-        api.nova.flavor_list(request, None).AndReturn([])
-
         ceilometerclient = self.stub_ceilometerclient()
         ceilometerclient.meters = self.mox.CreateMockAnything()
         ceilometerclient.meters.list(None).AndReturn(meters)
@@ -104,8 +99,6 @@ class CeilometerApiTests(test.APITestCase):
             self.assertIn(ret.name, names)
             names.remove(ret.name)
 
-    @test.create_stubs({api.nova: ('flavor_list',),
-                        })
     def test_meters_list_all_only(self):
         meters = self.meters.list()
 
@@ -113,8 +106,6 @@ class CeilometerApiTests(test.APITestCase):
         ceilometerclient.meters = self.mox.CreateMockAnything()
         ceilometerclient.meters.list(None).AndReturn(meters)
 
-        request = self.mox.CreateMock(http.HttpRequest)
-        api.nova.flavor_list(request, None).AndReturn([])
         self.mox.ReplayAll()
 
         meters_object = api.ceilometer.Meters(self.request)
@@ -130,8 +121,6 @@ class CeilometerApiTests(test.APITestCase):
         self.assertEqual("disk.read.bytes", ret_list[0].name)
         self.assertEqual("instance", ret_list[1].name)
 
-    @test.create_stubs({api.nova: ('flavor_list',),
-                        })
     def test_meters_list_all_except(self):
         meters = self.meters.list()
 
@@ -139,8 +128,6 @@ class CeilometerApiTests(test.APITestCase):
         ceilometerclient.meters = self.mox.CreateMockAnything()
         ceilometerclient.meters.list(None).AndReturn(meters)
 
-        request = self.mox.CreateMock(http.HttpRequest)
-        api.nova.flavor_list(request, None).AndReturn([])
         self.mox.ReplayAll()
 
         meters_object = api.ceilometer.Meters(self.request)
diff --git a/openstack_dashboard/test/helpers.py b/openstack_dashboard/test/helpers.py
index ce4c0f3998..04178b34c0 100644
--- a/openstack_dashboard/test/helpers.py
+++ b/openstack_dashboard/test/helpers.py
@@ -70,7 +70,7 @@ def create_stubs(stubs_to_create=None):
 
         api.nova
 
-    The values are either a tuple of list of methods to mock in the module
+    The values are either a tuple or list of methods to mock in the module
     indicated by the key.
 
     For example::