Merge "Convert parent resource type to parent object type" into R3.1

Juniper · Jul 29, 2016 · 45ba3c2 · 45ba3c2
2 parents 25b0e18 + c0e8cff
commit 45ba3c2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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)