← Back to branch summary

~rvb/maas/qa-lab-tests-1.6

« back to all changes in this revision

Viewing changes to maas-integration.py

  • Committer: Raphael Badin
  • Date: 2014-01-21 13:34:28 UTC
  • mfrom: (229.1.9 tolerate-no-avahi)
  • Revision ID: raphael.badin@canonical.com-20140121133428-7314olvw0sv1309y
[r=matsubara][bug=][author=rvb] Do not restart the Avahi daemon for recent versions of MAAS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
maas-integration.py
20
20
from utils import (
21
21
    assertCommandReturnCode, assertStartedUpstartService,
22
22
    change_logs_permissions, is_juju_core, run_command, timeout,
23
 
    update_pxe_config, CLUSTER_CONTROLLER_IP, SQUID_DEB_PROXY_URL, HTTP_PROXY
 
23
    update_pxe_config, CLUSTER_CONTROLLER_IP, SQUID_DEB_PROXY_URL,
 
24
    HTTP_PROXY, get_maas_revision,
24
25
    )
25
26
 
26
27
sys.path.insert(0, "/usr/share/maas")
257
258
        # No output, means admin user was created successfully.
258
259
        self.assertEqual(cmd_output, None)
259
260
 
 
261
    # Since revision 1828, MAAS doesn't use avahi/dbus anymore so
 
262
    # we do not need to restart these daemons.
 
263
    @unittest.skipIf(
 
264
        get_maas_revision() >= 1828, "Avahi/DBUS are not used anymore")
260
265
    def test_restart_dbus_avahi(self):
261
 
        """XXX: matsubara bug=1065775 """
262
266
        cmd = ["service", "dbus", "restart"]
263
267
        expected_output = 'dbus start/running'
264
268
        assertCommandReturnCode(self, cmd, expected_output)
265
 
 
266
269
        cmd = ["service", "avahi-daemon", "restart"]
267
270
        expected_output = 'avahi-daemon start/running'
268
271
        assertCommandReturnCode(self, cmd, expected_output)
410
413
            "router_ip": "192.168.21.1",
411
414
            "management": 2,
412
415
            "ip_range_low": "192.168.21.10",
413
 
            "ip_range_high": "192.168.21.30"}
 
416
            "ip_range_high": "192.168.21.200"}
414
417
 
415
418
        self._set_up_dhcp(region_uuid, region_dhcp_config)
416
419