Fix the 'sshsh' install command.

[nodemanager.git] / sliver_libvirt.py

diff --git a/sliver_libvirt.py b/sliver_libvirt.py
index 83b5ad8..52c8bde 100644 (file)
--- a/sliver_libvirt.py
+++ b/sliver_libvirt.py
@@ -10,6 +10,8 @@ import os.path
 import libvirt
 import sys
 import shutil
+import bwlimit
+import cgroups
 
 from string import Template
 
@@ -23,9 +25,6 @@ STATES = {
     libvirt.VIR_DOMAIN_CRASHED: 'crashed',
 }
 
-REF_IMG_BASE_DIR = '/vservers/.lvref'
-CON_BASE_DIR     = '/vservers'
-
 connections = dict()
 
 # Helper methods
@@ -58,6 +57,7 @@ class Sliver_Libvirt(accounts.Account):
         self.slice_id = rec['slice_id']
         self.enabled = True
         self.conn = getConnection(rec['type'])
+        self.xid = bwlimit.get_xid(self.name)
         
         try:
             self.dom = self.conn.lookupByName(self.name)
@@ -74,12 +74,22 @@ class Sliver_Libvirt(accounts.Account):
         if not self.is_running():
             self.dom.create()
         else:
-            logger.verbose('sliver_libvirt: sliver %s already started'%(dom.name()))
+            logger.verbose('sliver_libvirt: sliver %s already started'%(self.name))
+
+        # After the VM is started... we can play with the virtual interface
+        # Create the ebtables rule to mark the packets going out from the virtual
+        # interface to the actual device so the filter canmatch against the mark
+        bwlimit.ebtables("-A INPUT -i veth%d -j mark --set-mark %d" % \
+            (self.xid, self.xid))
            
 
     def stop(self):
         logger.verbose('sliver_libvirt: %s stop'%(self.name))
         
+        # Remove the ebtables rule before stopping 
+        bwlimit.ebtables("-D INPUT -i veth%d -j mark --set-mark %d" % \
+            (self.xid, self.xid))
+        
         try:
             self.dom.destroy()
         except:
@@ -105,9 +115,9 @@ class Sliver_Libvirt(accounts.Account):
     def configure(self, rec):
 
         #sliver.[LXC/QEMU] tolower case
-        sliver_type = rec['type'].split('.')[1].lower() 
+        #sliver_type = rec['type'].split('.')[1].lower() 
 
-        BASE_DIR = '/cgroup/libvirt/%s/%s/'%(sliver_type, self.name)
+        #BASE_DIR = '/cgroup/libvirt/%s/%s/'%(sliver_type, self.name)
 
         # Disk allocation
         # No way through cgroups... figure out how to do that with user/dir quotas.
@@ -130,20 +140,17 @@ class Sliver_Libvirt(accounts.Account):
         # Memory allocation
         if rec.has_key('memlock_hard'):
             mem = rec['memlock_hard'] * 1024 # hard limit in bytes
-            with open(os.path.join(BASE_DIR, 'memory.limit_in_bytes'), 'w') as f:
-                print >>f, mem
+            cgroups.write(self.name, 'memory.limit_in_bytes', mem)
         if rec.has_key('memlock_soft'):
             mem = rec['memlock_soft'] * 1024 # soft limit in bytes
-            with open(os.path.join(BASE_DIR, 'memory.soft_limit_in_bytes'), 'w') as f:
-                print >>f, mem
+            cgroups.write(self.name, 'memory.soft_limit_in_bytes', mem)
 
         # CPU allocation
         # Only cpu_shares until figure out how to provide limits and guarantees
         # (RT_SCHED?)
         if rec.has_key('cpu_share'): 
             cpu_share = rec['cpu_share']
-            with open(os.path.join(BASE_DIR, 'cpu.shares'), 'w') as f:
-                print >>f, cpu_share
+            cgroups.write(self.name, 'cpu.shares', cpu_share)
 
         # Call the upper configure method (ssh keys...)
         accounts.Account.configure(self, rec)