rename master_name -> name

master/buildbot/data/masters.py

@@ -23,7 +23,7 @@
 
 def _db2data(master):
     return dict(masterid=master['id'],
-                master_name=master['master_name'],
+                name=master['name'],
                 active=master['active'],
                 last_active=datetime2epoch(master['last_active']),
                 link=base.Link(('master', str(master['id']))))
@@ -65,12 +65,12 @@ class MasterResourceType(base.ResourceType):
 
     @base.updateMethod
     @defer.inlineCallbacks
-    def masterActive(self, master_name, masterid, _reactor=reactor):
+    def masterActive(self, name, masterid, _reactor=reactor):
         activated = yield self.master.db.masters.setMasterState(
                 masterid=masterid, active=True, _reactor=_reactor)
         if activated:
             self.produceEvent(
-                dict(masterid=masterid, master_name=master_name, active=True),
+                dict(masterid=masterid, name=name, active=True),
                 'started')
 
         # check for "expired" masters, while we're here.  We're called every
@@ -87,16 +87,16 @@ def masterActive(self, master_name, masterid, _reactor=reactor):
             yield self.master.db.masters.setMasterState(
                     masterid=m['id'], active=False, _reactor=_reactor)
             self.produceEvent(
-                dict(masterid=m['id'], master_name=m['master_name'],
+                dict(masterid=m['id'], name=m['name'],
                      active=False),
                 'stopped')
 
     @base.updateMethod
     @defer.inlineCallbacks
-    def masterStopped(self, master_name, masterid):
+    def masterStopped(self, name, masterid):
         deactivated = yield self.master.db.masters.setMasterState(
                 masterid=masterid, active=False)
         if deactivated:
             self.produceEvent(
-                dict(masterid=masterid, master_name=master_name, active=False),
+                dict(masterid=masterid, name=name, active=False),
                 'stopped')

master/buildbot/db/masters.py

@@ -24,13 +24,13 @@ class MasterDict(dict):
 
 class MastersConnectorComponent(base.DBConnectorComponent):
 
-    def findMasterId(self, master_name, _race_hook=None, _reactor=reactor):
+    def findMasterId(self, name, _race_hook=None, _reactor=reactor):
         def thd(conn, no_recurse=False):
             tbl = self.db.model.masters
 
             # try to find the master
             q = sa.select([ tbl.c.id ],
-                    whereclause=(tbl.c.master_name == master_name))
+                    whereclause=(tbl.c.name == name))
             rows = conn.execute(q).fetchall()
 
             # found it!
@@ -41,8 +41,8 @@ def thd(conn, no_recurse=False):
 
             try:
                 r = conn.execute(tbl.insert(), dict(
-                    master_name=master_name,
-                    master_name_hash=hashlib.sha1(master_name).hexdigest(),
+                    name=name,
+                    name_hash=hashlib.sha1(name).hexdigest(),
                     active=0, # initially inactive
                     last_active=_reactor.seconds()
                     ))
@@ -102,6 +102,6 @@ def thd(conn):
         return self.db.pool.do(thd)
 
     def _masterdictFromRow(self, row):
-        return MasterDict(id=row.id, master_name=row.master_name,
+        return MasterDict(id=row.id, name=row.name,
                     active=bool(row.active),
                     last_active=epoch2datetime(row.last_active))

master/buildbot/db/migrate/versions/023_add_master_table.py

@@ -48,8 +48,8 @@ def upgrade(migrate_engine):
 
     masters = sa.Table("masters", metadata,
         sa.Column('id', sa.Integer, primary_key=True),
-        sa.Column('master_name', sa.String(128), nullable=False),
-        sa.Column('master_name_hash', sa.String(40), nullable=False),
+        sa.Column('name', sa.String(128), nullable=False),
+        sa.Column('name_hash', sa.String(40), nullable=False),
         sa.Column('active', sa.Integer, nullable=False),
         sa.Column('last_active', sa.Integer, nullable=False),
     )
@@ -88,8 +88,8 @@ def upgrade(migrate_engine):
         whereclause=(objects.c.class_name == u'buildbot.master.BuildMaster')))
     for row in r.fetchall():
         r = migrate_engine.execute(masters.insert(),
-                master_name=row.name,
-                master_name_hash=hashlib.sha1(row.name).hexdigest(),
+                name=row.name,
+                name_hash=hashlib.sha1(row.name).hexdigest(),
                 active=0,
                 last_active=0)
         masterid = r.inserted_primary_key[0]
@@ -114,7 +114,7 @@ def upgrade(migrate_engine):
     buildrequest_claims_old.drop()
 
     # add the indices
-    sa.Index('master_name_hashes', masters.c.master_name_hash,
+    sa.Index('master_name_hashes', masters.c.name_hash,
             unique=True).create()
     sa.Index('buildrequest_claims_brids', buildrequest_claims.c.brid,
             unique=True).create()

master/buildbot/db/model.py

@@ -358,9 +358,9 @@ class Model(base.DBConnectorComponent):
         sa.Column('id', sa.Integer, primary_key=True),
 
         # master's name (generally in the form hostname:basedir)
-        sa.Column('master_name', sa.Text, nullable=False),
-        # sha1 of master_name; used for a unique index
-        sa.Column('master_name_hash', sa.String(40), nullable=False),
+        sa.Column('name', sa.Text, nullable=False),
+        # sha1 of name; used for a unique index
+        sa.Column('name_hash', sa.String(40), nullable=False),
 
         # true if this master is running
         sa.Column('active', sa.Integer, nullable=False),
@@ -408,7 +408,7 @@ class Model(base.DBConnectorComponent):
             unique=True)
     sa.Index('name_per_object', object_state.c.objectid, object_state.c.name,
             unique=True)
-    sa.Index('master_name_hashes', masters.c.master_name_hash, unique=True)
+    sa.Index('master_name_hashes', masters.c.name_hash, unique=True)
     sa.Index('buildrequest_claims_brids', buildrequest_claims.c.brid,
             unique=True)
 

master/buildbot/master.py

@@ -100,9 +100,9 @@ def __init__(self, basedir, configFileName="master.cfg", umask=None):
             self.hostname = socket.getfqdn()
 
         # public attributes
-        self.master_name = ("%s:%s" % (self.hostname,
+        self.name = ("%s:%s" % (self.hostname,
                 os.path.abspath(self.basedir or '.')))
-        self.master_name = self.master_name.decode('ascii', 'replace')
+        self.name = self.name.decode('ascii', 'replace')
         self.masterid = None
 
     def create_child_services(self):
@@ -150,7 +150,7 @@ def create_child_services(self):
 
         def heartbeat():
             if self.masterid is not None:
-                self.data.updates.masterActive(master_name=self.master_name,
+                self.data.updates.masterActive(name=self.name,
                                         masterid=self.masterid)
         self.masterHeartbeatService = internet.TimerService(60, heartbeat)
 
@@ -213,7 +213,7 @@ def sighup(*args):
 
             # get the masterid so other services can use it in startup/reconfig
             self.masterid = yield self.db.masters.findMasterId(
-                                    master_name=self.master_name)
+                                    name=self.name)
 
             # call the parent method
             yield defer.maybeDeferred(lambda :
@@ -225,7 +225,7 @@ def sighup(*args):
 
             # mark the master as active now that mq is running
             yield self.data.updates.masterActive(
-                                    master_name=self.master_name,
+                                    name=self.name,
                                     masterid=self.masterid)
         except:
             f = failure.Failure()
@@ -239,7 +239,7 @@ def sighup(*args):
     def stopService(self):
         if self.masterid is not None:
             yield self.data.updates.masterStopped(
-                    master_name=self.master_name, masterid=self.masterid)
+                    name=self.name, masterid=self.masterid)
 
         log.msg("BuildMsater is stopped")
         self._master_initialized = False
@@ -495,7 +495,7 @@ def getObjectId(self):
         # failing that, get it from the DB; multiple calls to this function
         # at the same time will not hurt
 
-        d = self.db.state.getObjectId(self.master_name,
+        d = self.db.state.getObjectId(self.name,
                 "buildbot.master.BuildMaster")
         def keep(id):
             self._object_id = id

master/buildbot/test/fake/fakedata.py

@@ -58,16 +58,16 @@ def addChange(self, files=None, comments=None, author=None,
         self.changesAdded[-1].pop('self')
         return defer.succeed(len(self.changesAdded))
 
-    def masterActive(self, master_name, masterid):
-        self.testcase.assertIsInstance(master_name, unicode)
+    def masterActive(self, name, masterid):
+        self.testcase.assertIsInstance(name, unicode)
         self.testcase.assertIsInstance(masterid, int)
         if masterid:
             self.testcase.assertEqual(masterid, 1)
         self.masterActive = True
         return defer.succeed(None)
 
-    def masterStopped(self, master_name, masterid):
-        self.testcase.assertIsInstance(master_name, unicode)
+    def masterStopped(self, name, masterid):
+        self.testcase.assertIsInstance(name, unicode)
         self.testcase.assertEqual(masterid, 1)
         self.masterActive = False
         return defer.succeed(None)

master/buildbot/test/fake/fakedb.py

@@ -335,14 +335,14 @@ class Master(Row):
 
     defaults = dict(
         id = None,
-        master_name = 'some:master',
-        master_name_hash = None,
+        name = 'some:master',
+        name_hash = None,
         active = 1,
         last_active = 9998999,
     )
 
     id_column = 'id'
-    hash_pairs = [ ( 'master_name', 'master_name_hash' ) ]
+    hash_pairs = [ ( 'name', 'name_hash' ) ]
 
 # Fake DB Components
 
@@ -1218,18 +1218,18 @@ def insertTestData(self, rows):
             if isinstance(row, Master):
                 self.masters[row.id] = dict(
                         id=row.id,
-                        master_name=row.master_name,
+                        name=row.name,
                         active=bool(row.active),
                         last_active=epoch2datetime(row.last_active))
 
-    def findMasterId(self, master_name, _reactor=reactor):
+    def findMasterId(self, name, _reactor=reactor):
         for m in self.masters.itervalues():
-            if m['master_name'] == master_name:
+            if m['name'] == name:
                 return defer.succeed(m['id'])
         id = len(self.masters) + 1
         self.masters[id] = dict(
             id=id,
-            master_name=master_name,
+            name=name,
             active=False,
             last_active=epoch2datetime(_reactor.seconds()))
         return defer.succeed(id)

master/buildbot/test/fake/fakemaster.py

@@ -92,7 +92,7 @@ def __init__(self, master_id=fakedb.FakeBuildRequestsComponent.MASTER_ID):
         self.botmaster.parent = self
         self.status = FakeStatus()
         self.status.master = self
-        self.master_name = 'fake:/master'
+        self.name = 'fake:/master'
 
     def getObjectId(self):
         return defer.succeed(self._master_id)

master/buildbot/test/integration/test_upgrade.py

@@ -368,7 +368,7 @@ def verify_thd(self, conn):
                     br_claims.c.masterid == masters.c.id)]))
         # the int() is required here because sqlalchemy stores floats in an
         # INTEGER column(!)
-        buildreqs = [ (brc.brid, int(brc.claimed_at), brc.master_name)
+        buildreqs = [ (brc.brid, int(brc.claimed_at), brc.name)
                       for brc in r.fetchall() ]
         objname = 'euclid:/home/dustin/code/buildbot/t/buildbot/sand27/master'
         self.assertEqual(buildreqs, [
@@ -435,7 +435,7 @@ def verify_thd(self, conn):
                     br_claims.c.masterid == masters.c.id)]))
         # the int() is required here because sqlalchemy stores floats in an
         # INTEGER column(!)
-        buildreqs = [ (brc.brid, int(brc.claimed_at), brc.master_name)
+        buildreqs = [ (brc.brid, int(brc.claimed_at), brc.name)
                       for brc in r.fetchall() ]
         objname = 'euclid:/home/dustin/code/buildbot/t/buildbot/sand27/master'
         self.assertEqual(buildreqs, [
@@ -488,7 +488,7 @@ def verify_thd(self, conn):
                     br_claims.c.masterid == masters.c.id)]))
         # the int() is required here because sqlalchemy stores floats in an
         # INTEGER column(!)
-        buildreqs = [ (brc.brid, int(brc.claimed_at), brc.master_name)
+        buildreqs = [ (brc.brid, int(brc.claimed_at), brc.name)
                       for brc in r.fetchall() ]
         objname = 'euclid:/home/dustin/code/buildbot/t/buildbot/sand27/master'
         self.assertEqual(buildreqs, [
@@ -523,7 +523,7 @@ def verify_thd(self, conn):
         masters = model.masters
         r = conn.execute(sa.select([ br_claims.outerjoin(masters,
                     br_claims.c.masterid == masters.c.id)]))
-        buildreqs = [ (brc.brid, int(brc.claimed_at), brc.master_name)
+        buildreqs = [ (brc.brid, int(brc.claimed_at), brc.name)
                       for brc in r.fetchall() ]
         self.assertEqual(buildreqs, [
             (1, 1338226540, u'euclid.r.igoro.us:/A/bbrun'),
@@ -570,7 +570,7 @@ def verify_thd(self, conn):
         masters = model.masters
         r = conn.execute(sa.select([ br_claims.outerjoin(masters,
                     br_claims.c.masterid == masters.c.id)]))
-        buildreqs = [ (brc.brid, int(brc.claimed_at), brc.master_name)
+        buildreqs = [ (brc.brid, int(brc.claimed_at), brc.name)
                       for brc in r.fetchall() ]
         self.assertEqual(buildreqs, [
             (1, 1338229046, u'euclid.r.igoro.us:/A/bbrun'),

master/buildbot/test/unit/test_data_connector.py

@@ -51,12 +51,12 @@ def addChange(self, files=None, comments=None, author=None,
 
     def test_signature_updates_masterActive(self):
         @self.assertArgSpecMatches(self.data.updates.masterActive)
-        def masterActive(self, master_name, masterid):
+        def masterActive(self, name, masterid):
             pass
 
     def test_signature_updates_masterStopped(self):
         @self.assertArgSpecMatches(self.data.updates.masterStopped)
-        def masterStopped(self, master_name, masterid):
+        def masterStopped(self, name, masterid):
             pass