← Back to branch summary

~matsubara/maas/remove-network-config-hack

« back to all changes in this revision

Viewing changes to maas-integration.py

  • Committer: Diogo Matsubara
  • Date: 2014-02-27 19:35:59 UTC
  • mto: This revision was merged to the branch mainline in revision 236.
  • Revision ID: diogo.matsubara@canonical.com-20140227193559-oxqbocu4vav8qhjo
remove update_pxe_config since it's not doing anything anymore

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,
24
 
    HTTP_PROXY, get_maas_revision, retries,
 
23
    CLUSTER_CONTROLLER_IP, SQUID_DEB_PROXY_URL, HTTP_PROXY,
 
24
    get_maas_revision, retries,
25
25
    )
26
26
 
27
27
sys.path.insert(0, "/usr/share/maas")
199
199
    "test_update_maas_url",
200
200
    "test_restart_provisioning_server",
201
201
    "test_check_initial_services",
202
 
    "test_update_pxe_config",
203
202
    "test_import_pxe_files",
204
203
    "test_update_preseed_arm",
205
204
    "test_login_api",
316
315
        assertStartedUpstartService(
317
316
            self, 'maas-pserv', '/var/log/maas/pserv.log')
318
317
 
319
 
    def test_update_pxe_config(self):
320
 
        update_pxe_config()
321
 
 
322
318
    def test_import_pxe_files(self):
323
319
        env = os.environ.copy()
324
320
        env['http_proxy'] = HTTP_PROXY