jenkins-bot has submitted this change and it was merged.
Change subject: Lint: make ConfigDict methods lowerCamelCase
......................................................................
Lint: make ConfigDict methods lowerCamelCase
Change-Id: I4b58f65d0006aa31ae40f31288f94d154269fadf
---
M pybal/ipvs.py
M pybal/monitor.py
M pybal/pybal.py
M pybal/test/test_util.py
M pybal/util.py
5 files changed, 28 insertions(+), 28 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pybal/ipvs.py b/pybal/ipvs.py
index 8ccdacc..bdfb782 100644
--- a/pybal/ipvs.py
+++ b/pybal/ipvs.py
@@ -191,9 +191,9 @@
self.configuration = configuration
- self.ipvsManager.DryRun = configuration.getboolean('dryrun', False)
+ self.ipvsManager.DryRun = configuration.getBool('dryrun', False)
- if self.configuration.getboolean('bgp', False):
+ if self.configuration.getBool('bgp', False):
from pybal import BGPFailover
# Add service ip to the BGP announcements
BGPFailover.addPrefix(self.ip)
@@ -263,4 +263,4 @@
def getDepoolThreshold(self):
"""Returns the threshold below which no more down servers will be
depooled"""
- return self.configuration.getfloat('depool-threshold', .5)
+ return self.configuration.getFloat('depool-threshold', .5)
diff --git a/pybal/monitor.py b/pybal/monitor.py
index 623f899..c84a7dc 100644
--- a/pybal/monitor.py
+++ b/pybal/monitor.py
@@ -77,10 +77,10 @@
print "[%s %s] %s (%s): %s" % (self.server.lvsservice.name,
self.__name__, self.server.host, self.server.textStatus(), text)
def _getConfigBool(self, optionname, default=None):
- return self.configuration.getboolean('%s.%s' % (self.__name__.lower(),
optionname), default)
+ return self.configuration.getBool('%s.%s' % (self.__name__.lower(),
optionname), default)
def _getConfigInt(self, optionname, default=None):
- return self.configuration.getint('%s.%s' % (self.__name__.lower(),
optionname), default)
+ return self.configuration.getInt('%s.%s' % (self.__name__.lower(),
optionname), default)
def _getConfigString(self, optionname):
val = self.configuration[self.__name__.lower() + '.' + optionname]
diff --git a/pybal/pybal.py b/pybal/pybal.py
index 93e9373..0ae9df6 100644
--- a/pybal/pybal.py
+++ b/pybal/pybal.py
@@ -422,12 +422,12 @@
def __init__(self, globalConfig):
self.globalConfig = globalConfig
- if self.globalConfig.getboolean('bgp', False):
+ if self.globalConfig.getBool('bgp', False):
self.setup()
def setup(self):
try:
- self.bgpPeering =
bgp.NaiveBGPPeering(myASN=self.globalConfig.getint('bgp-local-asn'),
+ self.bgpPeering =
bgp.NaiveBGPPeering(myASN=self.globalConfig.getInt('bgp-local-asn'),
peerAddr=self.globalConfig.get('bgp-peer-address'))
asPath = [int(asn) for asn in self.globalConfig.get('bgp-as-path',
str(self.bgpPeering.myASN)).split()]
@@ -666,7 +666,7 @@
cfgtuple = (
config.get(section, 'protocol'),
config.get(section, 'ip'),
- config.getint(section, 'port'),
+ config.getInt(section, 'port'),
config.get(section, 'scheduler'))
# Read the custom configuration options of the LVS section
diff --git a/pybal/test/test_util.py b/pybal/test/test_util.py
index 5f244cc..0bcd90c 100644
--- a/pybal/test/test_util.py
+++ b/pybal/test/test_util.py
@@ -65,29 +65,29 @@
})
def testGetInt(self):
- """Test `ConfigDict.getint()`."""
- self.assertEqual(self.config.getint('int'), 3)
- self.assertEqual(self.config.getint('missing', 4), 4)
+ """Test `ConfigDict.getInt()`."""
+ self.assertEqual(self.config.getInt('int'), 3)
+ self.assertEqual(self.config.getInt('missing', 4), 4)
with self.assertRaises(KeyError):
- self.config.getint('missing')
+ self.config.getInt('missing')
with self.assertRaises(ValueError):
- self.config.getint('truthy')
+ self.config.getInt('truthy')
def testGetFloat(self):
- """Test `ConfigDict.getfloat()`."""
- self.assertEqual(self.config.getfloat('float'), 3.14)
- self.assertEqual(self.config.getfloat('missing', True), True)
+ """Test `ConfigDict.getFloat()`."""
+ self.assertEqual(self.config.getFloat('float'), 3.14)
+ self.assertEqual(self.config.getFloat('missing', True), True)
with self.assertRaises(KeyError):
- self.config.getfloat('missing')
+ self.config.getFloat('missing')
with self.assertRaises(ValueError):
- self.config.getfloat('falsy')
+ self.config.getFloat('falsy')
- def testGetBoolean(self):
- """Test `ConfigDict.getboolean()`."""
- self.assertEqual(self.config.getboolean('truthy'), True)
- self.assertEqual(self.config.getboolean('falsy'), False)
- self.assertEqual(self.config.getboolean('missing', True), True)
+ def testGetBool(self):
+ """Test `ConfigDict.getBool()`."""
+ self.assertEqual(self.config.getBool('truthy'), True)
+ self.assertEqual(self.config.getBool('falsy'), False)
+ self.assertEqual(self.config.getBool('missing', True), True)
with self.assertRaises(KeyError):
- self.config.getboolean('missing')
+ self.config.getBool('missing')
with self.assertRaises(ValueError):
- self.config.getboolean('float')
+ self.config.getBool('float')
diff --git a/pybal/util.py b/pybal/util.py
index 0c4a95d..315017f 100644
--- a/pybal/util.py
+++ b/pybal/util.py
@@ -39,7 +39,7 @@
class ConfigDict(dict):
- def getint(self, key, default=None):
+ def getInt(self, key, default=None):
try:
return int(self[key])
except KeyError:
@@ -49,7 +49,7 @@
raise
# do not intercept ValueError
- def getboolean(self, key, default=None):
+ def getBool(self, key, default=None):
try:
value = self[key]
except KeyError:
@@ -68,7 +68,7 @@
else:
raise ValueError
- def getfloat(self, key, default=None):
+ def getFloat(self, key, default=None):
try:
return float(self[key])
except KeyError:
--
To view, visit https://gerrit.wikimedia.org/r/233647
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4b58f65d0006aa31ae40f31288f94d154269fadf
Gerrit-PatchSet: 2
Gerrit-Project: operations/debs/pybal
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
