Merge lp:~rvb/maas/bug-1081701-a into lp:~maas-committers/maas/trunk
- bug-1081701-a
- Merge into trunk
Proposed by
Raphaël Badin
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Raphaël Badin | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 1371 | ||||
Proposed branch: | lp:~rvb/maas/bug-1081701-a | ||||
Merge into: | lp:~maas-committers/maas/trunk | ||||
Diff against target: |
225 lines (+210/-0) 2 files modified
src/maasserver/migrations/0046_add_nodegroup_maas_url.py (+205/-0) src/maasserver/models/nodegroup.py (+5/-0) |
||||
To merge this branch: | bzr merge lp:~rvb/maas/bug-1081701-a | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jeroen T. Vermeulen (community) | Approve | ||
Review via email: mp+135837@code.launchpad.net |
Commit message
Add a new column on NodeGroup: it will be used to store the url where the MAAS server can be reached from the cluster's pow.
Description of the change
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === added file 'src/maasserver/migrations/0046_add_nodegroup_maas_url.py' |
2 | --- src/maasserver/migrations/0046_add_nodegroup_maas_url.py 1970-01-01 00:00:00 +0000 |
3 | +++ src/maasserver/migrations/0046_add_nodegroup_maas_url.py 2012-11-23 09:57:20 +0000 |
4 | @@ -0,0 +1,205 @@ |
5 | +# -*- coding: utf-8 -*- |
6 | +import datetime |
7 | + |
8 | +from django.db import models |
9 | +from south.db import db |
10 | +from south.v2 import SchemaMigration |
11 | + |
12 | + |
13 | +class Migration(SchemaMigration): |
14 | + |
15 | + def forwards(self, orm): |
16 | + # Adding field 'NodeGroup.maas_url' |
17 | + db.add_column(u'maasserver_nodegroup', 'maas_url', |
18 | + self.gf('django.db.models.fields.CharField')(default=u'', max_length=255, blank=True), |
19 | + keep_default=False) |
20 | + |
21 | + |
22 | + def backwards(self, orm): |
23 | + # Deleting field 'NodeGroup.maas_url' |
24 | + db.delete_column(u'maasserver_nodegroup', 'maas_url') |
25 | + |
26 | + |
27 | + models = { |
28 | + 'auth.group': { |
29 | + 'Meta': {'object_name': 'Group'}, |
30 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
31 | + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), |
32 | + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) |
33 | + }, |
34 | + 'auth.permission': { |
35 | + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, |
36 | + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
37 | + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), |
38 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
39 | + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) |
40 | + }, |
41 | + 'auth.user': { |
42 | + 'Meta': {'object_name': 'User'}, |
43 | + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), |
44 | + 'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}), |
45 | + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), |
46 | + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), |
47 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
48 | + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), |
49 | + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
50 | + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
51 | + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), |
52 | + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), |
53 | + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), |
54 | + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), |
55 | + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) |
56 | + }, |
57 | + 'contenttypes.contenttype': { |
58 | + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, |
59 | + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
60 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
61 | + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
62 | + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) |
63 | + }, |
64 | + u'maasserver.bootimage': { |
65 | + 'Meta': {'unique_together': "((u'nodegroup', u'architecture', u'subarchitecture', u'release', u'purpose'),)", 'object_name': 'BootImage'}, |
66 | + 'architecture': ('django.db.models.fields.CharField', [], {'max_length': '255'}), |
67 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
68 | + 'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}), |
69 | + 'purpose': ('django.db.models.fields.CharField', [], {'max_length': '255'}), |
70 | + 'release': ('django.db.models.fields.CharField', [], {'max_length': '255'}), |
71 | + 'subarchitecture': ('django.db.models.fields.CharField', [], {'max_length': '255'}) |
72 | + }, |
73 | + u'maasserver.componenterror': { |
74 | + 'Meta': {'object_name': 'ComponentError'}, |
75 | + 'component': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40'}), |
76 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
77 | + 'error': ('django.db.models.fields.CharField', [], {'max_length': '1000'}), |
78 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
79 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}) |
80 | + }, |
81 | + u'maasserver.config': { |
82 | + 'Meta': {'object_name': 'Config'}, |
83 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
84 | + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), |
85 | + 'value': ('maasserver.fields.JSONObjectField', [], {'null': 'True'}) |
86 | + }, |
87 | + u'maasserver.dhcplease': { |
88 | + 'Meta': {'object_name': 'DHCPLease'}, |
89 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
90 | + 'ip': ('django.db.models.fields.IPAddressField', [], {'unique': 'True', 'max_length': '15'}), |
91 | + 'mac': ('maasserver.fields.MACAddressField', [], {}), |
92 | + 'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}) |
93 | + }, |
94 | + u'maasserver.filestorage': { |
95 | + 'Meta': {'object_name': 'FileStorage'}, |
96 | + 'content': ('metadataserver.fields.BinaryField', [], {}), |
97 | + 'filename': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), |
98 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) |
99 | + }, |
100 | + u'maasserver.macaddress': { |
101 | + 'Meta': {'object_name': 'MACAddress'}, |
102 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
103 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
104 | + 'mac_address': ('maasserver.fields.MACAddressField', [], {'unique': 'True'}), |
105 | + 'node': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.Node']"}), |
106 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}) |
107 | + }, |
108 | + u'maasserver.node': { |
109 | + 'Meta': {'object_name': 'Node'}, |
110 | + 'after_commissioning_action': ('django.db.models.fields.IntegerField', [], {'default': '0'}), |
111 | + 'architecture': ('django.db.models.fields.CharField', [], {'default': "u'i386/generic'", 'max_length': '31'}), |
112 | + 'cpu_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), |
113 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
114 | + 'distro_series': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '10', 'null': 'True', 'blank': 'True'}), |
115 | + 'error': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}), |
116 | + 'hardware_details': ('maasserver.fields.XMLField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), |
117 | + 'hostname': ('django.db.models.fields.CharField', [], {'default': "u''", 'unique': 'True', 'max_length': '255', 'blank': 'True'}), |
118 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
119 | + 'memory': ('django.db.models.fields.IntegerField', [], {'default': '0'}), |
120 | + 'netboot': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), |
121 | + 'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']", 'null': 'True'}), |
122 | + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}), |
123 | + 'power_parameters': ('maasserver.fields.JSONObjectField', [], {'default': "u''", 'blank': 'True'}), |
124 | + 'power_type': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '10', 'blank': 'True'}), |
125 | + 'status': ('django.db.models.fields.IntegerField', [], {'default': '0', 'max_length': '10'}), |
126 | + 'system_id': ('django.db.models.fields.CharField', [], {'default': "u'node-2cd56f00-3548-11e2-b1cb-9c4e363b1c94'", 'unique': 'True', 'max_length': '41'}), |
127 | + 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['maasserver.Tag']", 'symmetrical': 'False'}), |
128 | + 'token': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['piston.Token']", 'null': 'True'}), |
129 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}) |
130 | + }, |
131 | + u'maasserver.nodegroup': { |
132 | + 'Meta': {'object_name': 'NodeGroup'}, |
133 | + 'api_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '18'}), |
134 | + 'api_token': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['piston.Token']", 'unique': 'True'}), |
135 | + 'cluster_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100', 'blank': 'True'}), |
136 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
137 | + 'dhcp_key': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}), |
138 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
139 | + 'maas_url': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}), |
140 | + 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'blank': 'True'}), |
141 | + 'status': ('django.db.models.fields.IntegerField', [], {'default': '0'}), |
142 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}), |
143 | + 'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '36'}) |
144 | + }, |
145 | + u'maasserver.nodegroupinterface': { |
146 | + 'Meta': {'unique_together': "((u'nodegroup', u'interface'),)", 'object_name': 'NodeGroupInterface'}, |
147 | + 'broadcast_ip': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}), |
148 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
149 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
150 | + 'interface': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}), |
151 | + 'ip': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39'}), |
152 | + 'ip_range_high': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}), |
153 | + 'ip_range_low': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}), |
154 | + 'management': ('django.db.models.fields.IntegerField', [], {'default': '0'}), |
155 | + 'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}), |
156 | + 'router_ip': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}), |
157 | + 'subnet_mask': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}), |
158 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}) |
159 | + }, |
160 | + u'maasserver.sshkey': { |
161 | + 'Meta': {'unique_together': "((u'user', u'key'),)", 'object_name': 'SSHKey'}, |
162 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
163 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
164 | + 'key': ('django.db.models.fields.TextField', [], {}), |
165 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}), |
166 | + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) |
167 | + }, |
168 | + u'maasserver.tag': { |
169 | + 'Meta': {'object_name': 'Tag'}, |
170 | + 'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}), |
171 | + 'created': ('django.db.models.fields.DateTimeField', [], {}), |
172 | + 'definition': ('django.db.models.fields.TextField', [], {'blank': 'True'}), |
173 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
174 | + 'kernel_opts': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), |
175 | + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '256'}), |
176 | + 'updated': ('django.db.models.fields.DateTimeField', [], {}) |
177 | + }, |
178 | + u'maasserver.userprofile': { |
179 | + 'Meta': {'object_name': 'UserProfile'}, |
180 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
181 | + 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}) |
182 | + }, |
183 | + 'piston.consumer': { |
184 | + 'Meta': {'object_name': 'Consumer'}, |
185 | + 'description': ('django.db.models.fields.TextField', [], {}), |
186 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
187 | + 'key': ('django.db.models.fields.CharField', [], {'max_length': '18'}), |
188 | + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), |
189 | + 'secret': ('django.db.models.fields.CharField', [], {'max_length': '32'}), |
190 | + 'status': ('django.db.models.fields.CharField', [], {'default': "'pending'", 'max_length': '16'}), |
191 | + 'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'consumers'", 'null': 'True', 'to': "orm['auth.User']"}) |
192 | + }, |
193 | + 'piston.token': { |
194 | + 'Meta': {'object_name': 'Token'}, |
195 | + 'callback': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), |
196 | + 'callback_confirmed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
197 | + 'consumer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['piston.Consumer']"}), |
198 | + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
199 | + 'is_approved': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
200 | + 'key': ('django.db.models.fields.CharField', [], {'max_length': '18'}), |
201 | + 'secret': ('django.db.models.fields.CharField', [], {'max_length': '32'}), |
202 | + 'timestamp': ('django.db.models.fields.IntegerField', [], {'default': '1353659487L'}), |
203 | + 'token_type': ('django.db.models.fields.IntegerField', [], {}), |
204 | + 'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'tokens'", 'null': 'True', 'to': "orm['auth.User']"}), |
205 | + 'verifier': ('django.db.models.fields.CharField', [], {'max_length': '10'}) |
206 | + } |
207 | + } |
208 | + |
209 | + complete_apps = ['maasserver'] |
210 | \ No newline at end of file |
211 | |
212 | === modified file 'src/maasserver/models/nodegroup.py' |
213 | --- src/maasserver/models/nodegroup.py 2012-11-13 18:01:08 +0000 |
214 | +++ src/maasserver/models/nodegroup.py 2012-11-23 09:57:20 +0000 |
215 | @@ -175,6 +175,11 @@ |
216 | uuid = CharField( |
217 | max_length=36, unique=True, null=False, blank=False, editable=True) |
218 | |
219 | + # The URL where the cluster controller can access the region |
220 | + # controller. |
221 | + maas_url = CharField( |
222 | + blank=True, editable=False, max_length=255, default='') |
223 | + |
224 | def __repr__(self): |
225 | return "<NodeGroup %s>" % self.uuid |
226 |
Thanks for fixing the typo.