[node-patches] Change in ovirt-node[master]: [DRAFT] network: Direct layout as default
fabiand at fedoraproject.org
fabiand at fedoraproject.org
Fri Jun 14 10:35:51 UTC 2013
Fabian Deutsch has uploaded a new change for review.
Change subject: [DRAFT] network: Direct layout as default
......................................................................
[DRAFT] network: Direct layout as default
Previously the bridged layout was the defautl layout, now the direct
layout is choosen by default.
Additionally this patch replaces the previously used "topology" term
with "layout".
Change-Id: I18db279b5f60e4eb70971e539b3fa7f9a0a8ff8e
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
---
M scripts/ovirt-init-functions.sh.in
M src/ovirt/node/config/defaults.py
M src/ovirt/node/setup/core/network_page.py
M tests/nose/network_config.py
4 files changed, 25 insertions(+), 21 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/13/15713/1
diff --git a/scripts/ovirt-init-functions.sh.in b/scripts/ovirt-init-functions.sh.in
index 41e45ac..505a628 100644
--- a/scripts/ovirt-init-functions.sh.in
+++ b/scripts/ovirt-init-functions.sh.in
@@ -334,7 +334,7 @@
# dns=server[,server]
# ntp=server[,server]
# vlan=id
- # network_topology=bridged|direct
+ # network_layout=bridged|direct
# static network configuration
ip_address=
ip_gateway=
@@ -345,7 +345,7 @@
ipv6=
dns=
ntp=
- network_topology=
+ network_layout=
# ssh_pwauth=[0|1]
ssh_pwauth=
@@ -625,8 +625,8 @@
ntp=*)
ntp=${i#ntp=}
;;
- network_topology=*)
- network_topology=${i#network_topology=}
+ network_layout=*)
+ network_layout=${i#network_layout=}
;;
hostname=*)
hostname=${i#hostname=}
@@ -755,7 +755,7 @@
# save boot parameters as defaults for ovirt-config-*
- params="bootif init init_app vol_boot_size vol_efi_size vol_swap_size vol_root_size vol_config_size vol_logging_size vol_data_size vol_swap2_size vol_data2_size crypt_swap crypt_swap2 upgrade standalone overcommit ip_address ip_netmask ip_gateway ipv6 dns ntp vlan ssh_pwauth syslog_server syslog_port collectd_server collectd_port bootparams hostname firstboot runtime_mode kdump_nfs iscsi_name snmp_password install netconsole_server netconsole_port stateless cim_enabled wipe_fakeraid iscsi_init iscsi_target_name iscsi_target_host iscsi_target_port iscsi_install network_topology"
+ params="bootif init init_app vol_boot_size vol_efi_size vol_swap_size vol_root_size vol_config_size vol_logging_size vol_data_size vol_swap2_size vol_data2_size crypt_swap crypt_swap2 upgrade standalone overcommit ip_address ip_netmask ip_gateway ipv6 dns ntp vlan ssh_pwauth syslog_server syslog_port collectd_server collectd_port bootparams hostname firstboot runtime_mode kdump_nfs iscsi_name snmp_password install netconsole_server netconsole_port stateless cim_enabled wipe_fakeraid iscsi_init iscsi_target_name iscsi_target_host iscsi_target_port iscsi_install network_layout"
# mount /config unless firstboot is forced
if [ "$firstboot" != "1" ]; then
mount_config
diff --git a/src/ovirt/node/config/defaults.py b/src/ovirt/node/config/defaults.py
index c847bcc..bdc0dd6 100644
--- a/src/ovirt/node/config/defaults.py
+++ b/src/ovirt/node/config/defaults.py
@@ -310,11 +310,11 @@
def commit(self):
m = Network().retrieve()
aug = AugeasWrapper()
- topology = NetworkTopology().retrieve()["topology"]
- if topology == "direct":
- self.__write_direct_config()
- else:
+ topology = NetworkLayout().retrieve()["topology"]
+ if topology == "bridged":
self.__write_bridged_config()
+ else:
+ self.__write_direct_config()
has_network = "yes" if m["iface"] else "no"
aug.set("/files/etc/sysconfig/network/NETWORKING",
@@ -420,30 +420,30 @@
return tx
-class NetworkTopology(NodeConfigFileSection):
+class NetworkLayout(NodeConfigFileSection):
"""Sets the network topology
- OVIRT_NETWORK_TOPOLOGY
>>> from ovirt.node.utils import fs
- >>> n = NetworkTopology(fs.FakeFs.File("dst"))
- >>> n.update("legacy")
+ >>> n = NetworkLayout(fs.FakeFs.File("dst"))
+ >>> n.update("bridged")
>>> sorted(n.retrieve().items())
- [('topology', 'legacy')]
+ [('topology', 'bridged')]
"""
- keys = ("OVIRT_NETWORK_TOPOLOGY",)
- known_topologies = ["legacy",
- # Legacy way, a bridge is created for BOOTIF
+ keys = ("OVIRT_NETWORK_LAYOUT",)
+ known_topologies = ["bridged",
+ # bridged way, a bridge is created for BOOTIF
"direct"
# The BOOTIF NIC is configured directly
]
@NodeConfigFileSection.map_and_update_defaults_decorator
- def update(self, topology="legacy"):
+ def update(self, topology):
assert topology in self.known_topologies
def configure_bridged(self):
- return self.update("legacy")
+ return self.update("bridged")
def configure_direct(self):
return self.update("direct")
diff --git a/src/ovirt/node/setup/core/network_page.py b/src/ovirt/node/setup/core/network_page.py
index ce0da1b..d1313a8 100644
--- a/src/ovirt/node/setup/core/network_page.py
+++ b/src/ovirt/node/setup/core/network_page.py
@@ -322,7 +322,7 @@
else:
self.logger.debug("No ipv6 interface configuration found")
- mt = defaults.NetworkTopology()
+ mt = defaults.NetworkLayout()
if layout_bridged:
mt.configure_bridged()
diff --git a/tests/nose/network_config.py b/tests/nose/network_config.py
index 0eb77f1..faba753 100644
--- a/tests/nose/network_config.py
+++ b/tests/nose/network_config.py
@@ -67,7 +67,9 @@
"""Test BridgedNIC with DHCP configuration file creation
"""
m = defaults.Network()
+ mt = defaults.NetworkLayout()
+ mt.configure_bridged()
m.configure_dhcp("eth0")
run_tx_by_name(m.transaction(), "WriteConfiguration")
@@ -85,7 +87,9 @@
"""Test BridgedNIC with static IP configuration file creation
"""
m = defaults.Network()
+ mt = defaults.NetworkLayout()
+ mt.configure_bridged()
m.configure_static("ens1", "192.168.122.42", "255.255.255.0",
"192.168.122.1", None)
@@ -123,7 +127,7 @@
def test_dhcp(self, *args, **kwargs):
"""Test bridgeless with DHCP configuration file creation
"""
- mt = defaults.NetworkTopology()
+ mt = defaults.NetworkLayout()
mt.configure_direct()
m = defaults.Network()
@@ -142,7 +146,7 @@
def test_static(self, *args, **kwargs):
"""Test bridgeless with static IP configuration file creation
"""
- mt = defaults.NetworkTopology()
+ mt = defaults.NetworkLayout()
mt.configure_direct()
m = defaults.Network()
--
To view, visit http://gerrit.ovirt.org/15713
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I18db279b5f60e4eb70971e539b3fa7f9a0a8ff8e
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Fabian Deutsch <fabiand at fedoraproject.org>
More information about the node-patches
mailing list