Merge pull request #8 from markmcclain/filterrule_fix

fix filterrule serialization to be consistent
This commit is contained in:
markmcclain 2013-03-05 17:10:07 -08:00
commit b7aa3b8016
1 changed files with 4 additions and 3 deletions

View File

@ -66,6 +66,7 @@ class FilterruleResource(_authzbase.ResourceDelegate):
def make_entry_dict(self, addressentry):
res = {
'id': addressentry['id'],
'name': addressentry['name'],
'tenant_id': addressentry['tenant_id'],
'name': addressentry['name'],
'cidr': addressentry['cidr']
@ -78,10 +79,10 @@ class FilterruleResource(_authzbase.ResourceDelegate):
res = {
'id': addressgroup['id'],
'tenant_id': addressgroup['tenant_id'],
'name': addressgroup['name'],
'cidrs': [self.make_entry_dict(e)
for e in addressgroup.entries]
'tenant_id': addressgroup['tenant_id'],
'entries': [self.make_entry_dict(e)
for e in addressgroup.entries]
}
return res