1
=== added file 'src/maasserver/migrations/0081_ipaddress_table_and_static_dhcp_ranges.py'
2
--- src/maasserver/migrations/0081_ipaddress_table_and_static_dhcp_ranges.py	1970-01-01 00:00:00 +0000
3
+++ src/maasserver/migrations/0081_ipaddress_table_and_static_dhcp_ranges.py	2014-06-02 08:01:44 +0000
4
@@ -0,0 +1,326 @@
5
1
from django.db import models
6
2
from south.db import db
7
3
# -*- coding: utf-8 -*-
8
4
from south.utils import datetime_utils as datetime
9
5
from south.v2 import SchemaMigration
10
6
11
7
12
8
class Migration(SchemaMigration):
13
9
14
10
    def forwards(self, orm):
15
11
        # Adding model 'MACStaticIPAddressLink'
16
12
        db.create_table(u'maasserver_macstaticipaddresslink', (
17
13
            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
18
14
            ('created', self.gf('django.db.models.fields.DateTimeField')()),
19
15
            ('updated', self.gf('django.db.models.fields.DateTimeField')()),
20
16
            ('mac_address', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['maasserver.MACAddress'])),
21
17
            ('ip_address', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['maasserver.StaticIPAddress'], unique=True)),
22
18
            ('nic_alias', self.gf('django.db.models.fields.IntegerField')(default=None, null=True, blank=True)),
23
19
        ))
24
20
        db.send_create_signal(u'maasserver', ['MACStaticIPAddressLink'])
25
21
26
22
        # Adding unique constraint on 'MACStaticIPAddressLink', fields ['ip_address', 'mac_address']
27
23
        db.create_unique(u'maasserver_macstaticipaddresslink', ['ip_address_id', 'mac_address_id'])
28
24
29
25
        # Adding model 'StaticIPAddress'
30
26
        db.create_table(u'maasserver_staticipaddress', (
31
27
            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
32
28
            ('created', self.gf('django.db.models.fields.DateTimeField')()),
33
29
            ('updated', self.gf('django.db.models.fields.DateTimeField')()),
34
30
            ('ip', self.gf('django.db.models.fields.GenericIPAddressField')(unique=True, max_length=39)),
35
31
            ('alloc_type', self.gf('django.db.models.fields.IntegerField')(default=0)),
36
32
        ))
37
33
        db.send_create_signal(u'maasserver', ['StaticIPAddress'])
38
34
39
35
        # Adding field 'NodeGroupInterface.static_ip_range_low'
40
36
        db.add_column(u'maasserver_nodegroupinterface', 'static_ip_range_low',
41
37
                      self.gf('django.db.models.fields.GenericIPAddressField')(default=None, max_length=39, null=True, blank=True),
42
38
                      keep_default=False)
43
39
44
40
        # Adding field 'NodeGroupInterface.static_ip_range_high'
45
41
        db.add_column(u'maasserver_nodegroupinterface', 'static_ip_range_high',
46
42
                      self.gf('django.db.models.fields.GenericIPAddressField')(default=None, max_length=39, null=True, blank=True),
47
43
                      keep_default=False)
48
44
49
45
50
46
    def backwards(self, orm):
51
47
        # Removing unique constraint on 'MACStaticIPAddressLink', fields ['ip_address', 'mac_address']
52
48
        db.delete_unique(u'maasserver_macstaticipaddresslink', ['ip_address_id', 'mac_address_id'])
53
49
54
50
        # Deleting model 'MACStaticIPAddressLink'
55
51
        db.delete_table(u'maasserver_macstaticipaddresslink')
56
52
57
53
        # Deleting model 'StaticIPAddress'
58
54
        db.delete_table(u'maasserver_staticipaddress')
59
55
60
56
        # Deleting field 'NodeGroupInterface.static_ip_range_low'
61
57
        db.delete_column(u'maasserver_nodegroupinterface', 'static_ip_range_low')
62
58
63
59
        # Deleting field 'NodeGroupInterface.static_ip_range_high'
64
60
        db.delete_column(u'maasserver_nodegroupinterface', 'static_ip_range_high')
65
61
66
62
67
63
    models = {
68
64
        u'auth.group': {
69
65
            'Meta': {'object_name': 'Group'},
70
66
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
71
67
            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
72
68
            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
73
69
        },
74
70
        u'auth.permission': {
75
71
            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
76
72
            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
77
73
            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
78
74
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
79
75
            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
80
76
        },
81
77
        u'auth.user': {
82
78
            'Meta': {'object_name': 'User'},
83
79
            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
84
80
            'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
85
81
            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
86
82
            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
87
83
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
88
84
            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
89
85
            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
90
86
            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
91
87
            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
92
88
            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
93
89
            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
94
90
            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
95
91
            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
96
92
        },
97
93
        u'contenttypes.contenttype': {
98
94
            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
99
95
            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
100
96
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
101
97
            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
102
98
            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
103
99
        },
104
100
        u'maasserver.bootimage': {
105
101
            'Meta': {'unique_together': "((u'nodegroup', u'osystem', u'architecture', u'subarchitecture', u'release', u'purpose', u'label'),)", 'object_name': 'BootImage'},
106
102
            'architecture': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
107
103
            'created': ('django.db.models.fields.DateTimeField', [], {}),
108
104
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
109
105
            'label': ('django.db.models.fields.CharField', [], {'default': "u'release'", 'max_length': '255'}),
110
106
            'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}),
111
107
            'osystem': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
112
108
            'purpose': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
113
109
            'release': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
114
110
            'subarchitecture': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
115
111
            'supported_subarches': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
116
112
            'updated': ('django.db.models.fields.DateTimeField', [], {})
117
113
        },
118
114
        u'maasserver.bootsource': {
119
115
            'Meta': {'object_name': 'BootSource'},
120
116
            'cluster': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']", 'null': 'True'}),
121
117
            'created': ('django.db.models.fields.DateTimeField', [], {}),
122
118
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
123
119
            'keyring_data': ('maasserver.fields.EditableBinaryField', [], {'blank': 'True'}),
124
120
            'keyring_filename': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
125
121
            'updated': ('django.db.models.fields.DateTimeField', [], {}),
126
122
            'url': ('django.db.models.fields.URLField', [], {'max_length': '200'})
127
123
        },
128
124
        u'maasserver.bootsourceselection': {
129
125
            'Meta': {'object_name': 'BootSourceSelection'},
130
126
            'arches': ('djorm_pgarray.fields.ArrayField', [], {'default': 'None', 'dbtype': "u'text'", 'null': 'True', 'blank': 'True'}),
131
127
            'boot_source': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.BootSource']"}),
132
128
            'created': ('django.db.models.fields.DateTimeField', [], {}),
133
129
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
134
130
            'labels': ('djorm_pgarray.fields.ArrayField', [], {'default': 'None', 'dbtype': "u'text'", 'null': 'True', 'blank': 'True'}),
135
131
            'release': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '20', 'blank': 'True'}),
136
132
            'subarches': ('djorm_pgarray.fields.ArrayField', [], {'default': 'None', 'dbtype': "u'text'", 'null': 'True', 'blank': 'True'}),
137
133
            'updated': ('django.db.models.fields.DateTimeField', [], {})
138
134
        },
139
135
        u'maasserver.componenterror': {
140
136
            'Meta': {'object_name': 'ComponentError'},
141
137
            'component': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40'}),
142
138
            'created': ('django.db.models.fields.DateTimeField', [], {}),
143
139
            'error': ('django.db.models.fields.CharField', [], {'max_length': '1000'}),
144
140
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
145
141
            'updated': ('django.db.models.fields.DateTimeField', [], {})
146
142
        },
147
143
        u'maasserver.config': {
148
144
            'Meta': {'object_name': 'Config'},
149
145
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
150
146
            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
151
147
            'value': ('maasserver.fields.JSONObjectField', [], {'null': 'True'})
152
148
        },
153
149
        u'maasserver.dhcplease': {
154
150
            'Meta': {'object_name': 'DHCPLease'},
155
151
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
156
152
            'ip': ('django.db.models.fields.IPAddressField', [], {'unique': 'True', 'max_length': '15'}),
157
153
            'mac': ('maasserver.fields.MACAddressField', [], {}),
158
154
            'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"})
159
155
        },
160
156
        u'maasserver.downloadprogress': {
161
157
            'Meta': {'object_name': 'DownloadProgress'},
162
158
            'bytes_downloaded': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
163
159
            'created': ('django.db.models.fields.DateTimeField', [], {}),
164
160
            'error': ('django.db.models.fields.CharField', [], {'max_length': '1000', 'blank': 'True'}),
165
161
            'filename': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
166
162
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
167
163
            'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}),
168
164
            'size': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
169
165
            'updated': ('django.db.models.fields.DateTimeField', [], {})
170
166
        },
171
167
        u'maasserver.filestorage': {
172
168
            'Meta': {'unique_together': "((u'filename', u'owner'),)", 'object_name': 'FileStorage'},
173
169
            'content': ('metadataserver.fields.BinaryField', [], {'blank': 'True'}),
174
170
            'filename': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
175
171
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
176
172
            'key': ('django.db.models.fields.CharField', [], {'default': "u'b46fe122-ea2b-11e3-b565-002215205ce8'", 'unique': 'True', 'max_length': '36'}),
177
173
            'owner': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'})
178
174
        },
179
175
        u'maasserver.macaddress': {
180
176
            'Meta': {'object_name': 'MACAddress'},
181
177
            'created': ('django.db.models.fields.DateTimeField', [], {}),
182
178
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
183
179
            'ip_addresses': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['maasserver.StaticIPAddress']", 'symmetrical': 'False', 'through': u"orm['maasserver.MACStaticIPAddressLink']", 'blank': 'True'}),
184
180
            'mac_address': ('maasserver.fields.MACAddressField', [], {'unique': 'True'}),
185
181
            'networks': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['maasserver.Network']", 'symmetrical': 'False', 'blank': 'True'}),
186
182
            'node': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.Node']"}),
187
183
            'updated': ('django.db.models.fields.DateTimeField', [], {})
188
184
        },
189
185
        u'maasserver.macstaticipaddresslink': {
190
186
            'Meta': {'unique_together': "((u'ip_address', u'mac_address'),)", 'object_name': 'MACStaticIPAddressLink'},
191
187
            'created': ('django.db.models.fields.DateTimeField', [], {}),
192
188
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
193
189
            'ip_address': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.StaticIPAddress']", 'unique': 'True'}),
194
190
            'mac_address': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.MACAddress']"}),
195
191
            'nic_alias': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
196
192
            'updated': ('django.db.models.fields.DateTimeField', [], {})
197
193
        },
198
194
        u'maasserver.network': {
199
195
            'Meta': {'object_name': 'Network'},
200
196
            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
201
197
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
202
198
            'ip': ('django.db.models.fields.GenericIPAddressField', [], {'unique': 'True', 'max_length': '39'}),
203
199
            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
204
200
            'netmask': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39'}),
205
201
            'vlan_tag': ('django.db.models.fields.PositiveSmallIntegerField', [], {'unique': 'True', 'null': 'True', 'blank': 'True'})
206
202
        },
207
203
        u'maasserver.node': {
208
204
            'Meta': {'object_name': 'Node'},
209
205
            'agent_name': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'null': 'True', 'blank': 'True'}),
210
206
            'architecture': ('django.db.models.fields.CharField', [], {'max_length': '31'}),
211
207
            'cpu_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
212
208
            'created': ('django.db.models.fields.DateTimeField', [], {}),
213
209
            'distro_series': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '20', 'blank': 'True'}),
214
210
            'error': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}),
215
211
            'hostname': ('django.db.models.fields.CharField', [], {'default': "u''", 'unique': 'True', 'max_length': '255', 'blank': 'True'}),
216
212
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
217
213
            'memory': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
218
214
            'netboot': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
219
215
            'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']", 'null': 'True'}),
220
216
            'osystem': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '20', 'blank': 'True'}),
221
217
            'owner': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}),
222
218
            'power_parameters': ('maasserver.fields.JSONObjectField', [], {'default': "u''", 'blank': 'True'}),
223
219
            'power_type': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '10', 'blank': 'True'}),
224
220
            'routers': ('djorm_pgarray.fields.ArrayField', [], {'default': 'None', 'dbtype': "u'macaddr'", 'null': 'True', 'blank': 'True'}),
225
221
            'status': ('django.db.models.fields.IntegerField', [], {'default': '0', 'max_length': '10'}),
226
222
            'storage': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
227
223
            'system_id': ('django.db.models.fields.CharField', [], {'default': "u'node-b46a9b7c-ea2b-11e3-b565-002215205ce8'", 'unique': 'True', 'max_length': '41'}),
228
224
            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['maasserver.Tag']", 'symmetrical': 'False'}),
229
225
            'token': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['piston.Token']", 'null': 'True'}),
230
226
            'updated': ('django.db.models.fields.DateTimeField', [], {}),
231
227
            'zone': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.Zone']", 'on_delete': 'models.SET_DEFAULT'})
232
228
        },
233
229
        u'maasserver.nodegroup': {
234
230
            'Meta': {'object_name': 'NodeGroup'},
235
231
            'api_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '18'}),
236
232
            'api_token': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['piston.Token']", 'unique': 'True'}),
237
233
            'cluster_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100', 'blank': 'True'}),
238
234
            'created': ('django.db.models.fields.DateTimeField', [], {}),
239
235
            'dhcp_key': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}),
240
236
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
241
237
            'maas_url': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}),
242
238
            'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'blank': 'True'}),
243
239
            'status': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
244
240
            'updated': ('django.db.models.fields.DateTimeField', [], {}),
245
241
            'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '36'})
246
242
        },
247
243
        u'maasserver.nodegroupinterface': {
248
244
            'Meta': {'unique_together': "((u'nodegroup', u'interface'),)", 'object_name': 'NodeGroupInterface'},
249
245
            'broadcast_ip': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
250
246
            'created': ('django.db.models.fields.DateTimeField', [], {}),
251
247
            'foreign_dhcp_ip': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
252
248
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
253
249
            'interface': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}),
254
250
            'ip': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39'}),
255
251
            'ip_range_high': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
256
252
            'ip_range_low': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
257
253
            'management': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
258
254
            'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}),
259
255
            'router_ip': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
260
256
            'static_ip_range_high': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
261
257
            'static_ip_range_low': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
262
258
            'subnet_mask': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
263
259
            'updated': ('django.db.models.fields.DateTimeField', [], {})
264
260
        },
265
261
        u'maasserver.sshkey': {
266
262
            'Meta': {'unique_together': "((u'user', u'key'),)", 'object_name': 'SSHKey'},
267
263
            'created': ('django.db.models.fields.DateTimeField', [], {}),
268
264
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
269
265
            'key': ('django.db.models.fields.TextField', [], {}),
270
266
            'updated': ('django.db.models.fields.DateTimeField', [], {}),
271
267
            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"})
272
268
        },
273
269
        u'maasserver.staticipaddress': {
274
270
            'Meta': {'object_name': 'StaticIPAddress'},
275
271
            'alloc_type': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
276
272
            'created': ('django.db.models.fields.DateTimeField', [], {}),
277
273
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
278
274
            'ip': ('django.db.models.fields.GenericIPAddressField', [], {'unique': 'True', 'max_length': '39'}),
279
275
            'updated': ('django.db.models.fields.DateTimeField', [], {})
280
276
        },
281
277
        u'maasserver.tag': {
282
278
            'Meta': {'object_name': 'Tag'},
283
279
            'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
284
280
            'created': ('django.db.models.fields.DateTimeField', [], {}),
285
281
            'definition': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
286
282
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
287
283
            'kernel_opts': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
288
284
            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '256'}),
289
285
            'updated': ('django.db.models.fields.DateTimeField', [], {})
290
286
        },
291
287
        u'maasserver.userprofile': {
292
288
            'Meta': {'object_name': 'UserProfile'},
293
289
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
294
290
            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['auth.User']", 'unique': 'True'})
295
291
        },
296
292
        u'maasserver.zone': {
297
293
            'Meta': {'ordering': "[u'name']", 'object_name': 'Zone'},
298
294
            'created': ('django.db.models.fields.DateTimeField', [], {}),
299
295
            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
300
296
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
301
297
            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '256'}),
302
298
            'updated': ('django.db.models.fields.DateTimeField', [], {})
303
299
        },
304
300
        u'piston.consumer': {
305
301
            'Meta': {'object_name': 'Consumer'},
306
302
            'description': ('django.db.models.fields.TextField', [], {}),
307
303
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
308
304
            'key': ('django.db.models.fields.CharField', [], {'max_length': '18'}),
309
305
            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
310
306
            'secret': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
311
307
            'status': ('django.db.models.fields.CharField', [], {'default': "'pending'", 'max_length': '16'}),
312
308
            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'consumers'", 'null': 'True', 'to': u"orm['auth.User']"})
313
309
        },
314
310
        u'piston.token': {
315
311
            'Meta': {'object_name': 'Token'},
316
312
            'callback': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
317
313
            'callback_confirmed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
318
314
            'consumer': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['piston.Consumer']"}),
319
315
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
320
316
            'is_approved': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
321
317
            'key': ('django.db.models.fields.CharField', [], {'max_length': '18'}),
322
318
            'secret': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
323
319
            'timestamp': ('django.db.models.fields.IntegerField', [], {'default': '1401695917L'}),
324
320
            'token_type': ('django.db.models.fields.IntegerField', [], {}),
325
321
            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'tokens'", 'null': 'True', 'to': u"orm['auth.User']"}),
326
322
            'verifier': ('django.db.models.fields.CharField', [], {'max_length': '10'})
327
323
        }
328
324
    }
329
325
330
326
    complete_apps = ['maasserver']
331
0
\ No newline at end of file
327
\ No newline at end of file
332
1
328
333
=== removed file 'src/maasserver/migrations/0081_ipaddress_table_and_static_dhcp_ranges.py'
334
--- src/maasserver/migrations/0081_ipaddress_table_and_static_dhcp_ranges.py	2014-06-02 02:55:00 +0000
335
+++ src/maasserver/migrations/0081_ipaddress_table_and_static_dhcp_ranges.py	1970-01-01 00:00:00 +0000
336
@@ -1,326 +0,0 @@
337
1
from django.db import models
338
2
from south.db import db
339
3
# -*- coding: utf-8 -*-
340
4
from south.utils import datetime_utils as datetime
341
5
from south.v2 import SchemaMigration
342
6
343
7
344
8
class Migration(SchemaMigration):
345
9
346
10
    def forwards(self, orm):
347
11
        # Adding model 'IPAddress'
348
12
        db.create_table(u'maasserver_ipaddress', (
349
13
            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
350
14
            ('created', self.gf('django.db.models.fields.DateTimeField')()),
351
15
            ('updated', self.gf('django.db.models.fields.DateTimeField')()),
352
16
            ('ip', self.gf('django.db.models.fields.GenericIPAddressField')(unique=True, max_length=39)),
353
17
            ('type', self.gf('django.db.models.fields.IntegerField')(default=0)),
354
18
        ))
355
19
        db.send_create_signal(u'maasserver', ['IPAddress'])
356
20
357
21
        # Adding model 'MACIPAddressLink'
358
22
        db.create_table(u'maasserver_macipaddresslink', (
359
23
            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
360
24
            ('created', self.gf('django.db.models.fields.DateTimeField')()),
361
25
            ('updated', self.gf('django.db.models.fields.DateTimeField')()),
362
26
            ('mac_address', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['maasserver.MACAddress'])),
363
27
            ('ip_address', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['maasserver.IPAddress'], unique=True)),
364
28
            ('nic_alias', self.gf('django.db.models.fields.IntegerField')(default=None, null=True, blank=True)),
365
29
        ))
366
30
        db.send_create_signal(u'maasserver', ['MACIPAddressLink'])
367
31
368
32
        # Adding unique constraint on 'MACIPAddressLink', fields ['ip_address', 'mac_address']
369
33
        db.create_unique(u'maasserver_macipaddresslink', ['ip_address_id', 'mac_address_id'])
370
34
371
35
        # Adding field 'NodeGroupInterface.static_ip_range_low'
372
36
        db.add_column(u'maasserver_nodegroupinterface', 'static_ip_range_low',
373
37
                      self.gf('django.db.models.fields.GenericIPAddressField')(default=None, max_length=39, null=True, blank=True),
374
38
                      keep_default=False)
375
39
376
40
        # Adding field 'NodeGroupInterface.static_ip_range_high'
377
41
        db.add_column(u'maasserver_nodegroupinterface', 'static_ip_range_high',
378
42
                      self.gf('django.db.models.fields.GenericIPAddressField')(default=None, max_length=39, null=True, blank=True),
379
43
                      keep_default=False)
380
44
381
45
382
46
    def backwards(self, orm):
383
47
        # Removing unique constraint on 'MACIPAddressLink', fields ['ip_address', 'mac_address']
384
48
        db.delete_unique(u'maasserver_macipaddresslink', ['ip_address_id', 'mac_address_id'])
385
49
386
50
        # Deleting model 'IPAddress'
387
51
        db.delete_table(u'maasserver_ipaddress')
388
52
389
53
        # Deleting model 'MACIPAddressLink'
390
54
        db.delete_table(u'maasserver_macipaddresslink')
391
55
392
56
        # Deleting field 'NodeGroupInterface.static_ip_range_low'
393
57
        db.delete_column(u'maasserver_nodegroupinterface', 'static_ip_range_low')
394
58
395
59
        # Deleting field 'NodeGroupInterface.static_ip_range_high'
396
60
        db.delete_column(u'maasserver_nodegroupinterface', 'static_ip_range_high')
397
61
398
62
399
63
    models = {
400
64
        u'auth.group': {
401
65
            'Meta': {'object_name': 'Group'},
402
66
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
403
67
            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
404
68
            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
405
69
        },
406
70
        u'auth.permission': {
407
71
            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
408
72
            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
409
73
            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
410
74
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
411
75
            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
412
76
        },
413
77
        u'auth.user': {
414
78
            'Meta': {'object_name': 'User'},
415
79
            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
416
80
            'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
417
81
            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
418
82
            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
419
83
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
420
84
            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
421
85
            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
422
86
            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
423
87
            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
424
88
            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
425
89
            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
426
90
            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
427
91
            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
428
92
        },
429
93
        u'contenttypes.contenttype': {
430
94
            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
431
95
            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
432
96
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
433
97
            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
434
98
            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
435
99
        },
436
100
        u'maasserver.bootimage': {
437
101
            'Meta': {'unique_together': "((u'nodegroup', u'osystem', u'architecture', u'subarchitecture', u'release', u'purpose', u'label'),)", 'object_name': 'BootImage'},
438
102
            'architecture': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
439
103
            'created': ('django.db.models.fields.DateTimeField', [], {}),
440
104
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
441
105
            'label': ('django.db.models.fields.CharField', [], {'default': "u'release'", 'max_length': '255'}),
442
106
            'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}),
443
107
            'osystem': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
444
108
            'purpose': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
445
109
            'release': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
446
110
            'subarchitecture': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
447
111
            'supported_subarches': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
448
112
            'updated': ('django.db.models.fields.DateTimeField', [], {})
449
113
        },
450
114
        u'maasserver.bootsource': {
451
115
            'Meta': {'object_name': 'BootSource'},
452
116
            'cluster': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']", 'null': 'True'}),
453
117
            'created': ('django.db.models.fields.DateTimeField', [], {}),
454
118
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
455
119
            'keyring_data': ('maasserver.fields.EditableBinaryField', [], {'blank': 'True'}),
456
120
            'keyring_filename': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
457
121
            'updated': ('django.db.models.fields.DateTimeField', [], {}),
458
122
            'url': ('django.db.models.fields.URLField', [], {'max_length': '200'})
459
123
        },
460
124
        u'maasserver.bootsourceselection': {
461
125
            'Meta': {'object_name': 'BootSourceSelection'},
462
126
            'arches': ('djorm_pgarray.fields.ArrayField', [], {'default': 'None', 'dbtype': "u'text'", 'null': 'True', 'blank': 'True'}),
463
127
            'boot_source': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.BootSource']"}),
464
128
            'created': ('django.db.models.fields.DateTimeField', [], {}),
465
129
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
466
130
            'labels': ('djorm_pgarray.fields.ArrayField', [], {'default': 'None', 'dbtype': "u'text'", 'null': 'True', 'blank': 'True'}),
467
131
            'release': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '20', 'blank': 'True'}),
468
132
            'subarches': ('djorm_pgarray.fields.ArrayField', [], {'default': 'None', 'dbtype': "u'text'", 'null': 'True', 'blank': 'True'}),
469
133
            'updated': ('django.db.models.fields.DateTimeField', [], {})
470
134
        },
471
135
        u'maasserver.componenterror': {
472
136
            'Meta': {'object_name': 'ComponentError'},
473
137
            'component': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40'}),
474
138
            'created': ('django.db.models.fields.DateTimeField', [], {}),
475
139
            'error': ('django.db.models.fields.CharField', [], {'max_length': '1000'}),
476
140
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
477
141
            'updated': ('django.db.models.fields.DateTimeField', [], {})
478
142
        },
479
143
        u'maasserver.config': {
480
144
            'Meta': {'object_name': 'Config'},
481
145
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
482
146
            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
483
147
            'value': ('maasserver.fields.JSONObjectField', [], {'null': 'True'})
484
148
        },
485
149
        u'maasserver.dhcplease': {
486
150
            'Meta': {'object_name': 'DHCPLease'},
487
151
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
488
152
            'ip': ('django.db.models.fields.IPAddressField', [], {'unique': 'True', 'max_length': '15'}),
489
153
            'mac': ('maasserver.fields.MACAddressField', [], {}),
490
154
            'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"})
491
155
        },
492
156
        u'maasserver.downloadprogress': {
493
157
            'Meta': {'object_name': 'DownloadProgress'},
494
158
            'bytes_downloaded': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
495
159
            'created': ('django.db.models.fields.DateTimeField', [], {}),
496
160
            'error': ('django.db.models.fields.CharField', [], {'max_length': '1000', 'blank': 'True'}),
497
161
            'filename': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
498
162
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
499
163
            'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}),
500
164
            'size': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
501
165
            'updated': ('django.db.models.fields.DateTimeField', [], {})
502
166
        },
503
167
        u'maasserver.filestorage': {
504
168
            'Meta': {'unique_together': "((u'filename', u'owner'),)", 'object_name': 'FileStorage'},
505
169
            'content': ('metadataserver.fields.BinaryField', [], {'blank': 'True'}),
506
170
            'filename': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
507
171
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
508
172
            'key': ('django.db.models.fields.CharField', [], {'default': "u'23d4ee34-ea01-11e3-8dfe-002215205ce8'", 'unique': 'True', 'max_length': '36'}),
509
173
            'owner': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'})
510
174
        },
511
175
        u'maasserver.ipaddress': {
512
176
            'Meta': {'object_name': 'IPAddress'},
513
177
            'created': ('django.db.models.fields.DateTimeField', [], {}),
514
178
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
515
179
            'ip': ('django.db.models.fields.GenericIPAddressField', [], {'unique': 'True', 'max_length': '39'}),
516
180
            'type': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
517
181
            'updated': ('django.db.models.fields.DateTimeField', [], {})
518
182
        },
519
183
        u'maasserver.macaddress': {
520
184
            'Meta': {'object_name': 'MACAddress'},
521
185
            'created': ('django.db.models.fields.DateTimeField', [], {}),
522
186
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
523
187
            'ip_addresses': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['maasserver.IPAddress']", 'through': u"orm['maasserver.MACIPAddressLink']", 'symmetrical': 'False'}),
524
188
            'mac_address': ('maasserver.fields.MACAddressField', [], {'unique': 'True'}),
525
189
            'networks': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['maasserver.Network']", 'symmetrical': 'False', 'blank': 'True'}),
526
190
            'node': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.Node']"}),
527
191
            'updated': ('django.db.models.fields.DateTimeField', [], {})
528
192
        },
529
193
        u'maasserver.macipaddresslink': {
530
194
            'Meta': {'unique_together': "((u'ip_address', u'mac_address'),)", 'object_name': 'MACIPAddressLink'},
531
195
            'created': ('django.db.models.fields.DateTimeField', [], {}),
532
196
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
533
197
            'ip_address': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.IPAddress']", 'unique': 'True'}),
534
198
            'mac_address': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.MACAddress']"}),
535
199
            'nic_alias': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}),
536
200
            'updated': ('django.db.models.fields.DateTimeField', [], {})
537
201
        },
538
202
        u'maasserver.network': {
539
203
            'Meta': {'object_name': 'Network'},
540
204
            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
541
205
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
542
206
            'ip': ('django.db.models.fields.GenericIPAddressField', [], {'unique': 'True', 'max_length': '39'}),
543
207
            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
544
208
            'netmask': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39'}),
545
209
            'vlan_tag': ('django.db.models.fields.PositiveSmallIntegerField', [], {'unique': 'True', 'null': 'True', 'blank': 'True'})
546
210
        },
547
211
        u'maasserver.node': {
548
212
            'Meta': {'object_name': 'Node'},
549
213
            'agent_name': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'null': 'True', 'blank': 'True'}),
550
214
            'architecture': ('django.db.models.fields.CharField', [], {'max_length': '31'}),
551
215
            'cpu_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
552
216
            'created': ('django.db.models.fields.DateTimeField', [], {}),
553
217
            'distro_series': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '20', 'blank': 'True'}),
554
218
            'error': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}),
555
219
            'hostname': ('django.db.models.fields.CharField', [], {'default': "u''", 'unique': 'True', 'max_length': '255', 'blank': 'True'}),
556
220
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
557
221
            'memory': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
558
222
            'netboot': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
559
223
            'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']", 'null': 'True'}),
560
224
            'osystem': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '20', 'blank': 'True'}),
561
225
            'owner': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}),
562
226
            'power_parameters': ('maasserver.fields.JSONObjectField', [], {'default': "u''", 'blank': 'True'}),
563
227
            'power_type': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '10', 'blank': 'True'}),
564
228
            'routers': ('djorm_pgarray.fields.ArrayField', [], {'default': 'None', 'dbtype': "u'macaddr'", 'null': 'True', 'blank': 'True'}),
565
229
            'status': ('django.db.models.fields.IntegerField', [], {'default': '0', 'max_length': '10'}),
566
230
            'storage': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
567
231
            'system_id': ('django.db.models.fields.CharField', [], {'default': "u'node-23d247e2-ea01-11e3-8dfe-002215205ce8'", 'unique': 'True', 'max_length': '41'}),
568
232
            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['maasserver.Tag']", 'symmetrical': 'False'}),
569
233
            'token': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['piston.Token']", 'null': 'True'}),
570
234
            'updated': ('django.db.models.fields.DateTimeField', [], {}),
571
235
            'zone': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.Zone']", 'on_delete': 'models.SET_DEFAULT'})
572
236
        },
573
237
        u'maasserver.nodegroup': {
574
238
            'Meta': {'object_name': 'NodeGroup'},
575
239
            'api_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '18'}),
576
240
            'api_token': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['piston.Token']", 'unique': 'True'}),
577
241
            'cluster_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100', 'blank': 'True'}),
578
242
            'created': ('django.db.models.fields.DateTimeField', [], {}),
579
243
            'dhcp_key': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}),
580
244
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
581
245
            'maas_url': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}),
582
246
            'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'blank': 'True'}),
583
247
            'status': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
584
248
            'updated': ('django.db.models.fields.DateTimeField', [], {}),
585
249
            'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '36'})
586
250
        },
587
251
        u'maasserver.nodegroupinterface': {
588
252
            'Meta': {'unique_together': "((u'nodegroup', u'interface'),)", 'object_name': 'NodeGroupInterface'},
589
253
            'broadcast_ip': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
590
254
            'created': ('django.db.models.fields.DateTimeField', [], {}),
591
255
            'foreign_dhcp_ip': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
592
256
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
593
257
            'interface': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}),
594
258
            'ip': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39'}),
595
259
            'ip_range_high': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
596
260
            'ip_range_low': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
597
261
            'management': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
598
262
            'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}),
599
263
            'router_ip': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
600
264
            'static_ip_range_high': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
601
265
            'static_ip_range_low': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
602
266
            'subnet_mask': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}),
603
267
            'updated': ('django.db.models.fields.DateTimeField', [], {})
604
268
        },
605
269
        u'maasserver.sshkey': {
606
270
            'Meta': {'unique_together': "((u'user', u'key'),)", 'object_name': 'SSHKey'},
607
271
            'created': ('django.db.models.fields.DateTimeField', [], {}),
608
272
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
609
273
            'key': ('django.db.models.fields.TextField', [], {}),
610
274
            'updated': ('django.db.models.fields.DateTimeField', [], {}),
611
275
            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"})
612
276
        },
613
277
        u'maasserver.tag': {
614
278
            'Meta': {'object_name': 'Tag'},
615
279
            'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
616
280
            'created': ('django.db.models.fields.DateTimeField', [], {}),
617
281
            'definition': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
618
282
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
619
283
            'kernel_opts': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
620
284
            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '256'}),
621
285
            'updated': ('django.db.models.fields.DateTimeField', [], {})
622
286
        },
623
287
        u'maasserver.userprofile': {
624
288
            'Meta': {'object_name': 'UserProfile'},
625
289
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
626
290
            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['auth.User']", 'unique': 'True'})
627
291
        },
628
292
        u'maasserver.zone': {
629
293
            'Meta': {'ordering': "[u'name']", 'object_name': 'Zone'},
630
294
            'created': ('django.db.models.fields.DateTimeField', [], {}),
631
295
            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
632
296
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
633
297
            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '256'}),
634
298
            'updated': ('django.db.models.fields.DateTimeField', [], {})
635
299
        },
636
300
        u'piston.consumer': {
637
301
            'Meta': {'object_name': 'Consumer'},
638
302
            'description': ('django.db.models.fields.TextField', [], {}),
639
303
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
640
304
            'key': ('django.db.models.fields.CharField', [], {'max_length': '18'}),
641
305
            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
642
306
            'secret': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
643
307
            'status': ('django.db.models.fields.CharField', [], {'default': "'pending'", 'max_length': '16'}),
644
308
            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'consumers'", 'null': 'True', 'to': u"orm['auth.User']"})
645
309
        },
646
310
        u'piston.token': {
647
311
            'Meta': {'object_name': 'Token'},
648
312
            'callback': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
649
313
            'callback_confirmed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
650
314
            'consumer': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['piston.Consumer']"}),
651
315
            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
652
316
            'is_approved': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
653
317
            'key': ('django.db.models.fields.CharField', [], {'max_length': '18'}),
654
318
            'secret': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
655
319
            'timestamp': ('django.db.models.fields.IntegerField', [], {'default': '1401677636L'}),
656
320
            'token_type': ('django.db.models.fields.IntegerField', [], {}),
657
321
            'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'tokens'", 'null': 'True', 'to': u"orm['auth.User']"}),
658
322
            'verifier': ('django.db.models.fields.CharField', [], {'max_length': '10'})
659
323
        }
660
324
    }
661
325
662
326
    complete_apps = ['maasserver']
663
327
\ No newline at end of file
0
\ No newline at end of file
664
328
1
665
=== modified file 'src/maasserver/models/__init__.py'
666
--- src/maasserver/models/__init__.py	2014-06-02 02:51:12 +0000
667
+++ src/maasserver/models/__init__.py	2014-06-02 08:01:44 +0000
668
@@ -51,9 +51,9 @@
669
51
from maasserver.models.dhcplease import DHCPLease
51
from maasserver.models.dhcplease import DHCPLease
670
52
from maasserver.models.downloadprogress import DownloadProgress
52
from maasserver.models.downloadprogress import DownloadProgress
671
53
from maasserver.models.filestorage import FileStorage
53
from maasserver.models.filestorage import FileStorage
673
54
from maasserver.models.ipaddress import IPAddress
54
from maasserver.models.ipaddress import StaticIPAddress
674
55
from maasserver.models.macaddress import MACAddress
55
from maasserver.models.macaddress import MACAddress
676
56
from maasserver.models.macipaddresslink import MACIPAddressLink
56
from maasserver.models.macipaddresslink import MACStaticIPAddressLink
677
57
from maasserver.models.network import Network
57
from maasserver.models.network import Network
678
58
from maasserver.models.node import Node
58
from maasserver.models.node import Node
679
59
from maasserver.models.nodegroup import NodeGroup
59
from maasserver.models.nodegroup import NodeGroup
680
@@ -70,9 +70,9 @@
681
70
# export in __all__.
70
# export in __all__.
682
71
ignore_unused(
71
ignore_unused(
683
72
    BootImage, ComponentError, Config, DHCPLease, DownloadProgress,
72
    BootImage, ComponentError, Config, DHCPLease, DownloadProgress,
687
73
    FileStorage, IPAddress, MACAddress, MACIPAddressLink, Network,
73
    FileStorage, StaticIPAddress, MACAddress, MACStaticIPAddressLink,
688
74
    NodeGroup, SSHKey, Tag, UserProfile, NodeGroupInterface, Zone,
74
    Network, NodeGroup, SSHKey, Tag, UserProfile, NodeGroupInterface,
689
75
    logger)
75
    Zone, logger)
690
76
76
691
77
77
692
78
# Connect the 'create_user' method to the post save signal of User.
78
# Connect the 'create_user' method to the post save signal of User.
693
79
79
694
=== modified file 'src/maasserver/models/ipaddress.py'
695
--- src/maasserver/models/ipaddress.py	2014-06-02 02:53:30 +0000
696
+++ src/maasserver/models/ipaddress.py	2014-06-02 08:01:44 +0000
697
@@ -1,7 +1,7 @@
698
1
# Copyright 2014 Canonical Ltd.  This software is licensed under the
1
# Copyright 2014 Canonical Ltd.  This software is licensed under the
699
2
# GNU Affero General Public License version 3 (see the file LICENSE).
2
# GNU Affero General Public License version 3 (see the file LICENSE).
700
3
3
702
4
"""Model definition for IPAddress.
4
"""Model definition for StaticIPAddress.
703
5
5
704
6
Contains all the in-use static IP addresses that are allocated by MAAS.
6
Contains all the in-use static IP addresses that are allocated by MAAS.
705
7
Generally speaking, these are written out to the DHCP server as "host"
7
Generally speaking, these are written out to the DHCP server as "host"
706
@@ -20,7 +20,7 @@
707
20
20
708
21
__metaclass__ = type
21
__metaclass__ = type
709
22
__all__ = [
22
__all__ = [
711
23
    'IPAddress',
23
    'StaticIPAddress',
712
24
    ]
24
    ]
713
25
25
714
26
26
715
@@ -34,11 +34,11 @@
716
34
from maasserver.models.timestampedmodel import TimestampedModel
34
from maasserver.models.timestampedmodel import TimestampedModel
717
35
35
718
36
36
720
37
class IPAddress(CleanSave, TimestampedModel):
37
class StaticIPAddress(CleanSave, TimestampedModel):
721
38
38
722
39
    class Meta(DefaultMeta):
39
    class Meta(DefaultMeta):
725
40
        verbose_name = "IP Address"
40
        verbose_name = "Static IP Address"
726
41
        verbose_name_plural = "IP Addresses"
41
        verbose_name_plural = "Static IP Addresses"
727
42
42
728
43
    ip = GenericIPAddressField(
43
    ip = GenericIPAddressField(
729
44
        unique=True, null=False, editable=False, blank=False)
44
        unique=True, null=False, editable=False, blank=False)
730
@@ -46,7 +46,7 @@
731
46
    # The MACIPAddressLink table is used to link IPAddress to
46
    # The MACIPAddressLink table is used to link IPAddress to
732
47
    # MACAddress.  See MACAddress.ip_addresses.
47
    # MACAddress.  See MACAddress.ip_addresses.
733
48
48
735
49
    type = IntegerField(
49
    alloc_type = IntegerField(
736
50
        editable=False, null=False, blank=False, default=IPADDRESS_TYPE.AUTO)
50
        editable=False, null=False, blank=False, default=IPADDRESS_TYPE.AUTO)
737
51
51
738
52
    def __unicode__(self):
52
    def __unicode__(self):
739
53
53
740
=== modified file 'src/maasserver/models/macaddress.py'
741
--- src/maasserver/models/macaddress.py	2014-06-02 05:20:58 +0000
742
+++ src/maasserver/models/macaddress.py	2014-06-02 08:01:44 +0000
743
@@ -51,8 +51,8 @@
744
51
    networks = ManyToManyField('maasserver.Network', blank=True)
51
    networks = ManyToManyField('maasserver.Network', blank=True)
745
52
52
746
53
    ip_addresses = ManyToManyField(
53
    ip_addresses = ManyToManyField(
749
54
        'maasserver.IPAddress', through='maasserver.MACIPAddressLink',
54
        'maasserver.StaticIPAddress',
750
55
        blank=True)
55
        through='maasserver.MACStaticIPAddressLink', blank=True)
751
56
56
752
57
    # future columns: tags, nic_name, metadata, bonding info
57
    # future columns: tags, nic_name, metadata, bonding info
753
58
58
754
59
59
755
=== modified file 'src/maasserver/models/macipaddresslink.py'
756
--- src/maasserver/models/macipaddresslink.py	2014-06-02 02:51:12 +0000
757
+++ src/maasserver/models/macipaddresslink.py	2014-06-02 08:01:44 +0000
758
@@ -18,7 +18,7 @@
759
18
18
760
19
__metaclass__ = type
19
__metaclass__ = type
761
20
__all__ = [
20
__all__ = [
763
21
    'MACIPAddressLink',
21
    'MACStaticIPAddressLink',
764
22
    ]
22
    ]
765
23
23
766
24
24
767
@@ -31,13 +31,13 @@
768
31
from maasserver.models.timestampedmodel import TimestampedModel
31
from maasserver.models.timestampedmodel import TimestampedModel
769
32
32
770
33
33
772
34
class MACIPAddressLink(CleanSave, TimestampedModel):
34
class MACStaticIPAddressLink(CleanSave, TimestampedModel):
773
35
35
774
36
    class Meta(DefaultMeta):
36
    class Meta(DefaultMeta):
775
37
        unique_together = ('ip_address', 'mac_address')
37
        unique_together = ('ip_address', 'mac_address')
776
38
38
777
39
    mac_address = ForeignKey('maasserver.MACAddress')
39
    mac_address = ForeignKey('maasserver.MACAddress')
779
40
    ip_address = ForeignKey('maasserver.IPAddress', unique=True)
40
    ip_address = ForeignKey('maasserver.StaticIPAddress', unique=True)
780
41
41
781
42
    # Optional NIC alias for multi-homed NICs (e.g. 'eth0:1')
42
    # Optional NIC alias for multi-homed NICs (e.g. 'eth0:1')
782
43
    nic_alias = IntegerField(
43
    nic_alias = IntegerField(
Reviewer	Review Type	Date Requested	Status
Julian Edwards (community)			Approve on 2014-06-02
Review via email: mp+221676@code.launchpad.net