Merge lp:~jameinel/maas/1.2-remove-kernel-opts into lp:maas/1.2
- 1.2-remove-kernel-opts
- Merge into 1.2
Proposed by
John A Meinel
Status: | Merged |
---|---|
Approved by: | John A Meinel |
Approved revision: | no longer in the source branch. |
Merged at revision: | 1293 |
Proposed branch: | lp:~jameinel/maas/1.2-remove-kernel-opts |
Merge into: | lp:maas/1.2 |
Diff against target: |
545 lines (+5/-374) 11 files modified
src/maasserver/api.py (+1/-15) src/maasserver/forms.py (+0/-1) src/maasserver/migrations/0043_add_tag_kernel_opts.py (+0/-203) src/maasserver/models/node.py (+1/-24) src/maasserver/models/tag.py (+0/-3) src/maasserver/testing/factory.py (+3/-4) src/maasserver/tests/test_api.py (+0/-41) src/maasserver/tests/test_node.py (+0/-56) src/maasserver/tests/test_tag.py (+0/-10) src/provisioningserver/kernel_opts.py (+0/-4) src/provisioningserver/tests/test_kernel_opts.py (+0/-13) |
To merge this branch: | bzr merge lp:~jameinel/maas/1.2-remove-kernel-opts |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Packman (community) | Approve | ||
Review via email: mp+133425@code.launchpad.net |
This proposal supersedes a proposal from 2012-11-08.
Commit message
This removes the recent patches to add kernel_opts to the 1.2 branch.
We'll land it instead on trunk, and then it will get backported in the future once a bugfix only SRU was done.
Description of the change
(Original proposal accidentally targetted trunk, this is now properly targetting 1.2)
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 | === modified file 'src/maasserver/api.py' | |||
2 | --- src/maasserver/api.py 2012-11-08 06:40:03 +0000 | |||
3 | +++ src/maasserver/api.py 2012-11-08 09:21:26 +0000 | |||
4 | @@ -1430,7 +1430,6 @@ | |||
5 | 1430 | 'name', | 1430 | 'name', |
6 | 1431 | 'definition', | 1431 | 'definition', |
7 | 1432 | 'comment', | 1432 | 'comment', |
8 | 1433 | 'kernel_opts', | ||
9 | 1434 | ) | 1433 | ) |
10 | 1435 | 1434 | ||
11 | 1436 | def read(self, request, name): | 1435 | def read(self, request, name): |
12 | @@ -1551,11 +1550,6 @@ | |||
13 | 1551 | It is meant as a human readable description of the tag. | 1550 | It is meant as a human readable description of the tag. |
14 | 1552 | :param definition: An XPATH query that will be evaluated against the | 1551 | :param definition: An XPATH query that will be evaluated against the |
15 | 1553 | hardware_details stored for all nodes (output of `lshw -xml`). | 1552 | hardware_details stored for all nodes (output of `lshw -xml`). |
16 | 1554 | :param kernel_opts: Can be None. If set, nodes associated with this tag | ||
17 | 1555 | will add this string to their kernel options when booting. The | ||
18 | 1556 | value overrides the global 'kernel_opts' setting. If more than one | ||
19 | 1557 | tag is associated with a node, the one with the lowest alphabetical | ||
20 | 1558 | name will be picked (eg 01-my-tag will be taken over 99-tag-name). | ||
21 | 1559 | """ | 1553 | """ |
22 | 1560 | if not request.user.is_superuser: | 1554 | if not request.user.is_superuser: |
23 | 1561 | raise PermissionDenied() | 1555 | raise PermissionDenied() |
24 | @@ -1790,13 +1784,6 @@ | |||
25 | 1790 | else: | 1784 | else: |
26 | 1791 | series = node.get_distro_series() | 1785 | series = node.get_distro_series() |
27 | 1792 | 1786 | ||
28 | 1793 | if node is not None: | ||
29 | 1794 | # We don't care if the kernel opts is from the global setting or a tag, | ||
30 | 1795 | # just get the options | ||
31 | 1796 | _, extra_kernel_opts = node.get_effective_kernel_options() | ||
32 | 1797 | else: | ||
33 | 1798 | extra_kernel_opts = None | ||
34 | 1799 | |||
35 | 1800 | purpose = get_boot_purpose(node) | 1787 | purpose = get_boot_purpose(node) |
36 | 1801 | server_address = get_maas_facing_server_address() | 1788 | server_address = get_maas_facing_server_address() |
37 | 1802 | cluster_address = get_mandatory_param(request.GET, "local") | 1789 | cluster_address = get_mandatory_param(request.GET, "local") |
38 | @@ -1804,8 +1791,7 @@ | |||
39 | 1804 | params = KernelParameters( | 1791 | params = KernelParameters( |
40 | 1805 | arch=arch, subarch=subarch, release=series, purpose=purpose, | 1792 | arch=arch, subarch=subarch, release=series, purpose=purpose, |
41 | 1806 | hostname=hostname, domain=domain, preseed_url=preseed_url, | 1793 | hostname=hostname, domain=domain, preseed_url=preseed_url, |
44 | 1807 | log_host=server_address, fs_host=cluster_address, | 1794 | log_host=server_address, fs_host=cluster_address) |
43 | 1808 | extra_opts=extra_kernel_opts) | ||
45 | 1809 | 1795 | ||
46 | 1810 | return HttpResponse( | 1796 | return HttpResponse( |
47 | 1811 | json.dumps(params._asdict()), | 1797 | json.dumps(params._asdict()), |
48 | 1812 | 1798 | ||
49 | === modified file 'src/maasserver/forms.py' | |||
50 | --- src/maasserver/forms.py 2012-11-07 13:27:41 +0000 | |||
51 | +++ src/maasserver/forms.py 2012-11-08 09:21:26 +0000 | |||
52 | @@ -855,7 +855,6 @@ | |||
53 | 855 | 'name', | 855 | 'name', |
54 | 856 | 'comment', | 856 | 'comment', |
55 | 857 | 'definition', | 857 | 'definition', |
56 | 858 | 'kernel_opts', | ||
57 | 859 | ) | 858 | ) |
58 | 860 | 859 | ||
59 | 861 | def clean_definition(self): | 860 | def clean_definition(self): |
60 | 862 | 861 | ||
61 | === removed file 'src/maasserver/migrations/0043_add_tag_kernel_opts.py' | |||
62 | --- src/maasserver/migrations/0043_add_tag_kernel_opts.py 2012-11-07 10:35:57 +0000 | |||
63 | +++ src/maasserver/migrations/0043_add_tag_kernel_opts.py 1970-01-01 00:00:00 +0000 | |||
64 | @@ -1,203 +0,0 @@ | |||
65 | 1 | # -*- coding: utf-8 -*- | ||
66 | 2 | import datetime | ||
67 | 3 | from south.db import db | ||
68 | 4 | from south.v2 import SchemaMigration | ||
69 | 5 | from django.db import models | ||
70 | 6 | |||
71 | 7 | |||
72 | 8 | class Migration(SchemaMigration): | ||
73 | 9 | |||
74 | 10 | def forwards(self, orm): | ||
75 | 11 | # Adding field 'Tag.kernel_opts' | ||
76 | 12 | db.add_column(u'maasserver_tag', 'kernel_opts', | ||
77 | 13 | self.gf('django.db.models.fields.TextField')(null=True, blank=True), | ||
78 | 14 | keep_default=False) | ||
79 | 15 | |||
80 | 16 | |||
81 | 17 | def backwards(self, orm): | ||
82 | 18 | # Deleting field 'Tag.kernel_opts' | ||
83 | 19 | db.delete_column(u'maasserver_tag', 'kernel_opts') | ||
84 | 20 | |||
85 | 21 | |||
86 | 22 | models = { | ||
87 | 23 | 'auth.group': { | ||
88 | 24 | 'Meta': {'object_name': 'Group'}, | ||
89 | 25 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
90 | 26 | 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), | ||
91 | 27 | 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) | ||
92 | 28 | }, | ||
93 | 29 | 'auth.permission': { | ||
94 | 30 | 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, | ||
95 | 31 | 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
96 | 32 | 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), | ||
97 | 33 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
98 | 34 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) | ||
99 | 35 | }, | ||
100 | 36 | 'auth.user': { | ||
101 | 37 | 'Meta': {'object_name': 'User'}, | ||
102 | 38 | 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
103 | 39 | 'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}), | ||
104 | 40 | 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
105 | 41 | 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), | ||
106 | 42 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
107 | 43 | 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
108 | 44 | 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
109 | 45 | 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
110 | 46 | 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
111 | 47 | 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
112 | 48 | 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), | ||
113 | 49 | 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), | ||
114 | 50 | 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) | ||
115 | 51 | }, | ||
116 | 52 | 'contenttypes.contenttype': { | ||
117 | 53 | 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, | ||
118 | 54 | 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
119 | 55 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
120 | 56 | 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
121 | 57 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) | ||
122 | 58 | }, | ||
123 | 59 | u'maasserver.bootimage': { | ||
124 | 60 | 'Meta': {'unique_together': "((u'nodegroup', u'architecture', u'subarchitecture', u'release', u'purpose'),)", 'object_name': 'BootImage'}, | ||
125 | 61 | 'architecture': ('django.db.models.fields.CharField', [], {'max_length': '255'}), | ||
126 | 62 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
127 | 63 | 'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}), | ||
128 | 64 | 'purpose': ('django.db.models.fields.CharField', [], {'max_length': '255'}), | ||
129 | 65 | 'release': ('django.db.models.fields.CharField', [], {'max_length': '255'}), | ||
130 | 66 | 'subarchitecture': ('django.db.models.fields.CharField', [], {'max_length': '255'}) | ||
131 | 67 | }, | ||
132 | 68 | u'maasserver.componenterror': { | ||
133 | 69 | 'Meta': {'object_name': 'ComponentError'}, | ||
134 | 70 | 'component': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40'}), | ||
135 | 71 | 'created': ('django.db.models.fields.DateTimeField', [], {}), | ||
136 | 72 | 'error': ('django.db.models.fields.CharField', [], {'max_length': '1000'}), | ||
137 | 73 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
138 | 74 | 'updated': ('django.db.models.fields.DateTimeField', [], {}) | ||
139 | 75 | }, | ||
140 | 76 | u'maasserver.config': { | ||
141 | 77 | 'Meta': {'object_name': 'Config'}, | ||
142 | 78 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
143 | 79 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), | ||
144 | 80 | 'value': ('maasserver.fields.JSONObjectField', [], {'null': 'True'}) | ||
145 | 81 | }, | ||
146 | 82 | u'maasserver.dhcplease': { | ||
147 | 83 | 'Meta': {'object_name': 'DHCPLease'}, | ||
148 | 84 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
149 | 85 | 'ip': ('django.db.models.fields.IPAddressField', [], {'unique': 'True', 'max_length': '15'}), | ||
150 | 86 | 'mac': ('maasserver.fields.MACAddressField', [], {}), | ||
151 | 87 | 'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}) | ||
152 | 88 | }, | ||
153 | 89 | u'maasserver.filestorage': { | ||
154 | 90 | 'Meta': {'object_name': 'FileStorage'}, | ||
155 | 91 | 'content': ('metadataserver.fields.BinaryField', [], {}), | ||
156 | 92 | 'filename': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), | ||
157 | 93 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) | ||
158 | 94 | }, | ||
159 | 95 | u'maasserver.macaddress': { | ||
160 | 96 | 'Meta': {'object_name': 'MACAddress'}, | ||
161 | 97 | 'created': ('django.db.models.fields.DateTimeField', [], {}), | ||
162 | 98 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
163 | 99 | 'mac_address': ('maasserver.fields.MACAddressField', [], {'unique': 'True'}), | ||
164 | 100 | 'node': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.Node']"}), | ||
165 | 101 | 'updated': ('django.db.models.fields.DateTimeField', [], {}) | ||
166 | 102 | }, | ||
167 | 103 | u'maasserver.node': { | ||
168 | 104 | 'Meta': {'object_name': 'Node'}, | ||
169 | 105 | 'after_commissioning_action': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
170 | 106 | 'architecture': ('django.db.models.fields.CharField', [], {'default': "u'i386/generic'", 'max_length': '31'}), | ||
171 | 107 | 'cpu_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
172 | 108 | 'created': ('django.db.models.fields.DateTimeField', [], {}), | ||
173 | 109 | 'distro_series': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '10', 'null': 'True', 'blank': 'True'}), | ||
174 | 110 | 'error': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}), | ||
175 | 111 | 'hardware_details': ('maasserver.fields.XMLField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), | ||
176 | 112 | 'hostname': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}), | ||
177 | 113 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
178 | 114 | 'memory': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
179 | 115 | 'netboot': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
180 | 116 | 'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']", 'null': 'True'}), | ||
181 | 117 | 'owner': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}), | ||
182 | 118 | 'power_parameters': ('maasserver.fields.JSONObjectField', [], {'default': "u''", 'blank': 'True'}), | ||
183 | 119 | 'power_type': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '10', 'blank': 'True'}), | ||
184 | 120 | 'status': ('django.db.models.fields.IntegerField', [], {'default': '0', 'max_length': '10'}), | ||
185 | 121 | 'system_id': ('django.db.models.fields.CharField', [], {'default': "u'node-8b729164-2805-11e2-bc60-fa163e384ad1'", 'unique': 'True', 'max_length': '41'}), | ||
186 | 122 | 'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['maasserver.Tag']", 'symmetrical': 'False'}), | ||
187 | 123 | 'token': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['piston.Token']", 'null': 'True'}), | ||
188 | 124 | 'updated': ('django.db.models.fields.DateTimeField', [], {}) | ||
189 | 125 | }, | ||
190 | 126 | u'maasserver.nodegroup': { | ||
191 | 127 | 'Meta': {'object_name': 'NodeGroup'}, | ||
192 | 128 | 'api_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '18'}), | ||
193 | 129 | 'api_token': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['piston.Token']", 'unique': 'True'}), | ||
194 | 130 | 'cluster_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100', 'blank': 'True'}), | ||
195 | 131 | 'created': ('django.db.models.fields.DateTimeField', [], {}), | ||
196 | 132 | 'dhcp_key': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}), | ||
197 | 133 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
198 | 134 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'blank': 'True'}), | ||
199 | 135 | 'status': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
200 | 136 | 'updated': ('django.db.models.fields.DateTimeField', [], {}), | ||
201 | 137 | 'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '36'}) | ||
202 | 138 | }, | ||
203 | 139 | u'maasserver.nodegroupinterface': { | ||
204 | 140 | 'Meta': {'unique_together': "((u'nodegroup', u'interface'),)", 'object_name': 'NodeGroupInterface'}, | ||
205 | 141 | 'broadcast_ip': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}), | ||
206 | 142 | 'created': ('django.db.models.fields.DateTimeField', [], {}), | ||
207 | 143 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
208 | 144 | 'interface': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'blank': 'True'}), | ||
209 | 145 | 'ip': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39'}), | ||
210 | 146 | 'ip_range_high': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}), | ||
211 | 147 | 'ip_range_low': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}), | ||
212 | 148 | 'management': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
213 | 149 | 'nodegroup': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['maasserver.NodeGroup']"}), | ||
214 | 150 | 'router_ip': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}), | ||
215 | 151 | 'subnet_mask': ('django.db.models.fields.GenericIPAddressField', [], {'default': 'None', 'max_length': '39', 'null': 'True', 'blank': 'True'}), | ||
216 | 152 | 'updated': ('django.db.models.fields.DateTimeField', [], {}) | ||
217 | 153 | }, | ||
218 | 154 | u'maasserver.sshkey': { | ||
219 | 155 | 'Meta': {'unique_together': "((u'user', u'key'),)", 'object_name': 'SSHKey'}, | ||
220 | 156 | 'created': ('django.db.models.fields.DateTimeField', [], {}), | ||
221 | 157 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
222 | 158 | 'key': ('django.db.models.fields.TextField', [], {}), | ||
223 | 159 | 'updated': ('django.db.models.fields.DateTimeField', [], {}), | ||
224 | 160 | 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) | ||
225 | 161 | }, | ||
226 | 162 | u'maasserver.tag': { | ||
227 | 163 | 'Meta': {'object_name': 'Tag'}, | ||
228 | 164 | 'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}), | ||
229 | 165 | 'created': ('django.db.models.fields.DateTimeField', [], {}), | ||
230 | 166 | 'definition': ('django.db.models.fields.TextField', [], {}), | ||
231 | 167 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
232 | 168 | 'kernel_opts': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
233 | 169 | 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '256'}), | ||
234 | 170 | 'updated': ('django.db.models.fields.DateTimeField', [], {}) | ||
235 | 171 | }, | ||
236 | 172 | u'maasserver.userprofile': { | ||
237 | 173 | 'Meta': {'object_name': 'UserProfile'}, | ||
238 | 174 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
239 | 175 | 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}) | ||
240 | 176 | }, | ||
241 | 177 | 'piston.consumer': { | ||
242 | 178 | 'Meta': {'object_name': 'Consumer'}, | ||
243 | 179 | 'description': ('django.db.models.fields.TextField', [], {}), | ||
244 | 180 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
245 | 181 | 'key': ('django.db.models.fields.CharField', [], {'max_length': '18'}), | ||
246 | 182 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), | ||
247 | 183 | 'secret': ('django.db.models.fields.CharField', [], {'max_length': '32'}), | ||
248 | 184 | 'status': ('django.db.models.fields.CharField', [], {'default': "'pending'", 'max_length': '16'}), | ||
249 | 185 | 'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'consumers'", 'null': 'True', 'to': "orm['auth.User']"}) | ||
250 | 186 | }, | ||
251 | 187 | 'piston.token': { | ||
252 | 188 | 'Meta': {'object_name': 'Token'}, | ||
253 | 189 | 'callback': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), | ||
254 | 190 | 'callback_confirmed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
255 | 191 | 'consumer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['piston.Consumer']"}), | ||
256 | 192 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
257 | 193 | 'is_approved': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
258 | 194 | 'key': ('django.db.models.fields.CharField', [], {'max_length': '18'}), | ||
259 | 195 | 'secret': ('django.db.models.fields.CharField', [], {'max_length': '32'}), | ||
260 | 196 | 'timestamp': ('django.db.models.fields.IntegerField', [], {'default': '1352201505L'}), | ||
261 | 197 | 'token_type': ('django.db.models.fields.IntegerField', [], {}), | ||
262 | 198 | 'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'tokens'", 'null': 'True', 'to': "orm['auth.User']"}), | ||
263 | 199 | 'verifier': ('django.db.models.fields.CharField', [], {'max_length': '10'}) | ||
264 | 200 | } | ||
265 | 201 | } | ||
266 | 202 | |||
267 | 203 | complete_apps = ['maasserver'] | ||
268 | 204 | 0 | ||
269 | === modified file 'src/maasserver/models/node.py' | |||
270 | --- src/maasserver/models/node.py 2012-11-07 12:49:58 +0000 | |||
271 | +++ src/maasserver/models/node.py 2012-11-08 09:21:26 +0000 | |||
272 | @@ -67,10 +67,7 @@ | |||
273 | 67 | get_db_state, | 67 | get_db_state, |
274 | 68 | strip_domain, | 68 | strip_domain, |
275 | 69 | ) | 69 | ) |
280 | 70 | from maasserver.utils.orm import ( | 70 | from maasserver.utils.orm import get_first |
277 | 71 | get_first, | ||
278 | 72 | get_one, | ||
279 | 73 | ) | ||
281 | 74 | from piston.models import Token | 71 | from piston.models import Token |
282 | 75 | from provisioningserver.enum import ( | 72 | from provisioningserver.enum import ( |
283 | 76 | POWER_TYPE, | 73 | POWER_TYPE, |
284 | @@ -697,26 +694,6 @@ | |||
285 | 697 | else: | 694 | else: |
286 | 698 | return None | 695 | return None |
287 | 699 | 696 | ||
288 | 700 | def get_effective_kernel_options(self): | ||
289 | 701 | """Determine any special kernel parameters for this node. | ||
290 | 702 | |||
291 | 703 | :return: (tag, kernel_options) | ||
292 | 704 | tag is a Tag object or None. If None, the kernel_options came from | ||
293 | 705 | the global setting. | ||
294 | 706 | kernel_options, a string indicating extra kernel_options that | ||
295 | 707 | should be used when booting this node. May be None if no tags match | ||
296 | 708 | and no global setting has been configured. | ||
297 | 709 | """ | ||
298 | 710 | # First, see if there are any tags associated with this node that has a | ||
299 | 711 | # custom kernel parameter | ||
300 | 712 | tags = self.tags.filter(kernel_opts__isnull=False) | ||
301 | 713 | tags = tags.order_by('name')[:1] | ||
302 | 714 | tag = get_one(tags) | ||
303 | 715 | if tag is not None: | ||
304 | 716 | return tag, tag.kernel_opts | ||
305 | 717 | global_value = Config.objects.get_config('kernel_opts') | ||
306 | 718 | return None, global_value | ||
307 | 719 | |||
308 | 720 | @property | 697 | @property |
309 | 721 | def work_queue(self): | 698 | def work_queue(self): |
310 | 722 | """The name of the queue for tasks specific to this node.""" | 699 | """The name of the queue for tasks specific to this node.""" |
311 | 723 | 700 | ||
312 | === modified file 'src/maasserver/models/tag.py' | |||
313 | --- src/maasserver/models/tag.py 2012-11-07 11:16:43 +0000 | |||
314 | +++ src/maasserver/models/tag.py 2012-11-08 09:21:26 +0000 | |||
315 | @@ -89,8 +89,6 @@ | |||
316 | 89 | tag. | 89 | tag. |
317 | 90 | :ivar comment: A long-form description for humans about what this tag is | 90 | :ivar comment: A long-form description for humans about what this tag is |
318 | 91 | trying to accomplish. | 91 | trying to accomplish. |
319 | 92 | :ivar kernel_opts: Optional kernel command-line parameters string to be | ||
320 | 93 | used in the PXE config for nodes with this tags. | ||
321 | 94 | :ivar objects: The :class:`TagManager`. | 92 | :ivar objects: The :class:`TagManager`. |
322 | 95 | """ | 93 | """ |
323 | 96 | 94 | ||
324 | @@ -103,7 +101,6 @@ | |||
325 | 103 | validators=[RegexValidator(_tag_name_regex)]) | 101 | validators=[RegexValidator(_tag_name_regex)]) |
326 | 104 | definition = TextField(blank=True) | 102 | definition = TextField(blank=True) |
327 | 105 | comment = TextField(blank=True) | 103 | comment = TextField(blank=True) |
328 | 106 | kernel_opts = TextField(blank=True, null=True) | ||
329 | 107 | 104 | ||
330 | 108 | objects = TagManager() | 105 | objects = TagManager() |
331 | 109 | 106 | ||
332 | 110 | 107 | ||
333 | === modified file 'src/maasserver/testing/factory.py' | |||
334 | --- src/maasserver/testing/factory.py 2012-11-07 10:35:57 +0000 | |||
335 | +++ src/maasserver/testing/factory.py 2012-11-08 09:21:26 +0000 | |||
336 | @@ -251,15 +251,14 @@ | |||
337 | 251 | key.save() | 251 | key.save() |
338 | 252 | return key | 252 | return key |
339 | 253 | 253 | ||
342 | 254 | def make_tag(self, name=None, definition=None, comment='', | 254 | def make_tag(self, name=None, definition=None, comment='', created=None, |
343 | 255 | kernel_opts=None, created=None, updated=None): | 255 | updated=None): |
344 | 256 | if name is None: | 256 | if name is None: |
345 | 257 | name = self.make_name('tag') | 257 | name = self.make_name('tag') |
346 | 258 | if definition is None: | 258 | if definition is None: |
347 | 259 | # Is there a 'node' in this xml? | 259 | # Is there a 'node' in this xml? |
348 | 260 | definition = '//node' | 260 | definition = '//node' |
351 | 261 | tag = Tag(name=name, definition=definition, comment=comment, | 261 | tag = Tag(name=name, definition=definition, comment=comment) |
350 | 262 | kernel_opts=kernel_opts) | ||
352 | 263 | self._save_node_unchecked(tag) | 262 | self._save_node_unchecked(tag) |
353 | 264 | # Update the 'updated'/'created' fields with a call to 'update' | 263 | # Update the 'updated'/'created' fields with a call to 'update' |
354 | 265 | # preventing a call to save() from overriding the values. | 264 | # preventing a call to save() from overriding the values. |
355 | 266 | 265 | ||
356 | === modified file 'src/maasserver/tests/test_api.py' | |||
357 | --- src/maasserver/tests/test_api.py 2012-11-08 06:40:03 +0000 | |||
358 | +++ src/maasserver/tests/test_api.py 2012-11-08 09:21:26 +0000 | |||
359 | @@ -2999,30 +2999,6 @@ | |||
360 | 2999 | % (invalid,)) | 2999 | % (invalid,)) |
361 | 3000 | self.assertFalse(Tag.objects.filter(name=invalid).exists()) | 3000 | self.assertFalse(Tag.objects.filter(name=invalid).exists()) |
362 | 3001 | 3001 | ||
363 | 3002 | def test_POST_new_kernel_opts(self): | ||
364 | 3003 | self.become_admin() | ||
365 | 3004 | name = factory.getRandomString() | ||
366 | 3005 | definition = '//node' | ||
367 | 3006 | comment = factory.getRandomString() | ||
368 | 3007 | extra_kernel_opts = factory.getRandomString() | ||
369 | 3008 | response = self.client.post( | ||
370 | 3009 | self.get_uri('tags/'), | ||
371 | 3010 | { | ||
372 | 3011 | 'op': 'new', | ||
373 | 3012 | 'name': name, | ||
374 | 3013 | 'comment': comment, | ||
375 | 3014 | 'definition': definition, | ||
376 | 3015 | 'kernel_opts': extra_kernel_opts, | ||
377 | 3016 | }) | ||
378 | 3017 | self.assertEqual(httplib.OK, response.status_code) | ||
379 | 3018 | parsed_result = json.loads(response.content) | ||
380 | 3019 | self.assertEqual(name, parsed_result['name']) | ||
381 | 3020 | self.assertEqual(comment, parsed_result['comment']) | ||
382 | 3021 | self.assertEqual(definition, parsed_result['definition']) | ||
383 | 3022 | self.assertEqual(extra_kernel_opts, parsed_result['kernel_opts']) | ||
384 | 3023 | self.assertEqual( | ||
385 | 3024 | extra_kernel_opts, Tag.objects.filter(name=name)[0].kernel_opts) | ||
386 | 3025 | |||
387 | 3026 | def test_POST_new_populates_nodes(self): | 3002 | def test_POST_new_populates_nodes(self): |
388 | 3027 | self.become_admin() | 3003 | self.become_admin() |
389 | 3028 | node1 = factory.make_node() | 3004 | node1 = factory.make_node() |
390 | @@ -3386,23 +3362,6 @@ | |||
391 | 3386 | kernel_params = KernelParameters(**self.get_pxeconfig(params)) | 3362 | kernel_params = KernelParameters(**self.get_pxeconfig(params)) |
392 | 3387 | self.assertEqual(params["local"], kernel_params.fs_host) | 3363 | self.assertEqual(params["local"], kernel_params.fs_host) |
393 | 3388 | 3364 | ||
394 | 3389 | def test_pxeconfig_returns_extra_kernel_options(self): | ||
395 | 3390 | node = factory.make_node() | ||
396 | 3391 | extra_kernel_opts = factory.getRandomString() | ||
397 | 3392 | Config.objects.set_config('kernel_opts', extra_kernel_opts) | ||
398 | 3393 | mac = factory.make_mac_address(node=node) | ||
399 | 3394 | params = self.get_default_params() | ||
400 | 3395 | params['mac'] = mac.mac_address | ||
401 | 3396 | pxe_config = self.get_pxeconfig(params) | ||
402 | 3397 | self.assertEqual(extra_kernel_opts, pxe_config['extra_opts']) | ||
403 | 3398 | |||
404 | 3399 | def test_pxeconfig_returns_None_for_extra_kernel_opts(self): | ||
405 | 3400 | mac = factory.make_mac_address() | ||
406 | 3401 | params = self.get_default_params() | ||
407 | 3402 | params['mac'] = mac.mac_address | ||
408 | 3403 | pxe_config = self.get_pxeconfig(params) | ||
409 | 3404 | self.assertEqual(None, pxe_config['extra_opts']) | ||
410 | 3405 | |||
411 | 3406 | 3365 | ||
412 | 3407 | class TestNodeGroupsAPI(APIv10TestMixin, MultipleUsersScenarios, TestCase): | 3366 | class TestNodeGroupsAPI(APIv10TestMixin, MultipleUsersScenarios, TestCase): |
413 | 3408 | scenarios = [ | 3367 | scenarios = [ |
414 | 3409 | 3368 | ||
415 | === modified file 'src/maasserver/tests/test_node.py' | |||
416 | --- src/maasserver/tests/test_node.py 2012-11-08 06:40:03 +0000 | |||
417 | +++ src/maasserver/tests/test_node.py 2012-11-08 09:21:26 +0000 | |||
418 | @@ -303,62 +303,6 @@ | |||
419 | 303 | successful_types = [node_power_types[node] for node in started_nodes] | 303 | successful_types = [node_power_types[node] for node in started_nodes] |
420 | 304 | self.assertItemsEqual(configless_power_types, successful_types) | 304 | self.assertItemsEqual(configless_power_types, successful_types) |
421 | 305 | 305 | ||
422 | 306 | def test_get_effective_kernel_options_with_nothing_set(self): | ||
423 | 307 | node = factory.make_node() | ||
424 | 308 | self.assertEqual((None, None), node.get_effective_kernel_options()) | ||
425 | 309 | |||
426 | 310 | def test_get_effective_kernel_options_sees_global_config(self): | ||
427 | 311 | node = factory.make_node() | ||
428 | 312 | kernel_opts = factory.getRandomString() | ||
429 | 313 | Config.objects.set_config('kernel_opts', kernel_opts) | ||
430 | 314 | self.assertEqual( | ||
431 | 315 | (None, kernel_opts), node.get_effective_kernel_options()) | ||
432 | 316 | |||
433 | 317 | def test_get_effective_kernel_options_not_confused_by_empty_tag(self): | ||
434 | 318 | node = factory.make_node() | ||
435 | 319 | tag = factory.make_tag() | ||
436 | 320 | node.tags.add(tag) | ||
437 | 321 | kernel_opts = factory.getRandomString() | ||
438 | 322 | Config.objects.set_config('kernel_opts', kernel_opts) | ||
439 | 323 | self.assertEqual( | ||
440 | 324 | (None, kernel_opts), node.get_effective_kernel_options()) | ||
441 | 325 | |||
442 | 326 | def test_get_effective_kernel_options_ignores_unassociated_tag_value(self): | ||
443 | 327 | node = factory.make_node() | ||
444 | 328 | factory.make_tag(kernel_opts=factory.getRandomString()) | ||
445 | 329 | self.assertEqual((None, None), node.get_effective_kernel_options()) | ||
446 | 330 | |||
447 | 331 | def test_get_effective_kernel_options_uses_tag_value(self): | ||
448 | 332 | node = factory.make_node() | ||
449 | 333 | tag = factory.make_tag(kernel_opts=factory.getRandomString()) | ||
450 | 334 | node.tags.add(tag) | ||
451 | 335 | self.assertEqual( | ||
452 | 336 | (tag, tag.kernel_opts), node.get_effective_kernel_options()) | ||
453 | 337 | |||
454 | 338 | def test_get_effective_kernel_options_tag_overrides_global(self): | ||
455 | 339 | node = factory.make_node() | ||
456 | 340 | global_opts = factory.getRandomString() | ||
457 | 341 | Config.objects.set_config('kernel_opts', global_opts) | ||
458 | 342 | tag = factory.make_tag(kernel_opts=factory.getRandomString()) | ||
459 | 343 | node.tags.add(tag) | ||
460 | 344 | self.assertEqual( | ||
461 | 345 | (tag, tag.kernel_opts), node.get_effective_kernel_options()) | ||
462 | 346 | |||
463 | 347 | def test_get_effective_kernel_options_uses_first_real_tag_value(self): | ||
464 | 348 | node = factory.make_node() | ||
465 | 349 | # Intentionally create them in reverse order, so the default 'db' order | ||
466 | 350 | # doesn't work, and we have asserted that we sort them. | ||
467 | 351 | tag3 = factory.make_tag(factory.make_name('tag-03-'), | ||
468 | 352 | kernel_opts=factory.getRandomString()) | ||
469 | 353 | tag2 = factory.make_tag(factory.make_name('tag-02-'), | ||
470 | 354 | kernel_opts=factory.getRandomString()) | ||
471 | 355 | tag1 = factory.make_tag(factory.make_name('tag-01-'), kernel_opts=None) | ||
472 | 356 | self.assertTrue(tag1.name < tag2.name) | ||
473 | 357 | self.assertTrue(tag2.name < tag3.name) | ||
474 | 358 | node.tags.add(tag1, tag2, tag3) | ||
475 | 359 | self.assertEqual( | ||
476 | 360 | (tag2, tag2.kernel_opts), node.get_effective_kernel_options()) | ||
477 | 361 | |||
478 | 362 | def test_acquire(self): | 306 | def test_acquire(self): |
479 | 363 | node = factory.make_node(status=NODE_STATUS.READY) | 307 | node = factory.make_node(status=NODE_STATUS.READY) |
480 | 364 | user = factory.make_user() | 308 | user = factory.make_user() |
481 | 365 | 309 | ||
482 | === modified file 'src/maasserver/tests/test_tag.py' | |||
483 | --- src/maasserver/tests/test_tag.py 2012-11-07 10:35:57 +0000 | |||
484 | +++ src/maasserver/tests/test_tag.py 2012-11-08 09:21:26 +0000 | |||
485 | @@ -29,16 +29,6 @@ | |||
486 | 29 | self.assertEqual('tag-name', tag.name) | 29 | self.assertEqual('tag-name', tag.name) |
487 | 30 | self.assertEqual('//node[@id=display]', tag.definition) | 30 | self.assertEqual('//node[@id=display]', tag.definition) |
488 | 31 | self.assertEqual('', tag.comment) | 31 | self.assertEqual('', tag.comment) |
489 | 32 | self.assertIs(None, tag.kernel_opts) | ||
490 | 33 | self.assertIsNot(None, tag.updated) | ||
491 | 34 | self.assertIsNot(None, tag.created) | ||
492 | 35 | |||
493 | 36 | def test_factory_make_tag_with_hardware_details(self): | ||
494 | 37 | tag = factory.make_tag('a-tag', 'true', kernel_opts="console=ttyS0") | ||
495 | 38 | self.assertEqual('a-tag', tag.name) | ||
496 | 39 | self.assertEqual('true', tag.definition) | ||
497 | 40 | self.assertEqual('', tag.comment) | ||
498 | 41 | self.assertEqual('console=ttyS0', tag.kernel_opts) | ||
499 | 42 | self.assertIsNot(None, tag.updated) | 32 | self.assertIsNot(None, tag.updated) |
500 | 43 | self.assertIsNot(None, tag.created) | 33 | self.assertIsNot(None, tag.created) |
501 | 44 | 34 | ||
502 | 45 | 35 | ||
503 | === modified file 'src/provisioningserver/kernel_opts.py' | |||
504 | --- src/provisioningserver/kernel_opts.py 2012-11-08 06:40:03 +0000 | |||
505 | +++ src/provisioningserver/kernel_opts.py 2012-11-08 09:21:26 +0000 | |||
506 | @@ -37,8 +37,6 @@ | |||
507 | 37 | "preseed_url", # URL from which a preseed can be obtained. | 37 | "preseed_url", # URL from which a preseed can be obtained. |
508 | 38 | "log_host", # Host/IP to which syslog can be streamed. | 38 | "log_host", # Host/IP to which syslog can be streamed. |
509 | 39 | "fs_host", # Host/IP on which ephemeral filesystems are hosted. | 39 | "fs_host", # Host/IP on which ephemeral filesystems are hosted. |
510 | 40 | "extra_opts", # String of extra options to supply, will be appended | ||
511 | 41 | # verbatim to the kernel command line | ||
512 | 42 | )) | 40 | )) |
513 | 43 | 41 | ||
514 | 44 | 42 | ||
515 | @@ -178,6 +176,4 @@ | |||
516 | 178 | # as it would be nice to have. | 176 | # as it would be nice to have. |
517 | 179 | options += compose_logging_opts(params.log_host) | 177 | options += compose_logging_opts(params.log_host) |
518 | 180 | options += compose_arch_opts(params) | 178 | options += compose_arch_opts(params) |
519 | 181 | if params.extra_opts: | ||
520 | 182 | options.append(params.extra_opts) | ||
521 | 183 | return ' '.join(options) | 179 | return ' '.join(options) |
522 | 184 | 180 | ||
523 | === modified file 'src/provisioningserver/tests/test_kernel_opts.py' | |||
524 | --- src/provisioningserver/tests/test_kernel_opts.py 2012-11-08 06:40:03 +0000 | |||
525 | +++ src/provisioningserver/tests/test_kernel_opts.py 2012-11-08 09:21:26 +0000 | |||
526 | @@ -133,19 +133,6 @@ | |||
527 | 133 | "overlayroot=tmpfs", | 133 | "overlayroot=tmpfs", |
528 | 134 | "ip=::::%s:BOOTIF" % params.hostname])) | 134 | "ip=::::%s:BOOTIF" % params.hostname])) |
529 | 135 | 135 | ||
530 | 136 | def test_commissioning_compose_kernel_command_line_inc_extra_opts(self): | ||
531 | 137 | extra_opts = "special console=ABCD -- options to pass" | ||
532 | 138 | params = make_kernel_parameters(extra_opts=extra_opts) | ||
533 | 139 | cmdline = compose_kernel_command_line(params) | ||
534 | 140 | # There should be a blank space before the options, but otherwise added | ||
535 | 141 | # verbatim. | ||
536 | 142 | self.assertThat(cmdline, Contains(' ' + extra_opts)) | ||
537 | 143 | |||
538 | 144 | def test_commissioning_compose_kernel_handles_extra_opts_None(self): | ||
539 | 145 | params = make_kernel_parameters(extra_opts=None) | ||
540 | 146 | cmdline = compose_kernel_command_line(params) | ||
541 | 147 | self.assertNotIn(cmdline, "None") | ||
542 | 148 | |||
543 | 149 | def test_compose_kernel_command_line_inc_common_opts(self): | 136 | def test_compose_kernel_command_line_inc_common_opts(self): |
544 | 150 | # Test that some kernel arguments appear on both commissioning | 137 | # Test that some kernel arguments appear on both commissioning |
545 | 151 | # and install command lines. | 138 | # and install command lines. |
Nothing obviously bad. Removing a schema migration is a little dodgy, but I guess we just tell anyone with a 1.2 development branch that they need to `rm -rf db && make syncdb`.