ChangeSet 1.1542.1.1, 2005/05/25 09:42:25+01:00, cl349@xxxxxxxxxxxxxxxxxxxx
setup.py, Makefile:
Remove XenSV -- it's been broken since twisted was removed.
Many files:
Delete: tools/misc/xensv
Delete: tools/python/xen/sv/params.py
Delete: tools/python/xen/sv/__init__.py
Delete: tools/python/xen/sv/MigrateDomain.py
Delete: tools/python/xen/sv/Daemon.py
Delete: tools/python/xen/sv/util.py
Delete: tools/python/xen/sv/Wizard.py
Delete: tools/python/xen/sv/TabView.py
Delete: tools/python/xen/sv/SaveDomain.py
Delete: tools/python/xen/sv/RestoreDomain.py
Delete: tools/python/xen/sv/NodeInfo.py
Delete: tools/python/xen/sv/Main.py
Delete: tools/python/xen/sv/HTMLBase.py
Delete: tools/python/xen/sv/GenTabbed.py
Delete: tools/python/xen/sv/DomList.py
Delete: tools/python/xen/sv/DomInfo.py
Delete: tools/python/xen/sv/CreateDomain.py
Delete: tools/sv/images/unpause.png
Delete: tools/sv/images/small-unpause.png
Delete: tools/sv/images/small-pause.png
Delete: tools/sv/images/small-destroy.png
Delete: tools/sv/images/shutdown.png
Delete: tools/sv/images/seperator.jpg
Delete: tools/sv/images/right-end-highlight.jpg
Delete: tools/sv/images/reboot.png
Delete: tools/sv/images/previous.png
Delete: tools/sv/images/pause.png
Delete: tools/sv/images/orb_02.jpg
Delete: tools/sv/images/next.png
Delete: tools/sv/images/middle-no-highlight.jpg
Delete: tools/sv/images/middle-highlight.jpg
Delete: tools/sv/images/left-end-no-highlight.jpg
Delete: tools/sv/images/left-end-highlight.jpg
Delete: tools/sv/images/finish.png
Delete: tools/sv/images/destroy.png
Delete: tools/sv/inc/style.css
Delete: tools/sv/images/seperator-right-highlight.jpg
Delete: tools/sv/images/seperator-left-highlight.jpg
Delete: tools/sv/inc/script.js
Delete: tools/sv/images/right-end-no-highlight.jpg
Delete: tools/sv/images/orb_01.jpg
Delete: tools/sv/Makefile
Delete: tools/sv/Main.rpy
Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxx>
b/tools/misc/Makefile | 2
b/tools/python/setup.py | 1
b/tools/sv/images/destroy.png |binary
b/tools/sv/images/finish.png |binary
b/tools/sv/images/left-end-highlight.jpg |binary
b/tools/sv/images/left-end-no-highlight.jpg |binary
b/tools/sv/images/middle-highlight.jpg |binary
b/tools/sv/images/middle-no-highlight.jpg |binary
b/tools/sv/images/next.png |binary
b/tools/sv/images/orb_01.jpg |binary
b/tools/sv/images/orb_02.jpg |binary
b/tools/sv/images/pause.png |binary
b/tools/sv/images/previous.png |binary
b/tools/sv/images/reboot.png |binary
b/tools/sv/images/right-end-highlight.jpg |binary
b/tools/sv/images/right-end-no-highlight.jpg |binary
b/tools/sv/images/seperator-left-highlight.jpg |binary
b/tools/sv/images/seperator-right-highlight.jpg |binary
b/tools/sv/images/seperator.jpg |binary
b/tools/sv/images/shutdown.png |binary
b/tools/sv/images/small-destroy.png |binary
b/tools/sv/images/small-pause.png |binary
b/tools/sv/images/small-unpause.png |binary
b/tools/sv/images/unpause.png |binary
b/tools/sv/images/xen.png |binary
tools/misc/xensv | 137 ------------
tools/python/xen/sv/CreateDomain.py | 163 --------------
tools/python/xen/sv/Daemon.py | 108 ---------
tools/python/xen/sv/DomInfo.py | 149 -------------
tools/python/xen/sv/DomList.py | 81 -------
tools/python/xen/sv/GenTabbed.py | 131 -----------
tools/python/xen/sv/HTMLBase.py | 63 -----
tools/python/xen/sv/Main.py | 113 ----------
tools/python/xen/sv/MigrateDomain.py | 72 ------
tools/python/xen/sv/NodeInfo.py | 64 -----
tools/python/xen/sv/RestoreDomain.py | 46 ----
tools/python/xen/sv/SaveDomain.py | 59 -----
tools/python/xen/sv/TabView.py | 49 ----
tools/python/xen/sv/Wizard.py | 269 ------------------------
tools/python/xen/sv/__init__.py | 1
tools/python/xen/sv/params.py | 3
tools/python/xen/sv/util.py | 123 ----------
tools/sv/Main.rpy | 3
tools/sv/Makefile | 34 ---
tools/sv/inc/script.js | 22 -
tools/sv/inc/style.css | 32 --
46 files changed, 1 insertion(+), 1724 deletions(-)
diff -Nru a/tools/misc/Makefile b/tools/misc/Makefile
--- a/tools/misc/Makefile 2005-05-25 05:01:58 -04:00
+++ b/tools/misc/Makefile 2005-05-25 05:01:58 -04:00
@@ -16,7 +16,7 @@
TARGETS = xenperf xc_shadow
INSTALL_BIN = $(TARGETS) xencons
-INSTALL_SBIN = netfix xm xend xensv xenperf
+INSTALL_SBIN = netfix xm xend xenperf
all: build
build: $(TARGETS)
diff -Nru a/tools/misc/xensv b/tools/misc/xensv
--- a/tools/misc/xensv 2005-05-25 05:01:58 -04:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,137 +0,0 @@
-#!/usr/bin/env python
-# -*- mode: python; -*-
-#============================================================================
-# Copyright (C) 2004 Tom Wilkie <tw275@xxxxxxxxxxxx>
-# Copyright (C) 2004 Mike Wray <mike.wray@xxxxxx>
-#============================================================================
-
-"""SV web interface Lives in /usr/sbin.
- Provides pretty HTML management interface.
-
- Run:
-
- sv start
-
- The daemon is stopped with:
-
- sv stop
-
- The daemon will be accessible from http://localhost:8080/
-"""
-import os
-import sys
-import re
-
-# add fallback path for non-native python path installs if needed
-sys.path.append('/usr/lib/python')
-sys.path.append('/usr/lib64/python')
-from xen.xend.server.params import XEND_PID_FILE
-
-class CheckError(ValueError):
- pass
-
-def hline():
- print >>sys.stderr, "*" * 70
-
-def msg(message):
- print >>sys.stderr, "*" * 3, message
-
-def check_logging():
- """Check python logging is installed and raise an error if not.
- Logging is standard from Python 2.3 on.
- """
- try:
- import logging
- except ImportError:
- hline()
- msg("Python logging is not installed.")
- msg("Use 'make install-logging' at the xen root to install.")
- msg("")
- msg("Alternatively download and install from")
- msg("http://www.red-dove.com/python_logging.html";)
- hline()
- raise CheckError("logging is not installed")
-
-def check_twisted_version():
- """Check twisted is installed with a supported version and print a warning
if not.
- Raises an error if twisted is not installed.
- """
- # Supported twisted release and major version.
- RELEASE = 1
- MAJOR = 3
- try:
- from twisted.copyright import version
- except ImportError:
- hline()
- msg("The Twisted framework is not installed.")
- msg("Use 'make install-twisted' at the xen root to install.")
- msg("")
- msg("Alternatively download and install version %d.%d or higher" %
(RELEASE, MAJOR))
- msg("from http://www.twistedmatrix.com/products";)
- hline()
- raise CheckError("twisted is not installed")
-
-
- (release, major, minor) = version.split('.')
- release = int(release)
- major = int(major)
- if release > RELEASE: return
- if release == RELEASE and major >= MAJOR: return
- hline()
- msg("Warning: Twisted version not supported: %s" % version)
- msg("Use Twisted version %d.%d.0 or higher" % (RELEASE, MAJOR))
- hline()
-
-def check_xend():
- """Check xend is running
- """
-
- if not os.path.isfile(XEND_PID_FILE) or not os.path.getsize(XEND_PID_FILE):
- hline()
- msg( "Warning: Xend has not been detected as running." )
- msg( "Please start it immediately with: xend start " )
- hline()
- return 0
-
- # Read the pid of the previous invocation and search active process list.
- pid = open(XEND_PID_FILE, 'r').read()
- lines = os.popen('ps ' + pid + ' 2>/dev/null').readlines()
- for line in lines:
- if re.search('^ *' + pid + '.+xend', line):
- return 1
-
- hline()
- msg( "Warning: Xend has not been detected as running." )
- msg( "Please start it immediately with: xend start " )
- hline()
- return 0
-
-def main():
- try:
- check_logging()
- check_twisted_version()
- check_xend()
- except CheckError:
- sys.exit(1)
-
- from xen.sv import Daemon
-
- daemon = Daemon.instance()
-
- if not sys.argv[1:]:
- print 'usage: %s {start|stop|restart}' % sys.argv[0]
- elif os.fork():
- pid, status = os.wait()
- return status >> 8
- elif sys.argv[1] == 'start':
- return daemon.start()
- elif sys.argv[1] == 'stop':
- return daemon.stop()
- elif sys.argv[1] == 'restart':
- return daemon.stop() or daemon.start()
- else:
- print 'not an option:', sys.argv[1]
- return 1
-
-if __name__ == '__main__':
- sys.exit(main())
diff -Nru a/tools/python/setup.py b/tools/python/setup.py
--- a/tools/python/setup.py 2005-05-25 05:01:58 -04:00
+++ b/tools/python/setup.py 2005-05-25 05:01:58 -04:00
@@ -39,7 +39,6 @@
'xen.util',
'xen.xend',
'xen.xend.server',
- 'xen.sv',
'xen.xm',
'xen.web',
],
diff -Nru a/tools/python/xen/sv/CreateDomain.py
b/tools/python/xen/sv/CreateDomain.py
--- a/tools/python/xen/sv/CreateDomain.py 2005-05-25 05:01:58 -04:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,163 +0,0 @@
-from xen.sv.Wizard import *
-from xen.sv.util import *
-from xen.sv.GenTabbed import PreTab
-
-from xen.xm.create import make_config, OptVals
-
-from xen.xend.XendClient import server
-
-class CreateDomain( Wizard ):
- def __init__( self, urlWriter ):
-
- sheets = [ CreatePage0,
- CreatePage1,
- CreatePage2,
- CreatePage3,
- CreatePage4,
- CreateFinish ]
-
- Wizard.__init__( self, urlWriter, "Create Domain", sheets )
-
-class CreatePage0( Sheet ):
-
- def __init__( self, urlWriter ):
- Sheet.__init__( self, urlWriter, "General", 0 )
- self.addControl( InputControl( 'name', 'VM Name', 'VM Name:',
"[\\w|\\S]+", "You must enter a name in this field" ) )
- self.addControl( InputControl( 'memory', '64', 'Memory (Mb):',
"[\\d]+", "You must enter a number in this field" ) )
- self.addControl( InputControl( 'cpu', '0', 'CPU:', "[\\d]+", "You must
enter a number in this feild" ) )
- self.addControl( InputControl( 'cpu_weight', '1', 'CPU Weight:',
"[\\d]+", "You must enter a number in this feild" ) )
-
-class CreatePage1( Sheet ):
-
- def __init__( self, urlWriter ):
- Sheet.__init__( self, urlWriter, "Setup Kernel Image", 1 )
-# For now we don't need to select a builder...
-# self.addControl( ListControl( 'builder', [('linux', 'Linux'),
('netbsd', 'NetBSD')], 'Kernel Type:' ) )
- self.addControl( FileControl( 'kernel', '/boot/vmlinuz-2.6.9-xenU',
'Kernel Image:' ) )
- self.addControl( InputControl( 'extra', '', 'Kernel Command Line
Parameters:' ) )
-
-class CreatePage2( Sheet ):
-
- def __init__( self, urlWriter ):
- Sheet.__init__( self, urlWriter, "Setup Virtual Block Device", 2 )
- self.addControl( InputControl( 'num_vbds', '1', 'Number of VBDs:',
'[\\d]+', "You must enter a number in this field" ) )
-
-class CreatePage3( Sheet ):
-
- def __init__( self, urlWriter ):
- Sheet.__init__( self, urlWriter, "Setup Virtual Block Device", 3 )
-
- def write_BODY( self, request, err ):
- if not self.passback: self.parseForm( request )
-
- previous_values = sxp2hash( string2sxp( self.passback ) ) #get the hash
for quick reference
-
- num_vbds = previous_values.get( 'num_vbds' )
-
- for i in range( int( num_vbds ) ):
- self.addControl( InputControl( 'vbd%s_dom0' % i, 'phy:sda%s' %
str(i + 1), 'Device %s name:' % i ) )
- self.addControl( InputControl( 'vbd%s_domU' % i, 'sda%s' % str(i +
1), 'Virtualized device %s:' % i ) )
- self.addControl( ListControl( 'vbd%s_mode' % i, [('w', 'Read +
Write'), ('r', 'Read Only')], 'Device %s mode:' % i ) )
-
- self.addControl( InputControl( 'root', '/dev/sda1', 'Root device (in
VM):' ) )
-
- Sheet.write_BODY( self, request, err )
-
-class CreatePage4( Sheet ):
-
- def __init__( self, urlWriter ):
- Sheet.__init__( self, urlWriter, "Network settings", 4 )
- self.addControl( ListControl( 'dhcp', [('off', 'No'), ('dhcp',
'Yes')], 'Use DHCP:' ) )
- self.addControl( InputControl( 'hostname', 'hostname', 'VM Hostname:'
) )
- self.addControl( InputControl( 'ip_addr', '1.2.3.4', 'VM IP Address:'
) )
- self.addControl( InputControl( 'ip_subnet', '255.255.255.0', 'VM
Subnet Mask:' ) )
- self.addControl( InputControl( 'ip_gateway', '1.2.3.4', 'VM Gateway:'
) )
- self.addControl( InputControl( 'ip_nfs', '1.2.3.4', 'NFS Server:' ) )
-
-class CreateFinish( Sheet ):
-
- def __init__( self, urlWriter ):
- Sheet.__init__( self, urlWriter, "All Done", 5 )
-
- def write_BODY( self, request, err ):
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home