Commit 7655440c authored by Andrea Petrucci's avatar Andrea Petrucci
Browse files

references #226: modify configuration for 4 RUBUs CC8

parent 793e79a7
...@@ -43,11 +43,8 @@ class Context: ...@@ -43,11 +43,8 @@ class Context:
def addPeerTransport(self,maxMessageSize): def addPeerTransport(self,maxMessageSize):
try: try:
# run unit tests on daq3val machine with ptutcp because no evb-unittests machine on CentOS 8 (TODO remove the following line) if 'd3v' in self.hostinfo['i2oHostname'] or 'rbs1v0' in self.hostinfo['i2oHostname'] or 'ebs0v0' in self.hostinfo['i2oHostname'] or 'ebs1v0' in self.hostinfo['i2oHostname']:
if 'd3vrubu-c2e33-06-01' in self.hostinfo['i2oHostname']: app = self.getPtIbvApplication(maxMessageSize,False)
app = self.getPtUtcpApplication(maxMessageSize)
elif 'd3v' in self.hostinfo['i2oHostname'] or 'rbs1v0' in self.hostinfo['i2oHostname'] or 'ebs0v0' in self.hostinfo['i2oHostname'] or 'ebs1v0' in self.hostinfo['i2oHostname']:
app = self.getPtIbvApplication(maxMessageSize)
else: else:
app = self.getPtUtcpApplication(maxMessageSize) app = self.getPtUtcpApplication(maxMessageSize)
app.params['i2oHostname'] = self.hostinfo['i2oHostname'] app.params['i2oHostname'] = self.hostinfo['i2oHostname']
...@@ -74,10 +71,18 @@ class Context: ...@@ -74,10 +71,18 @@ class Context:
return app return app
def getPtIbvApplication(self,maxMessageSize): def getPtIbvApplication(self,maxMessageSize,isRoCE):
interface = SymbolMap.getI2OInterfaceName(self.hostinfo['i2oHostname']) interface = SymbolMap.getI2OInterfaceName(self.hostinfo['i2oHostname'])
properties = [ properties = []
('iaName','string',interface), if not isRoCE:
properties = [('iaName','string',interface)]
else:
properties = [
('networkInterface','string',interface),
('SGIDIndex','unsignedInt','3'),
('portNumber','unsignedInt','1')
]
properties.extend([
('sendPoolName','string','sudapl'), ('sendPoolName','string','sudapl'),
('recvPoolName','string','rudapl'), ('recvPoolName','string','rudapl'),
('deviceMTU','unsignedInt','4096'), ('deviceMTU','unsignedInt','4096'),
...@@ -85,7 +90,7 @@ class Context: ...@@ -85,7 +90,7 @@ class Context:
('sendWithTimeout','boolean','true'), ('sendWithTimeout','boolean','true'),
('useRelay','boolean','false'), ('useRelay','boolean','false'),
('maxMessageSize','unsignedInt',maxMessageSize) ('maxMessageSize','unsignedInt',maxMessageSize)
] ])
if self.role == 'EVM': if self.role == 'EVM':
properties.extend([ properties.extend([
('senderPoolSize','unsignedLong','0x2A570C00'), ('senderPoolSize','unsignedLong','0x2A570C00'),
......
...@@ -15,7 +15,10 @@ except ImportError: ...@@ -15,7 +15,10 @@ except ImportError:
def getI2OInterfaceName(i2oHostname): def getI2OInterfaceName(i2oHostname):
""" return the IBV interface name as function of the hostname """ """ return the IBV interface name as function of the hostname """
if 'd3vrubu-c2e34-20-01' in i2oHostname or 'd3vrubu-c2e34-27-01' in i2oHostname: if 'd3vrubu-c2e33-06-01' in i2oHostname or 'd3vrubu-c2e33-08-01' in i2oHostname or\
'd3vrubu-c2e33-10-01' in i2oHostname or 'd3vrubu-c2e33-12-01' in i2oHostname:
interface='ens4f0'
elif 'd3vrubu-c2e34-20-01' in i2oHostname or 'd3vrubu-c2e34-27-01' in i2oHostname:
if 'd3vfus1v0' in i2oHostname: if 'd3vfus1v0' in i2oHostname:
interface='mlx5_0' interface='mlx5_0'
elif 'd3vfbs1v0' in i2oHostname: elif 'd3vfbs1v0' in i2oHostname:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment