Changeset 816 for trunk/packages/sipb-xen-base

Timestamp:

Aug 2, 2008, 8:28:18 PM (16 years ago)

Author:

y_z

Message:

• use invirt.config to get hostnames
• refactoring: extracted bcast() function into invirt.remote package
• fixed os.rename import bug
• using correct default paths in invirt-getconf

Location:

trunk/packages/sipb-xen-base/files/usr

Files:

• sbin/invirt-getconf (modified) (3 diffs)
• share/python-support/sipb-xen-base/invirt/config.py (modified) (2 diffs)
• share/python-support/sipb-xen-base/invirt/remote.py (added)

trunk/packages/sipb-xen-base/files/usr/sbin/invirt-getconf

@@ -17 +17 @@
 """
 
-from invirt.config import load
+from invirt.config import default_src_path, default_cache_path, load
 from sys import argv, exit, stderr, stdout
 from optparse import OptionParser
@@ -28 +28 @@
                 description = __doc__.strip().split('\n\n')[0])
         parser.add_option('-s', '--src',
-                default = '/etc/invirt/master.yaml',
+                default = default_src_path,
                 help = 'the source YAML configuration file to read from')
         parser.add_option('-c', '--cache',
-                default = '/var/lib/invirt/invirt.json',
+                default = default_cache_path,
                 help = 'path to the JSON cache')
         parser.add_option('-r', '--refresh',
@@ -81 +81 @@
             else:
                 import yaml
+                try:    dumper = yaml.CSafeDumper
+                except: dumper = yaml.SafeDumper
                 yaml.dump(conf, stdout,
-                          Dumper=yaml.CSafeDumper, default_flow_style=False)
+                          Dumper = dumper, default_flow_style = False)
     except invirt_exception, ex:
         print >> stderr, ex

trunk/packages/sipb-xen-base/files/usr/share/python-support/sipb-xen-base/invirt/config.py

@@ -1 +1 @@
 import json
 from invirt.common import *
+from os import rename
 from os.path import getmtime
 
@@ -75 +76 @@
                         lambda f: f.write(json.write(ns.cfg)))
                 except: pass # silent failure
-                else: os.rename(cache_path + '.tmp', cache_path)
+                else: rename(cache_path + '.tmp', cache_path)
         except IOError:
             ns.cfg = with_closing(file(src_path)) (