lag_call requires the command to be an array

[nodemanager.git] / plugins / drl.py

diff --git a/plugins/drl.py b/plugins/drl.py
index 7904b10..fa36f94 100644 (file)
--- a/plugins/drl.py
+++ b/plugins/drl.py
@@ -9,16 +9,14 @@ import logger
 import tools
 
 
-drl = """
-<?xml version="1.0" encoding="UTF-8"?>
+drl = """<?xml version="1.0" encoding="UTF-8"?>
 <!-- %s -->
 <drl>
     <machine id="%d" limit="%d" commfabric="MESH" accounting="STANDARD" ewma="0.1" htb_node="100" htb_parent="10">
 
 %s
     </machine>
-</drl>
-"""
+</drl>"""
 
 def start(options, conf):
        logger.log('drl plugin starting up...')
@@ -53,14 +51,14 @@ def DRLInstall(slice_name):
        if not os.path.exists('/vservers/%s/etc/yum.repos.d/myplc.repo' % slice_name):
                shutil.copyfile('/etc/yum.myplc.d/myplc.repo', '/vservers/%s/etc/yum.repos.d/myplc.repo' % slice_name)
                logger.log('drl: installing DistributedRateLimiting into %s slice' % slice_name)
-               logger.log_call('vserver', '%s' % slice_name, 'suexec', '0', 'yum', 'install', '-y', '-q', 'DistributedRateLimiting')
-               logger.log_call('vserver', '%s' % slice_name, 'suexec', '0', 'chkconfig', '--add', 'ulogd')
+               logger.log_call(['vserver', '%s' % slice_name, 'suexec', '0', 'yum', 'install', '-y', '-q', 'DistributedRateLimiting'])
+               logger.log_call(['vserver', '%s' % slice_name, 'suexec', '0', 'chkconfig', '--add', 'ulogd'])
        else:   
                logger.log('drl: installing DistributedRateLimiting into %s slice' % slice_name)
-               logger.log_call('vserver', '%s' % slice_name, 'suexec', '0', 'yum', 'update', '-y', '-q', 'DistributedRateLimiting')
+               logger.log_call(['vserver', '%s' % slice_name, 'suexec', '0', 'yum', 'update', '-y', '-q', 'DistributedRateLimiting'])
                
        logger.log('drl: (re)starting DistributedRateLimiting service')
-       logger.log_call('vserver', '%s' % slice_name, 'suexec', '0', 'service', 'ulogd', 'restart')
+       logger.log_call(['vserver', '%s' % slice_name, 'suexec', '0', 'service', 'ulogd', 'restart'])
 
 
 def GetSlivers(data, conf = None, plc = None):
@@ -83,7 +81,7 @@ def GetSlivers(data, conf = None, plc = None):
                q = plc.GetSites({'site_id': site_id, 'enabled': True, 'peer_site_id': None}, ['name', 'node_ids'])
                for i in q:
                        if i['node_ids'] != [] and len(i['node_ids']) > 1:
-                               z = plc.GetNodeNetworks({'node_id': i['node_ids'], 'is_primary': True, '~bwlimit': None}, ['node_id', 'ip', 'bwlimit'])
+                               z = plc.GetInterfaces({'node_id': i['node_ids'], 'is_primary': True, '~bwlimit': None}, ['node_id', 'ip', 'bwlimit'])
                                total_bwlimit = 0
                                peer = ''
                                node_has_bwlimit = 0