~ltrager/maas/remove_di_from_kernel

~ltrager/maas/remove_di_from_kernel_opts

« back to all changes in this revision

Viewing changes to src/maasserver/models/tests/test_vlan.py

Committer: Lee Trager
Date: 2016-10-22 06:06:12 UTC
mfrom: (5457.1.44 maas)
Revision ID: lee.trager@canonical.com-20161022060612-ukar20f6ffs45nas

Merge trunk

files added:
src/maasserver/static/js/angular/directives/ipranges.js

src/maasserver/static/js/angular/directives/tests/test_ipranges.js

src/maasserver/static/partials/ipranges.html

src/provisioningserver/logger/testing

src/provisioningserver/logger/testing/__init__.py

src/provisioningserver/logger/testing/logsomething.py

src/provisioningserver/utils/snappy.py

src/provisioningserver/utils/tests/test_snappy.py

utilities/find-early-imports

files removed:
src/provisioningserver/testing/testcase.py

files modified:
.idea/maas.iml

Makefile

buildout.cfg

contrib/preseeds_v2/curtin_userdata

docs/sstreams-mirror.rst

setup.py

src/maas/__init__.py

src/maas/development.py

src/maas/settings.py

src/maasserver/__init__.py

src/maasserver/api/account.py

src/maasserver/api/blockdevices.py

src/maasserver/api/devices.py

src/maasserver/api/interfaces.py

src/maasserver/api/ip_addresses.py

src/maasserver/api/ipranges.py

src/maasserver/api/machines.py

src/maasserver/api/rackcontrollers.py

src/maasserver/api/regioncontrollers.py

src/maasserver/api/tests/test_api.py

src/maasserver/api/tests/test_blockdevice.py

src/maasserver/api/tests/test_enlistment.py

src/maasserver/api/tests/test_interfaces.py

src/maasserver/api/tests/test_ipaddresses.py

src/maasserver/api/tests/test_machine.py

src/maasserver/api/tests/test_node.py

src/maasserver/api/tests/test_rackcontroller.py

src/maasserver/api/tests/test_subnets.py

src/maasserver/api/tests/test_utils.py

src/maasserver/api/utils.py

src/maasserver/clusterrpc/power_parameters.py

src/maasserver/clusterrpc/tests/test_power_parameters.py

src/maasserver/config_forms.py

src/maasserver/dhcp.py

src/maasserver/dns/tests/test_zonegenerator.py

src/maasserver/dns/zonegenerator.py

src/maasserver/forms.py

src/maasserver/forms_interface.py

src/maasserver/forms_iprange.py

src/maasserver/management/commands/apikey.py

src/maasserver/models/discovery.py

src/maasserver/models/iprange.py

src/maasserver/models/migrations/create_default_storage_layout.py

src/maasserver/models/node.py

src/maasserver/models/partition.py

src/maasserver/models/partitiontable.py

src/maasserver/models/staticipaddress.py

src/maasserver/models/subnet.py

src/maasserver/models/tests/test_blockdevice.py

src/maasserver/models/tests/test_interface.py

src/maasserver/models/tests/test_iprange.py

src/maasserver/models/tests/test_node.py

src/maasserver/models/tests/test_partition.py

src/maasserver/models/tests/test_partitiontable.py

src/maasserver/models/tests/test_staticipaddress.py

src/maasserver/models/tests/test_subnet.py

src/maasserver/models/tests/test_template.py

src/maasserver/models/tests/test_vlan.py

src/maasserver/models/user.py

src/maasserver/models/userprofile.py

src/maasserver/models/vlan.py

src/maasserver/plugin.py

src/maasserver/populate_tags.py

src/maasserver/preseed.py

src/maasserver/preseed_storage.py

src/maasserver/rpc/nodes.py

src/maasserver/rpc/rackcontrollers.py

src/maasserver/rpc/regionservice.py

src/maasserver/rpc/tests/test_nodes.py

src/maasserver/rpc/tests/test_rackcontrollers.py

src/maasserver/rpc/tests/test_regionservice.py

src/maasserver/service_monitor.py

src/maasserver/static/js/angular/controllers/node_details_networking.js

src/maasserver/static/js/angular/controllers/node_details_storage.js

src/maasserver/static/js/angular/controllers/nodes_list.js

src/maasserver/static/js/angular/controllers/subnet_details.js

src/maasserver/static/js/angular/controllers/tests/test_node_details_networking.js

src/maasserver/static/js/angular/controllers/tests/test_node_details_storage.js

src/maasserver/static/js/angular/controllers/tests/test_nodes_list.js

src/maasserver/static/js/angular/controllers/tests/test_subnet_details.js

src/maasserver/static/js/angular/controllers/tests/test_vlan_details.js

src/maasserver/static/js/angular/controllers/vlan_details.js

src/maasserver/static/js/angular/directives/boot_images.js

src/maasserver/static/js/angular/directives/tests/test_boot_images.js

src/maasserver/static/js/angular/factories/nodes.js

src/maasserver/static/js/angular/factories/subnets.js

src/maasserver/static/js/angular/factories/tests/test_nodes.js

src/maasserver/static/js/angular/factories/tests/test_subnets.js

src/maasserver/static/js/angular/maas.js

src/maasserver/static/partials/boot-images.html

src/maasserver/static/partials/dashboard.html

src/maasserver/static/partials/node-details.html

src/maasserver/static/partials/nodes-list.html

src/maasserver/static/partials/subnet-details.html

src/maasserver/templates/maasserver/prefs.html

src/maasserver/testing/factory.py

src/maasserver/tests/test_commands.py

src/maasserver/tests/test_config_forms.py

src/maasserver/tests/test_forms_blockdevice.py

src/maasserver/tests/test_forms_controller.py

src/maasserver/tests/test_forms_interface.py

src/maasserver/tests/test_forms_interface_link.py

src/maasserver/tests/test_forms_machine.py

src/maasserver/tests/test_plugin.py

src/maasserver/tests/test_populate_tags.py

src/maasserver/tests/test_preseed.py

src/maasserver/tests/test_preseed_storage.py

src/maasserver/triggers/system.py

src/maasserver/triggers/tests/test_system_listener.py

src/maasserver/triggers/tests/test_websocket.py

src/maasserver/triggers/tests/test_websocket_listener.py

src/maasserver/triggers/websocket.py

src/maasserver/urls_api.py

src/maasserver/utils/dns.py

src/maasserver/utils/keys.py

src/maasserver/utils/tests/test_dns.py

src/maasserver/utils/tests/test_keys.py

src/maasserver/utils/tests/test_views.py

src/maasserver/utils/threads.py

src/maasserver/utils/views.py

src/maasserver/views/combo.py

src/maasserver/websockets/handlers/bootresource.py

src/maasserver/websockets/handlers/config.py

src/maasserver/websockets/handlers/device.py

src/maasserver/websockets/handlers/dhcpsnippet.py

src/maasserver/websockets/handlers/general.py

src/maasserver/websockets/handlers/machine.py

src/maasserver/websockets/handlers/node.py

src/maasserver/websockets/handlers/packagerepository.py

src/maasserver/websockets/handlers/staticroute.py

src/maasserver/websockets/handlers/tests/test_bootresource.py

src/maasserver/websockets/handlers/tests/test_device.py

src/maasserver/websockets/handlers/tests/test_machine.py

src/maasserver/websockets/handlers/tests/test_vlan.py

src/maasserver/websockets/handlers/user.py

src/maasserver/websockets/handlers/vlan.py

src/maasserver/websockets/tests/test_base.py

src/provisioningserver/__init__.py

src/provisioningserver/config.py

src/provisioningserver/dhcp/config.py

src/provisioningserver/dhcp/testing/config.py

src/provisioningserver/dhcp/tests/test_config.py

src/provisioningserver/dhcp/tests/test_helper_notify.py

src/provisioningserver/diskless.py

src/provisioningserver/dns/tests/test_actions.py

src/provisioningserver/drivers/power/tests/test_amt.py

src/provisioningserver/import_images/tests/test_boot_resources.py

src/provisioningserver/logger/__init__.py

src/provisioningserver/logger/log.py

src/provisioningserver/logger/tests/test_logger.py

src/provisioningserver/monkey.py

src/provisioningserver/plugin.py

src/provisioningserver/power/schema.py

src/provisioningserver/rackdservices/tests/test_dhcp_probe_service.py

src/provisioningserver/rackdservices/tests/test_image_download_service.py

src/provisioningserver/rackdservices/tests/test_lease_socket_service.py

src/provisioningserver/rackdservices/tests/test_service_monitor_service.py

src/provisioningserver/refresh/node_info_scripts.py

src/provisioningserver/rpc/tests/test_boot_images.py

src/provisioningserver/rpc/tests/test_clusterservice.py

src/provisioningserver/rpc/tests/test_dhcp.py

src/provisioningserver/rpc/tests/test_utils.py

src/provisioningserver/service_monitor.py

src/provisioningserver/templates/commissioning-user-data/snippets/maas_api_helper.py

src/provisioningserver/templates/dhcp/dhcpd.conf.template

src/provisioningserver/templates/dhcp/dhcpd6.conf.template

src/provisioningserver/tests/test_diskless.py

src/provisioningserver/tests/test_monkey.py

src/provisioningserver/tests/test_plugin.py

src/provisioningserver/tests/test_service_monitor.py

src/provisioningserver/tests/test_tags.py

src/provisioningserver/utils/fs.py

src/provisioningserver/utils/isc.py

src/provisioningserver/utils/network.py

src/provisioningserver/utils/service_monitor.py

src/provisioningserver/utils/tests/test_fs.py

src/provisioningserver/utils/tests/test_network.py

src/provisioningserver/utils/tests/test_service_monitor.py

src/provisioningserver/utils/tests/test_twisted.py

src/provisioningserver/utils/twisted.py

utilities/check-imports

versions.cfg

Show diffs side-by-side

added added

removed removed

src/maasserver/models/tests/test_vlan.py

__all__ = []

import random

import re

from django.core.exceptions import ValidationError

from django.db.models import ProtectedError

from maasserver.testing.factory import factory

from maasserver.testing.testcase import MAASServerTestCase

from maasserver.utils.orm import reload_object

from testtools.matchers import (

Equals,

Is,

MatchesStructure,

)

from testtools.matchers import MatchesStructure

from testtools.testcase import ExpectedException

184

179

reload_object(subnet).vlan, fabric.get_default_vlan())

185

180

186

181

187

class TestVLANConfigureDHCP(MAASServerTestCase):

188

189

def _regex(self, string):

190

"""Returns an escaped regular expression for the given string, which

191

will match the given string anywhere in the input to the regex.

192

"""

193

return ".*" + re.escape(string) + ".*"

194

195

def test__unconfigures_dhcp(self):

196

primary = factory.make_RackController()

197

secondary = factory.make_RackController()

198

vlan = factory.make_VLAN()

199

vlan.dhcp_on = True

200

vlan.primary_rack = primary

201

vlan.secondary_rack = secondary

202

vlan.configure_dhcp([])

203

self.assertThat(vlan.dhcp_on, Equals(False))

204

self.assertThat(vlan.primary_rack, Is(None))

205

self.assertThat(vlan.secondary_rack, Is(None))

206

207

def test__configures_dhcp_with_one_controller(self):

208

primary = factory.make_RackController()

209

secondary = factory.make_RackController()

210

vlan = factory.make_VLAN()

211

vlan.dhcp_on = False

212

vlan.primary_rack = primary

213

vlan.secondary_rack = secondary

214

vlan.configure_dhcp([primary])

215

self.assertThat(vlan.dhcp_on, Equals(True))

216

self.assertThat(vlan.primary_rack, Is(primary))

217

self.assertThat(vlan.secondary_rack, Is(None))

218

219

def test__configures_dhcp_with_two_controllers(self):

220

primary = factory.make_RackController()

221

secondary = factory.make_RackController()

222

vlan = factory.make_VLAN()

223

vlan.configure_dhcp([primary, secondary])

224

self.assertThat(vlan.dhcp_on, Equals(True))

225

self.assertThat(vlan.primary_rack, Is(primary))

226

self.assertThat(vlan.secondary_rack, Is(secondary))

227

228

def test__rejects_non_list(self):

229

vlan = factory.make_VLAN()

230

with ExpectedException(

231

AssertionError, self._regex(VLAN.MUST_SPECIFY_LIST_ERROR)):

232

vlan.configure_dhcp(1)

233

234

def test__rejects_three_item_list(self):

235

rack1 = factory.make_RackController()

236

rack2 = factory.make_RackController()

237

rack3 = factory.make_RackController()

238

vlan = factory.make_VLAN()

239

with ExpectedException(

240

ValueError, self._regex(

241

VLAN.INVALID_NUMBER_OF_CONTROLLERS_ERROR % 3)):

242

vlan.configure_dhcp([rack1, rack2, rack3])

243

244

def test__rejects_list_with_duplicate_items(self):

245

rack = factory.make_RackController()

246

vlan = factory.make_VLAN()

247

with ExpectedException(

248

ValidationError, self._regex(VLAN.DUPLICATE_CONTROLLER_ERROR)):

249

vlan.configure_dhcp([rack, rack])

250

251

252

182

class TestVLANVidValidation(MAASServerTestCase):

253

183

254

184

scenarios = [

Older »