install -D -m 644 logrotate/nodemanager $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/nodemanager
install -D -m 755 sshsh $RPM_BUILD_ROOT/bin/sshsh
-install -D -m 644 bwlimit.py ${RPM_BUILD_ROOT}/${PYTHON_SITEARCH}/bwlimit.py
+install -D -m 644 bwlimitlxc.py ${RPM_BUILD_ROOT}/${PYTHON_SITEARCH}/bwlimitlxc.py
##########
%post
%{_sysconfdir}/logrotate.d/nodemanager
/var/lib/
/bin/sshsh
-%{python_sitearch}/bwlimit.py*
+%{python_sitearch}/bwlimitlxc.py*
%changelog
* Thu Jun 21 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.1-2
#!/usr/bin/python
+#
+# TEMPORARY
+# this file historically came with util-vserver-pl which is not available
+# on lxc-powered nodes
+# it is thus intended to become packaged separately at some point
+#
+# It was renamed into bwlimitlxc so that this branch can be tested on
+# vserver nodes as well
+# TEMPORARY
+
#
# Bandwidth limit module for PlanetLab nodes. The intent is to use the
# Hierarchical Token Bucket (HTB) queueing discipline (qdisc) to allow
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id: bwlimit.py,v 1.15 2007/02/07 04:21:11 mlhuang Exp $
-#
import sys, os, re, getopt
import pwd
import copy
import threading
+import bwlimitlxc as bwlimit
import logger
import tools
-import bwlimit
import database
from config import Config
import sioc, plnet
# local modules
-import bwlimit, logger, iptables, tools
+import bwlimitlxc as bwlimit
+import logger, iptables, tools
# we can't do anything without a network
priority=1
'api',
'api_calls',
'bwmon',
- 'bwlimit',
+ 'bwlimitlxc',
'cgroups',
'conf_files',
'config',
from account import Account
import logger
-import bwlimit
+import bwlimitlxc as bwlimit
import cgroups
STATES = {
import libvirt
import logger
-import bwlimit
+import bwlimitlxc as bwlimit
from initscript import Initscript
from sliver_libvirt import Sliver_Libvirt
import controller
import sliver_lxc
-try: from bwlimit import bwmin, bwmax
+try: from bwlimitlxc import bwmin, bwmax
except ImportError: bwmin, bwmax = 8, 1000*1000*1000
priority=10