Updated create-analytics-bundle

zenoss · Oct 7, 2014 · 6a2d8ed · 6a2d8ed
1 parent b590f53
commit 6a2d8ed
Showing 1 changed file with 19 additions and 8 deletions.
diff --git a/create-analytics-bundle b/create-analytics-bundle
@@ -450,6 +450,7 @@ def update_schema(schema, obj):
         'perf_server_key',
         }
 
+    reportable_property_names = [x[0] for x in reportable.reportProperties()]
     relations = getattr(obj, '_relations', tuple())
     for relName, relation in relations:
         if isinstance(relation, ToOne):
@@ -461,25 +462,35 @@ def update_schema(schema, obj):
             if not remote_obj or remote_obj is obj:
                 continue
 
-            reference_property = createReferenceProperty(
-                remote_obj,
-                un_camel(relName))
-
-            if reference_property[0] in ignored_ref_keys:
-                continue
-
             remote_reportable = IReportable(remote_obj)
             remote_entity_class_name = remote_reportable.entity_class_name
             remote_table = 'dim_{}'.format(remote_entity_class_name)
 
+            # This relation may be exported in the reportable using several
+            # naming conventions.  Try all the known ones:
+            reference_property_name = None
+            for possible_name in (un_camel(relName) + '_key',
+                                  remote_entity_class_name + '_key',
+                                  un_camel(relName + '_' + remote_entity_class_name + '_key')):
+                if possible_name in reportable_property_names:
+                    reference_property_name = possible_name
+                    break
+
+            if reference_property_name is None:
+                print "Unable to find reference property for relationship %s on object class %s" % (relName, obj.__class__.__name__)
+                continue
+
+            if reference_property_name in ignored_ref_keys:
+                continue
+
             if dim_table.id != join.tableName:
                 join.add(
                     dim_table.id,
                     '{local_table}.{reference_property} == {remote_table}.{remote_key}'
                     .format(
                         remote_table=remote_table,
                         local_table=dim_table.id,
-                        reference_property=reference_property[0],
+                        reference_property=reference_property_name,
                         remote_key='{}_key'.format(remote_reportable.entity_class_name)))
 
     # Measures Set