← Back to branch summary

~blake-rouse/maas/is-importing-2.1

« back to all changes in this revision

Viewing changes to src/provisioningserver/tests/test_kernel_opts.py

  • Committer: LaMont Jones
  • Date: 2016-12-07 12:59:10 UTC
  • mfrom: (5561 2.1)
  • mto: This revision was merged to the branch mainline in revision 5563.
  • Revision ID: lamont@canonical.com-20161207125910-fow7gg8v9bo0s1iq
merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/provisioningserver/tests/test_kernel_opts.py
214
214
                "ip=off",
215
215
                "ip6=dhcp"]))
216
216
 
 
217
    def test_xinstall_compose_kernel_command_line_inc_cc_datasource(self):
 
218
        # The result of compose_kernel_command_line includes the cloud-init
 
219
        # options for the datasource and cloud-config-url
 
220
        params = self.make_kernel_parameters(
 
221
            purpose="xinstall", fs_host=factory.make_ipv4_address())
 
222
        cmdline = compose_kernel_command_line(params)
 
223
        self.assertThat(
 
224
            cmdline,
 
225
            ContainsAll([
 
226
                "cc:{'datasource_list': ['MAAS']}end_cc",
 
227
                "cloud-config-url=%s" % params.preseed_url]))
 
228
 
217
229
    def test_commissioning_compose_kernel_command_line_inc_purpose_opts4(self):
218
230
        # The result of compose_kernel_command_line includes the purpose
219
231
        # options for a non "commissioning" node.
244
256
                "ip=off",
245
257
                "ip6=dhcp"]))
246
258
 
 
259
    def test_commissioning_compose_kernel_command_line_inc_cc_datasource(self):
 
260
        # The result of compose_kernel_command_line includes the cloud-init
 
261
        # options for the datasource and cloud-config-url
 
262
        params = self.make_kernel_parameters(
 
263
            purpose="commissioning", fs_host=factory.make_ipv4_address())
 
264
        cmdline = compose_kernel_command_line(params)
 
265
        self.assertThat(
 
266
            cmdline,
 
267
            ContainsAll([
 
268
                "cc:{'datasource_list': ['MAAS']}end_cc",
 
269
                "cloud-config-url=%s" % params.preseed_url]))
 
270
 
247
271
    def test_enlist_compose_kernel_command_line_inc_purpose_opts4(self):
248
272
        # The result of compose_kernel_command_line includes the purpose
249
273
        # options for a non "commissioning" node.
274
298
                "ip=off",
275
299
                "ip6=dhcp"]))
276
300
 
 
301
    def test_enlist_compose_kernel_command_line_inc_cc_datasource(self):
 
302
        # The result of compose_kernel_command_line includes the cloud-init
 
303
        # options for the datasource and cloud-config-url
 
304
        params = self.make_kernel_parameters(
 
305
            purpose="enlist", fs_host=factory.make_ipv4_address())
 
306
        cmdline = compose_kernel_command_line(params)
 
307
        self.assertThat(
 
308
            cmdline,
 
309
            ContainsAll([
 
310
                "cc:{'datasource_list': ['MAAS']}end_cc",
 
311
                "cloud-config-url=%s" % params.preseed_url]))
 
312
 
277
313
    def test_commissioning_compose_kernel_command_line_inc_extra_opts(self):
278
314
        mock_get_curtin_sep = self.patch(
279
315
            kernel_opts, 'get_curtin_kernel_cmdline_sep')