Merge "Refactor and objectify flavor fakes used in api tests"

diff --cc nova/tests/unit/api/openstack/compute/test_flavor_disabled.py
index 4951a36e6a2e400e0647cfa244e5b561c1eab964,98ef0e11cacdcbf5b31f0ad0f3afb1ba483a961b..10a0ac091fb888f6bf113f484f65f5dd4226982a
--- 1/nova/tests/unit/api/openstack/compute/test_flavor_disabled.py
--- 2/nova/tests/unit/api/openstack/compute/test_flavor_disabled.py
+++ b/nova/tests/unit/api/openstack/compute/test_flavor_disabled.py
@@@ -13,8 -13,8 +13,7 @@@
  #    under the License.
  
  from oslo_serialization import jsonutils
 -import webob
  
- from nova.compute import flavors
  from nova import test
  from nova.tests.unit.api.openstack import fakes
  

diff --cc nova/tests/unit/api/openstack/compute/test_flavor_rxtx.py
index 78ea8c37818b968b1b79e8221fb79c8b0e33d4e9,8d3f37aba757d4e2e6c71a3a84da0343f34fd58e..5e39d7d8cbff777fd919473ab9dca457bdb8b619
--- 1/nova/tests/unit/api/openstack/compute/test_flavor_rxtx.py
--- 2/nova/tests/unit/api/openstack/compute/test_flavor_rxtx.py
+++ b/nova/tests/unit/api/openstack/compute/test_flavor_rxtx.py
@@@ -13,8 -13,8 +13,7 @@@
  #    under the License.
  
  from oslo_serialization import jsonutils
 -import webob
  
- from nova.compute import flavors
  from nova import test
  from nova.tests.unit.api.openstack import fakes
  
@@@ -66,14 -26,11 +25,11 @@@ class FlavorRxtxTestV21(test.NoDBTestCa
      def setUp(self):
          super(FlavorRxtxTestV21, self).setUp()
          fakes.stub_out_nw_api(self)
-         self.stubs.Set(flavors, "get_all_flavors_sorted_list",
-                        fake_get_all_flavors_sorted_list)
-         self.stubs.Set(flavors,
-                        "get_flavor_by_flavor_id",
-                        fake_flavor_get_by_flavor_id)
+         fakes.stub_out_flavor_get_all(self)
+         fakes.stub_out_flavor_get_by_flavor_id(self)
  
      def _make_request(self, url):
 -        req = webob.Request.blank(url)
 +        req = fakes.HTTPRequest.blank(url)
          req.headers['Accept'] = self.content_type
          res = req.get_response(self._get_app())
          return res

diff --cc nova/tests/unit/api/openstack/compute/test_flavor_swap.py
index 9f88045299fc896a8132a7ec9c8bbe397fbe63a2,a9d22737fc3bf1ba77e2afafbd5740bfa155af23..16083b081aea6849b41343cd03b7b0a6fe1c94dd
--- 1/nova/tests/unit/api/openstack/compute/test_flavor_swap.py
--- 2/nova/tests/unit/api/openstack/compute/test_flavor_swap.py
+++ b/nova/tests/unit/api/openstack/compute/test_flavor_swap.py
@@@ -13,8 -13,8 +13,7 @@@
  #    under the License.
  
  from oslo_serialization import jsonutils
 -import webob
  
- from nova.compute import flavors
  from nova import test
  from nova.tests.unit.api.openstack import fakes
  
@@@ -68,14 -27,11 +26,11 @@@ class FlavorSwapTestV21(test.NoDBTestCa
      def setUp(self):
          super(FlavorSwapTestV21, self).setUp()
          fakes.stub_out_nw_api(self)
-         self.stubs.Set(flavors, "get_all_flavors_sorted_list",
-                        fake_get_all_flavors_sorted_list)
-         self.stubs.Set(flavors,
-                        "get_flavor_by_flavor_id",
-                        fake_flavor_get_by_flavor_id)
+         fakes.stub_out_flavor_get_all(self)
+         fakes.stub_out_flavor_get_by_flavor_id(self)
  
      def _make_request(self, url):
 -        req = webob.Request.blank(url)
 +        req = fakes.HTTPRequest.blank(url)
          req.headers['Accept'] = self.content_type
          res = req.get_response(fakes.wsgi_app_v21(init_only=('flavors',)))
          return res

diff --cc nova/tests/unit/api/openstack/compute/test_flavorextradata.py
index ba0f17f40e64af896bd9d3cadf3d3e141e2ce630,76a5c9d2b266289ad47aadccac471241337160b2..5bd3783a13906aa121f61bfb26c2fe57e91571f9
--- 1/nova/tests/unit/api/openstack/compute/test_flavorextradata.py
--- 2/nova/tests/unit/api/openstack/compute/test_flavorextradata.py
+++ b/nova/tests/unit/api/openstack/compute/test_flavorextradata.py
@@@ -13,11 -13,9 +13,8 @@@
  #    License for the specific language governing permissions and limitations
  #    under the License.
  
- import datetime
- 
  from oslo_serialization import jsonutils
 -import webob
  
- from nova.compute import flavors
  from nova import test
  from nova.tests.unit.api.openstack import fakes
  

diff --cc nova/tests/unit/api/openstack/fakes.py
Simple merge