cloud-init-dev team mailing list archive

[Chad Smith <chad.smith@xxxxxxxxxxxxx>]

Review: Approve



Diff comments:

> diff --git a/tests/unittests/test_distros/test_netconfig.py b/tests/unittests/test_distros/test_netconfig.py
> index 8d0b263..9a62b71 100644
> --- a/tests/unittests/test_distros/test_netconfig.py
> +++ b/tests/unittests/test_distros/test_netconfig.py
> @@ -771,4 +772,46 @@ ifconfig_vtnet0="DHCP"
>              self.assertCfgEquals(expected_buf, str(write_buf))
>              self.assertEqual(write_buf.mode, 0o644)
>  
> +    def test_simple_write_oopensuse(self):
> +        """Opensuse network rendering writes appropriate sysconfg files."""
> +        tmpdir = self.tmp_dir()
> +        self.patchOS(tmpdir)

Ahh thanks for the tip here. Will do in the future.

> +        self.patchUtils(tmpdir)
> +        distro = self._get_distro('opensuse')
> +
> +        distro.apply_network(BASE_NET_CFG, False)
> +
> +        lo_path = os.path.join(tmpdir, 'etc/sysconfig/network/ifcfg-lo')
> +        eth0_path = os.path.join(tmpdir, 'etc/sysconfig/network/ifcfg-eth0')
> +        eth1_path = os.path.join(tmpdir, 'etc/sysconfig/network/ifcfg-eth1')
> +        expected_cfgs = {
> +            lo_path: dedent('''
> +                STARTMODE="auto"
> +                USERCONTROL="no"
> +                FIREWALL="no"
> +                '''),
> +            eth0_path: dedent('''
> +                BOOTPROTO="static"
> +                BROADCAST="192.168.1.0"
> +                GATEWAY="192.168.1.254"
> +                IPADDR="192.168.1.5"
> +                NETMASK="255.255.255.0"
> +                STARTMODE="auto"
> +                USERCONTROL="no"
> +                ETHTOOL_OPTIONS=""
> +                '''),
> +            eth1_path: dedent('''
> +                BOOTPROTO="dhcp"
> +                STARTMODE="auto"
> +                USERCONTROL="no"
> +                ETHTOOL_OPTIONS=""
> +                ''')
> +        }
> +        for cfgpath in (lo_path, eth0_path, eth1_path):
> +            self.assertCfgEquals(
> +                expected_cfgs[cfgpath],
> +                util.load_file(cfgpath))
> +            file_stat = os.stat(cfgpath)
> +            self.assertEqual(0o644, stat.S_IMODE(file_stat.st_mode))
> +
>  # vi: ts=4 expandtab


-- 
https://code.launchpad.net/~rjschwei/cloud-init/+git/cloud-init/+merge/333772
Your team cloud-init commiters is requested to review the proposed merge of ~rjschwei/cloud-init:baseNetConfTestSUSE into cloud-init:master.