From: Dyre Tjeldvoll Date: September 26 2012 9:39am Subject: bzr push into mysql-5.5-cluster-7.2 branch (Dyre.Tjeldvoll:4079 to 4080) List-Archive: http://lists.mysql.com/commits/144871 Message-Id: <20120926093955.18902.13250.4080@khepri17.no.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 4080 Dyre Tjeldvoll 2012-09-26 Removing sensitive info modified: storage/ndb/mcc/clumodel.py storage/ndb/mcc/remote_clusterhost.py storage/ndb/mcc/tst/tst_main.py 4079 Sivert Sorumgard 2012-09-26 Remove default user modified: storage/ndb/mcc/frontend/testProtocol.html === modified file 'storage/ndb/mcc/clumodel.py' === modified file 'storage/ndb/mcc/clumodel.py' --- a/storage/ndb/mcc/clumodel.py 2012-09-20 12:19:53 +0000 +++ b/storage/ndb/mcc/clumodel.py 2012-09-26 09:39:16 +0000 @@ -165,7 +165,7 @@ def create_cluster_from_config_ini(path): cp = config_parser.parse_config_ini(path) - cluster = Cluster([produce_ABClusterHost(h, 'ndbdev', 'ahg125c5') for h in config_parser.get_option_value_set(cp, 'HostName')]) + cluster = Cluster([produce_ABClusterHost(h, '', '') for h in config_parser.get_option_value_set(cp, 'HostName')]) cluster.nodes = [node_factory(ndict, cluster) for ndict in config_parser.get_node_dicts(cp, cluster.portbase+20)] return cluster @@ -196,12 +196,12 @@ ini = open(localpath) inicontent = ini.read() ini.close() - return [ mock_msg('createFileReq', {'ssh': {'user': 'ndbdev', 'pwd':'ahg125c5'}, + return [ mock_msg('createFileReq', {'ssh': {'user': '', 'pwd':''}, 'file': {'hostName': mgmd.clusterhost.host, 'path': mgmd.datadir, 'name': 'config.ini' }, 'contentString': inicontent }) for mgmd in filter(lambda n: isinstance(n, MgmdNode), self.nodes) ] def get_start_msg(self): - return mock_msg('startClusterReq', {'ssh': {'user': 'ndbdev', 'pwd':'ahg125c5'}, + return mock_msg('startClusterReq', {'ssh': {'user': '', 'pwd':''}, 'procs': [ proc for cn in self.nodes for proc in cn.get_procs() ], 'pgroups': [ {'plist': [mp for mn in filter(lambda cn: isinstance(cn, MgmdNode), self.nodes) === modified file 'storage/ndb/mcc/remote_clusterhost.py' --- a/storage/ndb/mcc/remote_clusterhost.py 2012-09-20 12:19:53 +0000 +++ b/storage/ndb/mcc/remote_clusterhost.py 2012-09-26 09:39:16 +0000 @@ -244,7 +244,7 @@ class MockClusterHost(RemoteClusterHost): """Subclass used for testing. Stores the password internally.""" - def __init__(self, host, user='ndbdev', passwd='ahg125c5'): + def __init__(self, host, user='', passwd=''): super(MockClusterHost, self).__init__(host, user, passwd) # Mockup objects - stores password self._msg_ssh = { 'user': user, 'pwd': passwd, 'keyBased': False} === modified file 'storage/ndb/mcc/tst/tst_main.py' --- a/storage/ndb/mcc/tst/tst_main.py 2012-09-20 12:19:53 +0000 +++ b/storage/ndb/mcc/tst/tst_main.py 2012-09-26 09:39:16 +0000 @@ -71,7 +71,7 @@ HOST_B = 'siv28.no.oracle.com' def mock_produce_ABClusterHost(hostname='localhost'): - return produce_ABClusterHost(hostname=hostname, user='ndbdev', pwd='ahg125c5') + return produce_ABClusterHost(hostname=hostname, user='', pwd='') def host_is_unreachable(hostname, port=22): return util.try_connect(hostname, port, False, retdict={ socket.EAI_NONAME : True}) No bundle (reason: useless for push emails).