Skip to content

Commit

Permalink
Merge rules in api-server from domain and project rules
Browse files Browse the repository at this point in the history
1. Merge rules in API server because there might be overlap of
   object-field between domain and project rules
2. Good to have copy of test script for target. Will
merge it with copy of script for build server in the future.

Change-Id: I2c07428c8c0bcbe9054a1bcc34acd35c24a9a9e9
Partial-Bug:#1486412
  • Loading branch information
Deepinder Setia committed Nov 2, 2015
1 parent 2faf80e commit 052f204
Show file tree
Hide file tree
Showing 6 changed files with 768 additions and 42 deletions.
3 changes: 1 addition & 2 deletions src/config/api-server/tests/test_perms2.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 052f204

Please sign in to comment.