openstack
/
nova
Code Issues Proposed changes

Remove unnecessary 'to_primitive' call 

This was raising an 'oslo.serialization' warning:

  UserWarning: Cannot convert Aggregate(...) to primitive, will raise
  ValueError instead of warning in version 3.0

The called functions expect an Aggregate object instance so there's no
reason for us to be doing this. Remove it and resolve the issue.

Change-Id: I8fd598f02e5c50cb072284e1ce8be624bea5e18d
This commit is contained in:
Stephen Finucane 2018-05-15 09:56:05 +01:00
parent ee823d8df8
commit 13621a6d36
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nova/tests/unit/compute/test_compute.py
View File

@ -12226,7 +12226,7 @@ class ComputeAggrTestCase(BaseTestCase):
fake_driver_add_to_aggregate)
self.compute.add_aggregate_host(self.context, host="host",
aggregate=jsonutils.to_primitive(self.aggr), slave_info=None)
aggregate=self.aggr, slave_info=None)
self.assertTrue(fake_driver_add_to_aggregate.called)
def test_remove_aggregate_host(self):
@ -12239,8 +12239,7 @@ class ComputeAggrTestCase(BaseTestCase):
fake_driver_remove_from_aggregate)
self.compute.remove_aggregate_host(self.context,
aggregate=jsonutils.to_primitive(self.aggr), host="host",
slave_info=None)
aggregate=self.aggr, host="host", slave_info=None)
self.assertTrue(fake_driver_remove_from_aggregate.called)
def test_add_aggregate_host_passes_slave_info_to_driver(self):
@ -12254,8 +12253,7 @@ class ComputeAggrTestCase(BaseTestCase):
driver_add_to_aggregate)
self.compute.add_aggregate_host(self.context, host="the_host",
slave_info="SLAVE_INFO",
aggregate=jsonutils.to_primitive(self.aggr))
slave_info="SLAVE_INFO", aggregate=self.aggr)
def test_remove_from_aggregate_passes_slave_info_to_driver(self):
def driver_remove_from_aggregate(cls, context, aggregate, host,
@ -12269,8 +12267,7 @@ class ComputeAggrTestCase(BaseTestCase):
driver_remove_from_aggregate)
self.compute.remove_aggregate_host(self.context,
aggregate=jsonutils.to_primitive(self.aggr), host="the_host",
slave_info="SLAVE_INFO")
aggregate=self.aggr, host="the_host", slave_info="SLAVE_INFO")
class DisabledInstanceTypesTestCase(BaseTestCase):