diff options
| author | Vincenzo Maffione <v.maffione@gmail.com> | 2017-04-21 23:12:42 +0200 |
|---|---|---|
| committer | Vincenzo Maffione <v.maffione@gmail.com> | 2017-04-21 23:45:06 +0200 |
| commit | e4662a39489067f0d352d270e25df3da6ff478d8 (patch) | |
| tree | 972cca8525819b26b633470b711e7a7e1ab280c9 /rumba/prototypes/irati.py | |
| parent | bec81866d4da33405c35c8eb4dc15d4fc5bfbfb7 (diff) | |
| download | rumba-e4662a39489067f0d352d270e25df3da6ff478d8.tar.gz rumba-e4662a39489067f0d352d270e25df3da6ff478d8.zip | |
model, prototypes: enrollment lists contain IPCP objects rather than Node ones
This fixes a conceptual bug, that was leading to unnecessary
workarounds in the prototype plugins.
All the plugins have been modified to use the correct format of
enrollment lists.
Diffstat (limited to 'rumba/prototypes/irati.py')
| -rw-r--r-- | rumba/prototypes/irati.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/rumba/prototypes/irati.py b/rumba/prototypes/irati.py index 958b4e8..346b39a 100644 --- a/rumba/prototypes/irati.py +++ b/rumba/prototypes/irati.py @@ -183,17 +183,18 @@ class Experiment(mod.Experiment): e_args = {'ldif': self.dif_name(e['lower_dif']), 'dif': e['dif'].name, - 'name': e['enrollee'].name, - 'o_name': e['enroller'].name} + 'nname': e['enrollee'].node.name, + 'iname': e['enrollee'].name, + 'o_iname': e['enroller'].name} cmd = self.sudo('enroll.py --lower-dif %(ldif)s --dif %(dif)s ' - '--ipcm-conf /etc/%(name)s.ipcm.conf ' - '--enrollee-name %(dif)s.%(name)s.IPCP ' - '--enroller-name %(dif)s.%(o_name)s.IPCP' + '--ipcm-conf /etc/%(nname)s.ipcm.conf ' + '--enrollee-name %(iname)s.IPCP ' + '--enroller-name %(o_iname)s.IPCP' % e_args) logger.info('Sending enrollment operation via ssh.') ssh.execute_command(self.testbed, - e['enrollee'].ssh_config, + e['enrollee'].node.ssh_config, cmd) def dif_name(self, dif): |