From c0e8cffca8c91e7ce3488c97a3d8951c2e984932 Mon Sep 17 00:00:00 2001 From: Sachin Bansal Date: Fri, 22 Jul 2016 12:18:34 -0700 Subject: [PATCH] Convert parent resource type to parent object type fq_name_to_id now only accepts object type. Before calling it, we should convert resource type to object type Change-Id: Idb963dc7ac91d849b274c2c85edb1407ab4f5c38 Closes-Bug: 1605528 (cherry picked from commit 71e1a799deba84dd6967313320e2030d25fabc67) --- src/config/api-server/vnc_cfg_api_server.py | 4 +++- src/config/vnc_openstack/vnc_openstack/tests/test_kvp.py | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/config/api-server/vnc_cfg_api_server.py b/src/config/api-server/vnc_cfg_api_server.py index cef80071777..1e668ed5322 100644 --- a/src/config/api-server/vnc_cfg_api_server.py +++ b/src/config/api-server/vnc_cfg_api_server.py @@ -970,7 +970,9 @@ def http_resource_list(self, obj_type): if (('parent_fq_name_str' in get_request().query) and ('parent_type' in get_request().query)): parent_fq_name = get_request().query.parent_fq_name_str.split(':') - parent_type = get_request().query.parent_type + parent_res_type = get_request().query.parent_type + parent_class = self.get_resource_class(parent_res_type) + parent_type = parent_class.object_type parent_uuids = [self._db_conn.fq_name_to_uuid(parent_type, parent_fq_name)] elif 'parent_id' in get_request().query: parent_ids = get_request().query.parent_id.split(',') diff --git a/src/config/vnc_openstack/vnc_openstack/tests/test_kvp.py b/src/config/vnc_openstack/vnc_openstack/tests/test_kvp.py index 87fb2b59861..736d8b217b6 100644 --- a/src/config/vnc_openstack/vnc_openstack/tests/test_kvp.py +++ b/src/config/vnc_openstack/vnc_openstack/tests/test_kvp.py @@ -253,7 +253,6 @@ def test_post_project_create_default_sg(self): proj_name = self.id() test_case.get_keystone_client().tenants.add_tenant(proj_id, proj_name) proj_obj = self._vnc_lib.project_read(id=proj_id) - self._vnc_lib.project_create(proj_obj) sg_obj = self._vnc_lib.security_group_read( fq_name=proj_obj.fq_name+['default']) self._vnc_lib.security_group_delete(id=sg_obj.uuid)