Link resource types in self.master.data.rtypes

master/buildbot/data/connector.py

@@ -24,6 +24,10 @@ class Updates(object):
     # empty container object; see _scanModule, below
     pass
 
+class RTypes(object):
+    # empty container object; see _scanModule, below
+    pass
+
 
 class Root(base.Endpoint):
     pathPattern = ('',)
@@ -54,7 +58,7 @@ def _scanModule(self, mod, _noSetattr=False):
             obj = getattr(mod, sym)
             if inspect.isclass(obj) and issubclass(obj, base.ResourceType):
                 rtype = obj(self.master)
-                setattr(self, rtype.type, rtype)
+                setattr(self.rtypes, rtype.type, rtype)
 
                 # put its update methonds into our 'updates' attribute
                 for name in dir(rtype):
@@ -79,6 +83,7 @@ def _scanModule(self, mod, _noSetattr=False):
 
     def _setup(self):
         self.updates = Updates()
+        self.rtypes = RTypes()
         self.matcher[Root.pathPattern] = Root(self.master)
         for moduleName in self.submodules:
             module = reflect.namedModule(moduleName)

master/buildbot/test/unit/test_data_connector.py

@@ -142,7 +142,7 @@ def test_scanModule(self):
                 [ ('tests', base.Link(('test',))) ])
 
         # and that it added an attribute
-        self.assertIsInstance(self.data.test, TestResourceType)
+        self.assertIsInstance(self.data.rtypes.test, TestResourceType)
 
     def test_lookup(self):
         ep = self.patchFooPattern()
@@ -201,7 +201,6 @@ class TestEndpoint(base.Endpoint):
     pathPatterns = [ ('test', 'i:testid', 'p1'), ('test', 'i:testid', 'p2') ]
 
 class TestResourceType(base.ResourceType):
-    name = 'tests'
     type = 'test'
     endpoints = [ TestsEndpoint, TestEndpoint, TestsEndpointSubclass ]
     keyFields = ( 'testid', )

master/docs/developer/data.rst

@@ -107,9 +107,11 @@ Within the buildmaster process, the root of the data API is available at `self.m
         Depending on the path, it will return a single resource or a list of resources.
         If a single resource is not specified, it returns ``None``.
 
-    The connector also has an attribute named for each resource type.
-    These attributes allow resource types to access one another for purposes of coordination.
-    They are *not* intended for external access -- all external access to the data API should be via the methods above or update methods.
+    .. py:attribute:: rtypes
+
+        This object has an attribute named for each resource type, named after the singular form (e.g., `self.master.data.builder`).
+        These attributes allow resource types to access one another for purposes of coordination.
+        They are *not* intended for external access -- all external access to the data API should be via the methods above or update methods.
 
 
 Updates