launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #11593
[Merge] lp:~jtv/maas/dhcp_interfaces-plural into lp:maas
Jeroen T. Vermeulen has proposed merging lp:~jtv/maas/dhcp_interfaces-plural into lp:maas.
Requested reviews:
MAAS Maintainers (maas-maintainers)
For more details, see:
https://code.launchpad.net/~jtv/maas/dhcp_interfaces-plural/+merge/122611
As commanded by Julian.
Jeroen
--
https://code.launchpad.net/~jtv/maas/dhcp_interfaces-plural/+merge/122611
Your team MAAS Maintainers is requested to review the proposed merge of lp:~jtv/maas/dhcp_interfaces-plural into lp:maas.
=== modified file 'src/maasserver/management/commands/config_master_dhcp.py'
--- src/maasserver/management/commands/config_master_dhcp.py 2012-09-03 08:55:22 +0000
+++ src/maasserver/management/commands/config_master_dhcp.py 2012-09-04 04:53:22 +0000
@@ -32,7 +32,9 @@
dhcp_items = {
- 'dhcp_interface': "Network interface that should service DHCP requests.",
+ 'dhcp_interfaces':
+ "Space-separated list of network interfaces that should service "
+ "DHCP requests.",
'subnet_mask': "Subnet mask, e.g. 255.0.0.0",
'broadcast_ip': "Broadcast address for this subnet, e.g. 10.255.255.255",
'router_ip': "Address of default gateway.",
@@ -46,7 +48,7 @@
# Django is weird with null strings. Not all settings use None as the
# not-set value.
-clear_settings['dhcp_interface'] = ''
+clear_settings['dhcp_interfaces'] = ''
def get_settings(options):
=== added file 'src/maasserver/migrations/0020_nodegroup_dhcp_interfaces_is_plural.py'
--- src/maasserver/migrations/0020_nodegroup_dhcp_interfaces_is_plural.py 1970-01-01 00:00:00 +0000
+++ src/maasserver/migrations/0020_nodegroup_dhcp_interfaces_is_plural.py 2012-09-04 04:53:22 +0000
@@ -0,0 +1,163 @@
+# encoding: utf-8
+import datetime
+
+from django.db import models
+from south.db import db
+from south.v2 import SchemaMigration
+
+
+class Migration(SchemaMigration):
+
+ def forwards(self, orm):
+
+ # Renaming field 'NodeGroup.dhcp_interface' to
+ # 'NodeGroup.dhcp_interfaces'.
+ db.rename_column(
+ u'maasserver_nodegroup', 'dhcp_interface', 'dhcp_interfaces')
+
+ def backwards(self, orm):
+
+ # Renaming field 'NodeGroup.dhcp_interfaces' back to
+ # 'NodeGroup.dhcp_interface'.
+ db.rename_column(
+ u'maasserver_nodegroup', 'dhcp_interfaces', 'dhcp_interface')
+
+ models = {
+ 'auth.group': {
+ 'Meta': {'object_name': 'Group'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+ 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+ },
+ 'auth.permission': {
+ 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+ },
+ 'auth.user': {
+ 'Meta': {'object_name': 'User'},
+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+ },
+ 'contenttypes.contenttype': {
+ 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+ },
+ u'maasserver.config': {
+ 'Meta': {'object_name': 'Config'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+ 'value': ('maasserver.fields.JSONObjectField', [], {'null': 'True'})
+ },
+ u'maasserver.dhcplease': {
+ 'Meta': {'object_name': 'DHCPLease'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'ip': ('django.db.models.fields.IPAddressField', [], {'unique': 'True', 'max_length': '15'}),
+ 'mac': ('maasserver.fields.MACAddressField', [], {}),
+ 'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"})
+ },
+ u'maasserver.filestorage': {
+ 'Meta': {'object_name': 'FileStorage'},
+ 'data': ('django.db.models.fields.files.FileField', [], {'max_length': '255'}),
+ 'filename': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+ },
+ u'maasserver.macaddress': {
+ 'Meta': {'object_name': 'MACAddress'},
+ 'created': ('django.db.models.fields.DateTimeField', [], {}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'mac_address': ('maasserver.fields.MACAddressField', [], {'unique': 'True'}),
+ 'node': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.Node']"}),
+ 'updated': ('django.db.models.fields.DateTimeField', [], {})
+ },
+ u'maasserver.node': {
+ 'Meta': {'object_name': 'Node'},
+ 'after_commissioning_action': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+ 'architecture': ('django.db.models.fields.CharField', [], {'default': "u'i386'", 'max_length': '10'}),
+ 'created': ('django.db.models.fields.DateTimeField', [], {}),
+ 'error': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}),
+ 'hostname': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'netboot': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']", 'null': 'True'}),
+ 'owner': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}),
+ 'power_parameters': ('maasserver.fields.JSONObjectField', [], {'default': "u''", 'blank': 'True'}),
+ 'power_type': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '10', 'blank': 'True'}),
+ 'status': ('django.db.models.fields.IntegerField', [], {'default': '0', 'max_length': '10'}),
+ 'system_id': ('django.db.models.fields.CharField', [], {'default': "u'node-3458c900-f63e-11e1-a676-002608dc6120'", 'unique': 'True', 'max_length': '41'}),
+ 'token': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['piston.Token']", 'null': 'True'}),
+ 'updated': ('django.db.models.fields.DateTimeField', [], {})
+ },
+ u'maasserver.nodegroup': {
+ 'Meta': {'object_name': 'NodeGroup'},
+ 'api_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '18'}),
+ 'api_token': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['piston.Token']", 'unique': 'True'}),
+ 'broadcast_ip': ('django.db.models.fields.IPAddressField', [], {'default': "u''", 'max_length': '15', 'null': 'True', 'blank': 'True'}),
+ 'created': ('django.db.models.fields.DateTimeField', [], {}),
+ 'dhcp_interfaces': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}),
+ 'dhcp_key': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'ip_range_high': ('django.db.models.fields.IPAddressField', [], {'default': "u''", 'max_length': '15', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+ 'ip_range_low': ('django.db.models.fields.IPAddressField', [], {'default': "u''", 'max_length': '15', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+ 'router_ip': ('django.db.models.fields.IPAddressField', [], {'default': "u''", 'max_length': '15', 'null': 'True', 'blank': 'True'}),
+ 'subnet_mask': ('django.db.models.fields.IPAddressField', [], {'default': "u''", 'max_length': '15', 'null': 'True', 'blank': 'True'}),
+ 'updated': ('django.db.models.fields.DateTimeField', [], {}),
+ 'worker_ip': ('django.db.models.fields.IPAddressField', [], {'unique': 'True', 'max_length': '15'})
+ },
+ u'maasserver.sshkey': {
+ 'Meta': {'unique_together': "((u'user', u'key'),)", 'object_name': 'SSHKey'},
+ 'created': ('django.db.models.fields.DateTimeField', [], {}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'key': ('django.db.models.fields.TextField', [], {}),
+ 'updated': ('django.db.models.fields.DateTimeField', [], {}),
+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+ },
+ u'maasserver.userprofile': {
+ 'Meta': {'object_name': 'UserProfile'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'})
+ },
+ 'piston.consumer': {
+ 'Meta': {'object_name': 'Consumer'},
+ 'description': ('django.db.models.fields.TextField', [], {}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'key': ('django.db.models.fields.CharField', [], {'max_length': '18'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+ 'secret': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+ 'status': ('django.db.models.fields.CharField', [], {'default': "'pending'", 'max_length': '16'}),
+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'consumers'", 'null': 'True', 'to': "orm['auth.User']"})
+ },
+ 'piston.token': {
+ 'Meta': {'object_name': 'Token'},
+ 'callback': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+ 'callback_confirmed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'consumer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['piston.Consumer']"}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'is_approved': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'key': ('django.db.models.fields.CharField', [], {'max_length': '18'}),
+ 'secret': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+ 'timestamp': ('django.db.models.fields.IntegerField', [], {'default': '1346728280L'}),
+ 'token_type': ('django.db.models.fields.IntegerField', [], {}),
+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'tokens'", 'null': 'True', 'to': "orm['auth.User']"}),
+ 'verifier': ('django.db.models.fields.CharField', [], {'max_length': '10'})
+ }
+ }
+
+ complete_apps = ['maasserver']
=== modified file 'src/maasserver/models/nodegroup.py'
--- src/maasserver/models/nodegroup.py 2012-09-04 02:21:53 +0000
+++ src/maasserver/models/nodegroup.py 2012-09-04 04:53:22 +0000
@@ -45,7 +45,7 @@
def new(self, name, worker_ip, subnet_mask=None, broadcast_ip=None,
router_ip=None, ip_range_low=None, ip_range_high=None,
- dhcp_key='', dhcp_interface=''):
+ dhcp_key='', dhcp_interfaces=''):
"""Create a :class:`NodeGroup` with the given parameters.
This method will generate API credentials for the nodegroup's
@@ -56,7 +56,7 @@
from maasserver.worker_user import get_worker_user
dhcp_values = [
- dhcp_interface,
+ dhcp_interfaces,
subnet_mask,
broadcast_ip,
router_ip,
@@ -72,7 +72,7 @@
broadcast_ip=broadcast_ip, router_ip=router_ip,
ip_range_low=ip_range_low, ip_range_high=ip_range_high,
api_token=api_token, api_key=api_token.key, dhcp_key=dhcp_key,
- dhcp_interface=dhcp_interface)
+ dhcp_interfaces=dhcp_interfaces)
nodegroup.save()
return nodegroup
@@ -128,7 +128,7 @@
dhcp_key = CharField(
blank=True, editable=False, max_length=255, default='')
# Network interface to serve DHCP on.
- dhcp_interface = CharField(
+ dhcp_interfaces = CharField(
blank=True, editable=False, max_length=255, default='')
subnet_mask = IPAddressField(
editable=True, unique=False, blank=True, null=True, default='')
=== modified file 'src/maasserver/testing/factory.py'
--- src/maasserver/testing/factory.py 2012-09-03 06:12:55 +0000
+++ src/maasserver/testing/factory.py 2012-09-04 04:53:22 +0000
@@ -113,7 +113,7 @@
def make_node_group(self, name=None, worker_ip=None, router_ip=None,
network=None, subnet_mask=None, broadcast_ip=None,
ip_range_low=None, ip_range_high=None,
- dhcp_interface=None, **kwargs):
+ dhcp_interfaces=None, **kwargs):
"""Create a :class:`NodeGroup`.
If network (an instance of IPNetwork) is provided, use it to populate
@@ -146,13 +146,13 @@
router_ip = self.getRandomIPAddress()
if worker_ip is None:
worker_ip = self.getRandomIPAddress()
- if dhcp_interface is None:
- dhcp_interface = self.make_name('interface')
+ if dhcp_interfaces is None:
+ dhcp_interfaces = self.make_name('interface')
ng = NodeGroup.objects.new(
name=name, worker_ip=worker_ip, subnet_mask=subnet_mask,
broadcast_ip=broadcast_ip, router_ip=router_ip,
ip_range_low=ip_range_low, ip_range_high=ip_range_high,
- dhcp_interface=dhcp_interface, **kwargs)
+ dhcp_interfaces=dhcp_interfaces, **kwargs)
ng.save()
return ng
=== modified file 'src/maasserver/tests/test_commands_config_master_dhcp.py'
--- src/maasserver/tests/test_commands_config_master_dhcp.py 2012-09-03 08:55:22 +0000
+++ src/maasserver/tests/test_commands_config_master_dhcp.py 2012-09-04 04:53:22 +0000
@@ -38,7 +38,7 @@
def make_dhcp_settings():
"""Return an arbitrary dict of DHCP settings."""
return {
- 'dhcp_interface': factory.make_name('interface'),
+ 'dhcp_interfaces': factory.make_name('interface'),
'subnet_mask': '255.255.0.0',
'broadcast_ip': '10.111.255.255',
'router_ip': factory.getRandomIPAddress(),
=== modified file 'src/maasserver/tests/test_nodegroup.py'
--- src/maasserver/tests/test_nodegroup.py 2012-09-04 02:21:53 +0000
+++ src/maasserver/tests/test_nodegroup.py 2012-09-04 04:53:22 +0000
@@ -38,7 +38,7 @@
def make_dhcp_settings():
"""Create a dict of arbitrary nodegroup configuration parameters."""
return {
- 'dhcp_interface': factory.make_name('interface'),
+ 'dhcp_interfaces': factory.make_name('interface'),
'subnet_mask': '255.0.0.0',
'broadcast_ip': '10.255.255.255',
'router_ip': factory.getRandomIPAddress(),
