5:22 a.m.
repo: git://git.baserock.org/baserock/baserock/morph
branch: baserock/tiagogomes/vbox-networking
commit: f05e48287f71d91161e2aa24f31e0659e0c7b91e
To test this patch is necessary to add the simple-network configuration extension to the
testing image.
Tiago Gomes (1):
Improve network setup of the virtualbox write extension.
morphlib/exts/virtualbox-ssh.write | 47 ++++++++++++++++++++++++++++++++++--
1 file changed, 45 insertions(+), 2 deletions(-)
--
1.7.10.4
5:22 a.m.
New subject: [PATCH] Improve network setup of the virtualbox write extension.
The VirtualBox deployment write extension will configure networking in
the following manner:
- One host-only network interface will be used to group the virtual
machines together (and to give access between the host and the virtual
machines). It will be bound to eth0 of the virtual machine.
- One NAT (or Bridge) network interface will be used to allow the
virtual machines access to the wider network. This will be bound to eth1
of the virtual machine.
---
morphlib/exts/virtualbox-ssh.write | 47 ++++++++++++++++++++++++++++++++++--
1 file changed, 45 insertions(+), 2 deletions(-)
diff --git a/morphlib/exts/virtualbox-ssh.write b/morphlib/exts/virtualbox-ssh.write
index cb17b69..b9a6cd4 100755
--- a/morphlib/exts/virtualbox-ssh.write
+++ b/morphlib/exts/virtualbox-ssh.write
@@ -109,16 +109,19 @@ class
VirtualBoxPlusSshWriteExtension(morphlib.writeexts.WriteExtension):
def create_virtualbox_guest(self, ssh_host, vm_name, vdi_path, autostart):
'''Create the VirtualBox virtual machine.'''
-
+
self.status(msg='Create VirtualBox virtual machine')
ram_mebibytes = str(self.get_ram_size() / (1024**2))
+ hostonly_iface = self.get_host_interface(ssh_host)
+
commands = [
['createvm', '--name', vm_name, '--ostype',
'Linux26_64',
'--register'],
['modifyvm', vm_name, '--ioapic', 'on',
'--memory', ram_mebibytes,
- '--nic1', 'nat'],
+ '--nic1', 'hostonly', '--hostonlyadapter1',
hostonly_iface,
+ '--nic2', 'nat', '--natnet2', 'default'],
['storagectl', vm_name, '--name', '"SATA
Controller"',
'--add', 'sata', '--bootable', 'on',
'--sataportcount', '2'],
['storageattach', vm_name, '--storagectl', '"SATA
Controller"',
@@ -143,6 +146,46 @@ class
VirtualBoxPlusSshWriteExtension(morphlib.writeexts.WriteExtension):
argv = ['ssh', ssh_host, 'VBoxManage'] + command
cliapp.runcmd(argv)
+ def get_host_interface(self, ssh_host):
+ host_ipaddr = os.environ.get('HOST_IPADDR')
+ netmask = os.environ.get('NETMASK')
+ network_config = os.environ.get("NETWORK_CONFIG")
+
+ if network_config is None:
+ raise cliapp.AppException('NETWORK_CONFIG was not given')
+
+ if "eth0:" not in network_config:
+ raise cliapp.AppException('NETWORK_CONFIG does not contain ' + \
+ 'the eth0 configuration')
+
+ if "eth1:" not in network_config:
+ raise cliapp.AppException('NETWORK_CONFIG does not contain ' + \
+ 'the eth1 configuration')
+
+ if host_ipaddr is None:
+ raise cliapp.AppException('HOST_IPADDR was not given')
+
+ if netmask is None:
+ raise cliapp.AppException('NETMASK was not given')
+
+ iface = cliapp.runcmd(
+ ['ssh', ssh_host, 'VBoxManage', 'list',
'hostonlyifs'],
+ ['grep', '-B', '3', host_ipaddr],
+ ['head', '-n', '1'],
+ ['sed', 's/.* //'],
+ ['tr', '-d', '\n'])
+
+ if not iface:
+ iface = cliapp.runcmd(
+ ['ssh', ssh_host, 'VBoxManage', 'hostonlyif',
'create'])
+ iface = iface[iface.find("'") + 1 :
iface.rfind("'")]
+ cliapp.runcmd(
+ ['ssh', ssh_host, 'VBoxManage', 'hostonlyif',
+ 'ipconfig', iface,
+ '--ip', host_ipaddr,
+ '--netmask', netmask])
+
+ return iface
VirtualBoxPlusSshWriteExtension().run()
--
1.7.10.4
5:39 a.m.
New subject: [PATCH] Improve network setup of the virtualbox write extension.
On Thu, May 30, 2013 at 11:22:53AM +0100, Tiago Gomes wrote:
+ '--nic1', 'hostonly',
'--hostonlyadapter1', hostonly_iface,
+ '--nic2', 'nat', '--natnet2', 'default'],
This hard-codes the VirtualBox network name natnet2. Is that network always there,
and always the one we should be using? Or should we create that too, if it's missing?
+ if "eth0:" not in network_config:
+ raise cliapp.AppException('NETWORK_CONFIG does not contain ' + \
+ 'the eth0 configuration')
Minor Python formatting nitpick: the above would be better formatted as:
if "eth0:" not in network_config:
raise cliapp.AppException(
'NETWORK_CONFIG does not contain the eth0 '
'configuration')
Python string literals have implicit concatenation, and breaking the
lines as above is easier to read, I find, since it allows more text
per line of source code.
In any case, the backslash is not necessary for line continuation,
since Python doesn't mind expressions within parentheses to be
continued to the next line.
+ iface = cliapp.runcmd(
+ ['ssh', ssh_host, 'VBoxManage', 'list',
'hostonlyifs'],
+ ['grep', '-B', '3', host_ipaddr],
+ ['head', '-n', '1'],
+ ['sed', 's/.* //'],
+ ['tr', '-d', '\n'])
I'd prefer this kind of thing to be running only one external command
(in this case, with cliapp.ssh_runcmd), and then do the string parsing
in Python. But if this works, it's OK to leave it as is. However, a
comment explaining what is happening, and maybe what the expected
output for "VBoxManage list hostonlyifs" is would be good, for the sake
of the next person to modify the code (which might happen after VBoxManage
changes it output format).
--
http://www.codethink.co.uk/ http://wiki.baserock.org/ http://www.baserock.com/
5:56 a.m.
New subject: [PATCH] Improve network setup of the virtualbox write extension.
On 30/05/13 11:39, Lars Wirzenius wrote:
On Thu, May 30, 2013 at 11:22:53AM +0100, Tiago Gomes wrote:
> + '--nic1', 'hostonly', '--hostonlyadapter1',
hostonly_iface,
> + '--nic2', 'nat', '--natnet2',
'default'],
This hard-codes the VirtualBox network name natnet2. Is that network always there,
and always the one we should be using? Or should we create that too, if it's missing?
I didn't find any information about the natnet option in the vboxmanage
manual. However I tested the network and it worked fine.
> + if "eth0:" not in network_config:
> + raise cliapp.AppException('NETWORK_CONFIG does not contain ' +
\
> + 'the eth0 configuration')
Minor Python formatting nitpick: the above would be better formatted as:
if "eth0:" not in network_config:
raise cliapp.AppException(
'NETWORK_CONFIG does not contain the eth0 '
'configuration')
Python string literals have implicit concatenation, and breaking the
lines as above is easier to read, I find, since it allows more text
per line of source code.
In any case, the backslash is not necessary for line continuation,
since Python doesn't mind expressions within parentheses to be
continued to the next line.
Ok, I'll change that.
> + iface = cliapp.runcmd(
> + ['ssh', ssh_host, 'VBoxManage', 'list',
'hostonlyifs'],
> + ['grep', '-B', '3', host_ipaddr],
> + ['head', '-n', '1'],
> + ['sed', 's/.* //'],
> + ['tr', '-d', '\n'])
I'd prefer this kind of thing to be running only one external command
(in this case, with cliapp.ssh_runcmd), and then do the string parsing
in Python. But if this works, it's OK to leave it as is. However, a
comment explaining what is happening, and maybe what the expected
output for "VBoxManage list hostonlyifs" is would be good, for the sake
of the next person to modify the code (which might happen after VBoxManage
changes it output format).
I'll add a comment.
3541
days inactive
3541
days old
3 comments
2 participants
participants (2)
-
Lars Wirzenius -
Tiago Gomes