Merge "Merge rules in api-server from domain and project rules"

Juniper · Nov 3, 2015 · 77f34b1 · 77f34b1
2 parents 113dc9a + 052f204
commit 77f34b1
Show file tree

Hide file tree

Showing 6 changed files with 768 additions and 42 deletions.
diff --git a/src/config/api-server/tests/test_perms2.py b/src/config/api-server/tests/test_perms2.py
@@ -633,8 +633,7 @@ def test_api_access(self):
         for item in y['virtual-networks']:
             logger.info( '    %s: %s' % (item['uuid'], item['fq_name']))
         # need changes in auto code generation for lists
-        # expected = set(['alice-vn'])
-        expected = set([])
+        expected = set(['alice-vn'])
         received = set([item['fq_name'][-1] for item in y['virtual-networks']])
 
         self.assertEquals(expected, received)