ia64/xen-unstable

changeset 1599:de3b140945e4

bitkeeper revision 1.1010.1.13 (40e0366cZLFe2i7OeoPJ8sckG6xSpg)

Yet more rename fixes.
author mjw@wray-m-3.hpl.hp.com
date Mon Jun 28 15:17:00 2004 +0000 (2004-06-28)
parents 5427e66e7ea4
children 3bffc8da7726
files tools/examples/xmdefaults tools/xen/lib/xend/XendDomain.py tools/xen/lib/xend/XendDomainInfo.py tools/xen/lib/xm/opts.py tools/xen/lib/xm/shutdown.py
line diff
     1.1 --- a/tools/examples/xmdefaults	Mon Jun 28 15:09:28 2004 +0000
     1.2 +++ b/tools/examples/xmdefaults	Mon Jun 28 15:17:00 2004 +0000
     1.3 @@ -5,9 +5,6 @@
     1.4  # This file expects the variable 'vmid' to be set.
     1.5  #============================================================================
     1.6  
     1.7 -import sys
     1.8 -import xenctl.ip
     1.9 -
    1.10  try:
    1.11      vmid = int(vmid) # convert to integer
    1.12  except:
     2.1 --- a/tools/xen/lib/xend/XendDomain.py	Mon Jun 28 15:09:28 2004 +0000
     2.2 +++ b/tools/xen/lib/xend/XendDomain.py	Mon Jun 28 15:17:00 2004 +0000
     2.3 @@ -9,7 +9,6 @@ import sys
     2.4  from twisted.internet import defer
     2.5  
     2.6  import xen.ext.xc; xc = xen.ext.xc.new()
     2.7 -import xenctl.ip
     2.8  
     2.9  import sxp
    2.10  import XendRoot
    2.11 @@ -336,9 +335,9 @@ class XendDomain:
    2.12          if not dominfo: return None
    2.13          return dominfo.get_device_by_index(vif)
    2.14  
    2.15 -    def domain_vif_ip_add(self, dom, vif, ip):
    2.16 -        dom = int(dom)
    2.17 -        return xenctl.ip.setup_vfr_rules_for_vif(dom, vif, ip)
    2.18 +##     def domain_vif_ip_add(self, dom, vif, ip):
    2.19 +##         dom = int(dom)
    2.20 +##         return xenctl.ip.setup_vfr_rules_for_vif(dom, vif, ip)
    2.21  
    2.22      def domain_vbd_ls(self, dom):
    2.23          dominfo = self.domain_get(dom)
     3.1 --- a/tools/xen/lib/xend/XendDomainInfo.py	Mon Jun 28 15:09:28 2004 +0000
     3.2 +++ b/tools/xen/lib/xend/XendDomainInfo.py	Mon Jun 28 15:17:00 2004 +0000
     3.3 @@ -17,7 +17,7 @@ import os
     3.4  from twisted.internet import defer
     3.5  
     3.6  import xen.ext.xc; xc = xen.ext.xc.new()
     3.7 -import xenctl.ip
     3.8 +import xen.util.ip
     3.9  
    3.10  import sxp
    3.11  
    3.12 @@ -167,14 +167,14 @@ def vif_up(iplist):
    3.13          print >> open(IP_NONLOCAL_BIND, 'w'), str(v)
    3.14  
    3.15      def link_local(ip):
    3.16 -        return xenctl.ip.check_subnet(ip, '169.254.0.0', '255.255.0.0')
    3.17 +        return xen.util.ip.check_subnet(ip, '169.254.0.0', '255.255.0.0')
    3.18  
    3.19      def arping(ip, gw):
    3.20          cmd = '/usr/sbin/arping -A -b -I eth0 -c 1 -s %s %s' % (ip, gw)
    3.21          print cmd
    3.22          os.system(cmd)
    3.23          
    3.24 -    gateway = xenctl.ip.get_current_ipgw() or '255.255.255.255'
    3.25 +    gateway = xen.util.ip.get_current_ipgw() or '255.255.255.255'
    3.26      nlb = get_ip_nonlocal_bind()
    3.27      if not nlb: set_ip_nonlocal_bind(1)
    3.28      try:
     4.1 --- a/tools/xen/lib/xm/opts.py	Mon Jun 28 15:09:28 2004 +0000
     4.2 +++ b/tools/xen/lib/xm/opts.py	Mon Jun 28 15:17:00 2004 +0000
     4.3 @@ -290,6 +290,7 @@ class Opts:
     4.4          cmd = '\n'.join(["import sys",
     4.5                           "import os",
     4.6                           "import os.path",
     4.7 +                         "import xen.util.ip",
     4.8                           "xm_file = '%s'" % defaults,
     4.9                           "xm_help = %d" % help ])
    4.10          exec cmd in globals, locals
     5.1 --- a/tools/xen/lib/xm/shutdown.py	Mon Jun 28 15:09:28 2004 +0000
     5.2 +++ b/tools/xen/lib/xm/shutdown.py	Mon Jun 28 15:17:00 2004 +0000
     5.3 @@ -6,7 +6,7 @@ import sys
     5.4  import time
     5.5  
     5.6  from xen.xend.XendClient import server
     5.7 -from xen.xend.xm.opts import *
     5.8 +from xen.xm.opts import *
     5.9  
    5.10  gopts = Opts(use="""[options] [DOM]
    5.11