ovs.db.data: Fix bugs in Atom.is_default() and Datum.is_default().

Reported-by: Reid Price <reid@nicira.com>

diff --git a/python/ovs/db/data.py b/python/ovs/db/data.py
index bfdc11cbcf75c51881f4f5e0f7d5b265e8ac154f..ae8af2faa36b3d176ffc6e40a744eb2d314d618b 100644 (file)
--- a/python/ovs/db/data.py
+++ b/python/ovs/db/data.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2010 Nicira Networks
+# Copyright (c) 2009, 2010, 2011 Nicira Networks
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -89,7 +89,7 @@ class Atom(object):
         return Atom(type)
 
     def is_default(self):
-        return self == default(self.type)
+        return self == self.default(self.type)
 
     @staticmethod
     def from_json(base, json, symtab=None):
@@ -259,9 +259,8 @@ class Datum(object):
             values = {type.key.default(): None}
         return Datum(type, values)
 
-    @staticmethod
     def is_default(self):
-        return self == default(self.type)
+        return self == Datum.default(self.type)
 
     def check_constraints(self):
         """Checks that each of the atoms in 'datum' conforms to the constraints