diff options
author | iap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk> | 2004-06-24 12:00:50 +0000 |
---|---|---|
committer | iap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk> | 2004-06-24 12:00:50 +0000 |
commit | 7c649478436c7a4b201e24ea4658de21408303e5 (patch) | |
tree | 7037745e203731038867f309f7a4173e51a57e60 /tools/xenmgr/lib/server/SrvConsoleServer.py | |
parent | b41a11b189312f5a249e55ecad64b0e03d2268e3 (diff) | |
parent | 5eb94a602b09559f1193fae2935d970da4d89c31 (diff) | |
download | xen-7c649478436c7a4b201e24ea4658de21408303e5.tar.gz xen-7c649478436c7a4b201e24ea4658de21408303e5.tar.bz2 xen-7c649478436c7a4b201e24ea4658de21408303e5.zip |
bitkeeper revision 1.1011.1.1 (40dac272gGtMUxrtDr9Jr2GTujO_-w)
Merge ssh://xenbk@gandalf.hpl.hp.com//var/bk/xeno-unstable.bk
into labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
Diffstat (limited to 'tools/xenmgr/lib/server/SrvConsoleServer.py')
-rw-r--r-- | tools/xenmgr/lib/server/SrvConsoleServer.py | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/tools/xenmgr/lib/server/SrvConsoleServer.py b/tools/xenmgr/lib/server/SrvConsoleServer.py index 7179a0d1d4..94b7c8e6c8 100644 --- a/tools/xenmgr/lib/server/SrvConsoleServer.py +++ b/tools/xenmgr/lib/server/SrvConsoleServer.py @@ -584,28 +584,31 @@ class Daemon: reactor.diconnectAll() sys.exit(0) - def blkif_set_control_domain(self, dom): + def blkif_set_control_domain(self, dom, recreate=0): """Set the block device backend control domain. """ - return self.blkifCF.setControlDomain(dom) + return self.blkifCF.setControlDomain(dom, recreate=recreate) def blkif_get_control_domain(self, dom): """Get the block device backend control domain. """ return self.blkifCF.getControlDomain() - def blkif_create(self, dom): + def blkif_create(self, dom, recreate=0): """Create a block device interface controller. Returns Deferred """ - d = self.blkifCF.createInstance(dom) + d = self.blkifCF.createInstance(dom, recreate=recreate) return d + def blkif_get(self, dom): + return self.blkifCF.getInstanceByDom(dom) + def blkif_dev(self, dom, vdev): return self.blkifCF.getDomainDevice(dom, vdev) - def blkif_dev_create(self, dom, vdev, mode, segment): + def blkif_dev_create(self, dom, vdev, mode, segment, recreate=0): """Create a block device. Returns Deferred @@ -614,26 +617,29 @@ class Daemon: if not ctrl: raise ValueError('No blkif controller: %d' % dom) print 'blkif_dev_create>', dom, vdev, mode, segment - d = ctrl.attach_device(vdev, mode, segment) + d = ctrl.attachDevice(vdev, mode, segment, recreate=recreate) return d - def netif_set_control_domain(self, dom): + def netif_set_control_domain(self, dom, recreate=0): """Set the network interface backend control domain. """ - return self.netifCF.setControlDomain(dom) + return self.netifCF.setControlDomain(dom, recreate=recreate) def netif_get_control_domain(self, dom): """Get the network interface backend control domain. """ return self.netifCF.getControlDomain() - def netif_create(self, dom): + def netif_create(self, dom, recreate=0): """Create a network interface controller. """ - return self.netifCF.createInstance(dom) + return self.netifCF.createInstance(dom, recreate=recreate) + + def netif_get(self, dom): + return self.netifCF.getInstanceByDom(dom) - def netif_dev_create(self, dom, vif, vmac): + def netif_dev_create(self, dom, vif, vmac, recreate=0): """Create a network device. todo @@ -641,7 +647,7 @@ class Daemon: ctrl = self.netifCF.getInstanceByDom(dom) if not ctrl: raise ValueError('No netif controller: %d' % dom) - d = ctrl.attach_device(vif, vmac) + d = ctrl.attachDevice(vif, vmac, recreate=recreate) return d def netif_dev(self, dom, vif): |