~maas-committers/maas/trunk

Viewing changes to src/maasserver/tests/test_commands_edit_named_options.py

Committer: MAAS Lander
Author(s): Mike Pontillo
Date: 2015-07-09 23:02:10 UTC
mfrom: (4078.2.3 dns-template-changes-trunk)
Revision ID: maas_lander-20150709230210-s3ok0jtp21zwyg9x

[r=rvb,andreserl][bug=1413388][author=mpontillo] Allow users to define allow-* parameters in named.conf.options; prevent writing them to named.conf.options.inside.maas in that case.

files renamed:
src/maasserver/utils/isc.py => src/provisioningserver/utils/isc.py

src/maasserver/utils/tests/test_isc.py => src/provisioningserver/utils/tests/test_isc.py

files modified:
etc/maas/templates/dns/named.conf.options.inside.maas.template

src/maasserver/management/commands/edit_named_options.py

src/maasserver/tests/test_commands_edit_named_options.py

src/provisioningserver/dns/config.py

src/provisioningserver/dns/testing.py

src/provisioningserver/dns/tests/test_config.py

Show diffs side-by-side

added added

removed removed

src/maasserver/tests/test_commands_edit_named_options.py

from maasserver.testing.factory import factory

from maasserver.testing.testcase import MAASServerTestCase

from maasserver.utils import get_one

from maasserver.utils.isc import (

from provisioningserver.dns.config import MAAS_NAMED_CONF_OPTIONS_INSIDE_NAME

from provisioningserver.utils.isc import (

make_isc_string,

parse_isc_string,

read_isc_file,

)

from provisioningserver.dns.config import MAAS_NAMED_CONF_OPTIONS_INSIDE_NAME

from testtools.matchers import (

Contains,

Equals,

Older »