diff options
| author | Russell Bryant <rbryant@redhat.com> | 2012-02-16 14:39:10 -0500 |
|---|---|---|
| committer | Russell Bryant <rbryant@redhat.com> | 2012-02-16 18:00:42 -0500 |
| commit | 068f31c6cd3eff68f08ee597f7296e4f6e47388f (patch) | |
| tree | 06c9ca724839a781ed764dd88702c26f75120b38 | |
| parent | 34d77ac8b1919a287865a4bef376579b6bf09b48 (diff) | |
| download | nova-068f31c6cd3eff68f08ee597f7296e4f6e47388f.tar.gz nova-068f31c6cd3eff68f08ee597f7296e4f6e47388f.tar.xz nova-068f31c6cd3eff68f08ee597f7296e4f6e47388f.zip | |
Don't send a SQLAlchemy model over rpc.
Fix bug 933584.
I noticed this when Qpid blew up because it didn't know how to serialize
a SQLAlchemy model. Fix it by making it only consist of primitive types
before sending it.
Change-Id: I63eb4bbabdb75fa7b277428bbd1aa2c2e1383383
| -rw-r--r-- | nova/network/manager.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/network/manager.py b/nova/network/manager.py index 760aff0b9..fe6cfa07a 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -197,7 +197,8 @@ class RPCAllocateFixedIP(object): if host is None: host = rpc.call(context, FLAGS.network_topic, {'method': 'set_network_host', - 'args': {'network_ref': network}}) + 'args': {'network_ref': + utils.to_primitive(network)}}) if host != self.host: # need to call allocate_fixed_ip to correct network host topic = self.db.queue_get_for(context, |