diff options
| author | Ken Raffenetti <raffenet@mcs.anl.gov> | 2006-11-17 16:51:38 +0000 |
|---|---|---|
| committer | Ken Raffenetti <raffenet@mcs.anl.gov> | 2006-11-17 16:51:38 +0000 |
| commit | 2493bbac17bf610a2d87cdacef6dcd6ec3a18af5 (patch) | |
| tree | 74c9314feb10b664df9fe89e1d86fb78a8f91122 /src/lib/Server/Plugins/Hostbase.py | |
| parent | 8a62cf766f44fa19fd3d5263e6e283a0b9db72b1 (diff) | |
| download | bcfg2-2493bbac17bf610a2d87cdacef6dcd6ec3a18af5.tar.gz bcfg2-2493bbac17bf610a2d87cdacef6dcd6ec3a18af5.tar.bz2 bcfg2-2493bbac17bf610a2d87cdacef6dcd6ec3a18af5.zip | |
removed 'num' attribute from IP model
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2503 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Server/Plugins/Hostbase.py')
| -rw-r--r-- | src/lib/Server/Plugins/Hostbase.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/lib/Server/Plugins/Hostbase.py b/src/lib/Server/Plugins/Hostbase.py index b5a09e760..85766ed65 100644 --- a/src/lib/Server/Plugins/Hostbase.py +++ b/src/lib/Server/Plugins/Hostbase.py @@ -68,11 +68,8 @@ class Hostbase(Plugin): } self.Entries['ConfigFile'] = {} self.__rmi__ = ['rebuildState'] - try: - self.rebuildState(None) - except: - raise PluginInitError - + self.rebuildState(None) + def FetchFile(self, entry, metadata): '''Return prebuilt file data''' fname = entry.get('name').split('/')[-1] @@ -240,7 +237,7 @@ class Hostbase(Plugin): for filename in reversenames: originlist = [] cursor.execute(""" - SELECT h.hostname, p.ip_addr, p.num FROM ((hostbase_host h + SELECT h.hostname, p.ip_addr FROM ((hostbase_host h INNER JOIN hostbase_interface i ON h.id = i.host_id) INNER JOIN hostbase_ip p ON i.id = p.interface_id) WHERE p.ip_addr LIKE '%s%%%%' AND h.status = 'active' ORDER BY p.ip_addr |