summaryrefslogtreecommitdiffstats
path: root/src/sbin/Bcfg2Server
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2005-12-12 19:57:16 +0000
committerNarayan Desai <desai@mcs.anl.gov>2005-12-12 19:57:16 +0000
commit15b7d2dda489b5307b7e02cbdca731bc9884bbd5 (patch)
tree167b3ecdd3982c9b346334c7ef54d6cb5540935c /src/sbin/Bcfg2Server
parent68141238ab5c6a5f6232bf91bdedbc791d8e280d (diff)
downloadbcfg2-15b7d2dda489b5307b7e02cbdca731bc9884bbd5.tar.gz
bcfg2-15b7d2dda489b5307b7e02cbdca731bc9884bbd5.tar.bz2
bcfg2-15b7d2dda489b5307b7e02cbdca731bc9884bbd5.zip
more client cleanups
fix the server git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1620 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/sbin/Bcfg2Server')
-rw-r--r--src/sbin/Bcfg2Server10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/sbin/Bcfg2Server b/src/sbin/Bcfg2Server
index ae878771e..d63ced61c 100644
--- a/src/sbin/Bcfg2Server
+++ b/src/sbin/Bcfg2Server
@@ -153,7 +153,7 @@ class Bcfg2(Component):
def resolve_client(self, client):
try:
- ret = gethostbyaddr(client)[0]
+ return gethostbyaddr(client)[0]
except herror:
warning = "host resolution error for %s" % (client)
warning_error(warning)
@@ -161,7 +161,7 @@ class Bcfg2(Component):
def Bcfg2GetProbes(self, address):
'''Fetch probes for a particular client'''
- client = resolve_client(address[0])
+ client = self.resolve_client(address[0])
resp = Element('probes')
try:
@@ -177,7 +177,7 @@ class Bcfg2(Component):
def Bcfg2RecvProbeData(self, address, probedata):
'''Receive probe data from clients'''
- client = resolve_client(address[0])
+ client = self.resolve_client(address[0])
for data in probedata:
try:
@@ -191,7 +191,7 @@ class Bcfg2(Component):
def Bcfg2GetConfig(self, address, image=False, profile=False):
'''Build config for a client'''
- client = resolve_client(address[0])
+ client = self.resolve_client(address[0])
if image and profile:
try:
@@ -210,7 +210,7 @@ class Bcfg2(Component):
state = sdata.find(".//Statistics")
# Versioned stats to prevent tied client/server upgrade
if state.get('version') >= '2.0':
- client = resolve_client(address[0])
+ client = self.resolve_client(address[0])
# Update statistics
self.Core.stats.updateStats(sdata, client)