Changeset 1783 for trunk

Timestamp:

Nov 25, 2008, 11:44:57 PM (16 years ago)

Author:

quentin

Message:

Block xen_cpu from running with XenAPI until we switch all of XVM

Location:

trunk/packages/xvm-munin-config

Files:

• debian/changelog (modified) (2 diffs)
• host/usr/share/xvm-munin-host-config/plugins/xen_cpu (modified) (2 diffs)

trunk/packages/xvm-munin-config/debian/changelog

@@ -5 +5 @@
   * Bump theoretical CPU max to 64x
   * Show domain CPU weight and cap if available
+  * Refuse to run with the untested SERVER_XEN_API until we support it elsewhere
 
   [ Evan Broder ]
@@ -11 +12 @@
     preinst will get run on upgrade
 
- -- Evan Broder <broder@mit.edu>  Tue, 25 Nov 2008 23:14:07 -0500
+ -- Quentin Smith <quentin@mit.edu>  Tue, 25 Nov 2008 23:44:22 -0500
 
 xvm-munin-config (0.0.4) unstable; urgency=low

trunk/packages/xvm-munin-config/host/usr/share/xvm-munin-host-config/plugins/xen_cpu

@@ -4 +4 @@
 from xen.xend import sxp
 import atexit
+import sys
 
 serverType, serverURI = parseServer()
+
+if serverType != SERVER_LEGACY_XMLRPC:
+    print >>sys.stderr, "xen_cpu is untested with this Xen server type"
+    sys.exit(1)
 
 if serverType == SERVER_XEN_API:
@@ -21 +26 @@
     from xen.util.xmlrpcclient import ServerProxy
     server = ServerProxy(serverURI)
-
-import sys
 
 if len(sys.argv) > 1: