1. Called once check moved from _list_collection to list_bulk_collect…

…ion_http_post, due to refractoring bug.

2. Removed the local API server teardown for class TestPermissions
3. Project's within class TestPermissions appended with self.id(), to create unique Project for each testcase.
Closes-Bug: 1555323

Change-Id: If04cb40f670da95992cf4a34468bb465249d7de5

src/config/api-server/tests/test_crud_basic.py

@@ -1175,14 +1175,14 @@ def test_list_bulk_collection(self):
         vmi_uuids = [o.uuid for o in vmi_objs]
 
         logger.info("Querying VNs by obj_uuids.")
-        flexmock(self._api_server).should_call('_list_collection').once()
+        flexmock(self._api_server).should_call('list_bulk_collection_http_post').once()
         ret_list = self._vnc_lib.resource_list('virtual-network',
                                                obj_uuids=vn_uuids)
         ret_uuids = [ret['uuid'] for ret in ret_list['virtual-networks']]
         self.assertThat(set(vn_uuids), Equals(set(ret_uuids)))
 
         logger.info("Querying RIs by parent_id.")
-        flexmock(self._api_server).should_call('_list_collection').once()
+        flexmock(self._api_server).should_call('list_bulk_collection_http_post').once()
         ret_list = self._vnc_lib.resource_list('routing-instance',
                                                parent_id=vn_uuids)
         ret_uuids = [ret['uuid']
@@ -1191,15 +1191,15 @@ def test_list_bulk_collection(self):
             Equals(set(ret_uuids) & set(ri_uuids)))
 
         logger.info("Querying VMIs by back_ref_id.")
-        flexmock(self._api_server).should_call('_list_collection').once()
+        flexmock(self._api_server).should_call('list_bulk_collection_http_post').once()
         ret_list = self._vnc_lib.resource_list('virtual-machine-interface',
                                                back_ref_id=vn_uuids)
         ret_uuids = [ret['uuid']
                      for ret in ret_list['virtual-machine-interfaces']]
         self.assertThat(set(vmi_uuids), Equals(set(ret_uuids)))
 
         logger.info("Querying VMIs by back_ref_id and extra fields.")
-        flexmock(self._api_server).should_call('_list_collection').once()
+        flexmock(self._api_server).should_call('list_bulk_collection_http_post').once()
         ret_list = self._vnc_lib.resource_list('virtual-machine-interface',
                                                back_ref_id=vn_uuids,
                                                fields=['virtual_network_refs'])
@@ -1211,14 +1211,14 @@ def test_list_bulk_collection(self):
             set(vn_uuids))
 
         logger.info("Querying RIs by parent_id and filter.")
-        flexmock(self._api_server).should_call('_list_collection').once()
+        flexmock(self._api_server).should_call('list_bulk_collection_http_post').once()
         ret_list = self._vnc_lib.resource_list('routing-instance',
             parent_id=vn_uuids,
             filters={'display_name':'%s-ri-5' %(self.id())})
         self.assertThat(len(ret_list['routing-instances']), Equals(1))
 
         logger.info("Querying VNs by obj_uuids for children+backref fields.")
-        flexmock(self._api_server).should_call('_list_collection').once()
+        flexmock(self._api_server).should_call('list_bulk_collection_http_post').once()
         ret_objs = self._vnc_lib.resource_list('virtual-network',
             detail=True, obj_uuids=vn_uuids, fields=['routing_instances',
             'virtual_machine_interface_back_refs'])

src/config/api-server/tests/test_perms2.py

@@ -347,9 +347,9 @@ def setUp(self):
                        auth_url='http://127.0.0.1:5000/v2.0')
 
         # prepare token before vnc api invokes keystone
-        alice = User(ip, port, kc, 'alice', 'alice123', 'alice-role', 'alice-proj')
-        bob =   User(ip, port, kc, 'bob', 'bob123', 'bob-role', 'bob-proj')
-        admin = User(ip, port, kc, 'admin', 'contrail123', 'admin', 'admin')
+        alice = User(ip, port, kc, 'alice', 'alice123', 'alice-role', 'alice-proj-%s' % self.id())
+        bob =   User(ip, port, kc, 'bob', 'bob123', 'bob-role', 'bob-proj-%s' % self.id())
+        admin = User(ip, port, kc, 'admin', 'contrail123', 'admin', 'admin-%s' % self.id())
 
         self.alice = alice
         self.bob   = bob
@@ -732,10 +732,6 @@ def test_check_obj_perms_api(self):
 
 
     def tearDown(self):
-        self._api_svr_greenlet.kill()
-        self._api_server._db_conn._msgbus.shutdown()
-        test_utils.FakeIfmapClient.reset()
-        test_utils.CassandraCFs.reset()
         super(TestPermissions, self).tearDown()
     # end tearDown