diff options
| author |   Dan Prince <dprince@redhat.com> | 2014-06-26 10:14:31 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2014-06-26 10:14:31 -0400 |
| commit | 4c2e97b30ef1bac4e5e9229bce5425536466d122 (patch) | |
| tree | c07cc662a7c66ad9b7ed0381dde8ccb66a6836b7 /os_net_config/tests | |
| parent | 9158f47c3cf95a97c38daaf12540bda770cc74f3 (diff) | |
Consolidate OVS_EXTRA for the vlan test.
Consolidates the test data into a single string block for the
ovs vlan port test string.
Diffstat (limited to 'os_net_config/tests')
| -rw-r--r-- | os_net_config/tests/test_impl_ifcfg.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/os_net_config/tests/test_impl_ifcfg.py b/os_net_config/tests/test_impl_ifcfg.py index 1c64abb..fa1efdb 100644 --- a/os_net_config/tests/test_impl_ifcfg.py +++ b/os_net_config/tests/test_impl_ifcfg.py @@ -76,13 +76,14 @@ _VLAN_NO_IP = _BASE_VLAN + "BOOTPROTO=none\n" _VLAN_OVS = _BASE_VLAN + "DEVICETYPE=ovs\nBOOTPROTO=none\n" -VLAN_EXTRA = "\"set Interface $DEVICE external-ids:iface-id=$(hostname -s" + \ - ")-$DEVICE-vif\"\n" _VLAN_OVS_BRIDGE = _BASE_VLAN + """DEVICETYPE=ovs TYPE=OVSIntPort OVS_BRIDGE=br-ctlplane OVS_OPTIONS="tag=5" -OVS_EXTRA=""" + VLAN_EXTRA + "BOOTPROTO=none\n" +OVS_EXTRA=\"set Interface $DEVICE external-ids:iface-id=$(hostname -s\ +)-$DEVICE-vif\" +BOOTPROTO=none +""" class TestIfcfgNetConfig(base.TestCase): |