Merge lp:~mpontillo/maas/relax-bridge-restrictions--bug-1661203 into lp:~maas-committers/maas/trunk
- relax-bridge-restrictions--bug-1661203
- Merge into trunk
Proposed by
Mike Pontillo
| Status: | Merged |
|---|---|
| Approved by: | Mike Pontillo |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 5937 |
| Proposed branch: | lp:~mpontillo/maas/relax-bridge-restrictions--bug-1661203 |
| Merge into: | lp:~maas-committers/maas/trunk |
| Diff against target: |
784 lines (+169/-92) 2 files modified
src/maasserver/forms/interface.py (+28/-11) src/maasserver/forms/tests/test_interface.py (+141/-81) |
| To merge this branch: | bzr merge lp:~mpontillo/maas/relax-bridge-restrictions--bug-1661203 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| LaMont Jones (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Allow creating bridges whose parents already have VLANs.
Drive-by fix to use dict(form.errors) so that test failures produce nicer errors.
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 | === modified file 'src/maasserver/forms/interface.py' | |||
| 2 | --- src/maasserver/forms/interface.py 2017-02-28 11:37:12 +0000 | |||
| 3 | +++ src/maasserver/forms/interface.py 2017-04-05 23:39:39 +0000 | |||
| 4 | @@ -397,21 +397,25 @@ | |||
| 5 | 397 | vlan = parents[0].vlan | 397 | vlan = parents[0].vlan |
| 6 | 398 | self.cleaned_data['vlan'] = vlan | 398 | self.cleaned_data['vlan'] = vlan |
| 7 | 399 | 399 | ||
| 9 | 400 | def _validate_parental_fidelity(self, parents): | 400 | def get_delinquent_children(self, parents): |
| 10 | 401 | """Returns either an empty set, or a set of children whose presence | ||
| 11 | 402 | would deter the parent from adopting this new child.""" | ||
| 12 | 403 | return { | ||
| 13 | 404 | parent.name for parent in parents | ||
| 14 | 405 | for rel in parent.children_relationships.all() | ||
| 15 | 406 | if rel.child.id != self.instance.id | ||
| 16 | 407 | } | ||
| 17 | 408 | |||
| 18 | 409 | def validate_parental_fidelity(self, parents): | ||
| 19 | 401 | """Check that all of the parent interfaces are not already in a | 410 | """Check that all of the parent interfaces are not already in a |
| 20 | 402 | relationship before committing them to this child. | 411 | relationship before committing them to this child. |
| 21 | 403 | """ | 412 | """ |
| 29 | 404 | parents_with_other_children = { | 413 | dilinquents = self.get_delinquent_children(parents) |
| 30 | 405 | parent.name | 414 | if len(dilinquents) != 0: |
| 24 | 406 | for parent in parents | ||
| 25 | 407 | for rel in parent.children_relationships.all() | ||
| 26 | 408 | if rel.child.id != self.instance.id | ||
| 27 | 409 | } | ||
| 28 | 410 | if parents_with_other_children: | ||
| 31 | 411 | set_form_error( | 415 | set_form_error( |
| 32 | 412 | self, 'parents', | 416 | self, 'parents', |
| 33 | 413 | "Interfaces already in-use: %s." % ( | 417 | "Interfaces already in-use: %s." % ( |
| 35 | 414 | ', '.join(sorted(parents_with_other_children)))) | 418 | ', '.join(sorted(dilinquents)))) |
| 36 | 415 | 419 | ||
| 37 | 416 | 420 | ||
| 38 | 417 | class BondInterfaceForm(ChildInterfaceForm): | 421 | class BondInterfaceForm(ChildInterfaceForm): |
| 39 | @@ -466,7 +470,7 @@ | |||
| 40 | 466 | # created. | 470 | # created. |
| 41 | 467 | if parents: | 471 | if parents: |
| 42 | 468 | self._set_default_child_mac(parents) | 472 | self._set_default_child_mac(parents) |
| 44 | 469 | self._validate_parental_fidelity(parents) | 473 | self.validate_parental_fidelity(parents) |
| 45 | 470 | self._set_default_vlan(parents) | 474 | self._set_default_vlan(parents) |
| 46 | 471 | self._validate_parent_vlans_match(parents) | 475 | self._validate_parent_vlans_match(parents) |
| 47 | 472 | return cleaned_data | 476 | return cleaned_data |
| 48 | @@ -544,6 +548,19 @@ | |||
| 49 | 544 | "in a bond or a bridge.") | 548 | "in a bond or a bridge.") |
| 50 | 545 | return parents | 549 | return parents |
| 51 | 546 | 550 | ||
| 52 | 551 | def get_delinquent_children(self, parents): | ||
| 53 | 552 | """Returns a set of children who would prevent the creation of this | ||
| 54 | 553 | bridge interface. The only difference between this method and the | ||
| 55 | 554 | method it overrides is that it allows VLAN interface children, whom | ||
| 56 | 555 | bridges may get along with. | ||
| 57 | 556 | """ | ||
| 58 | 557 | return { | ||
| 59 | 558 | parent.name for parent in parents | ||
| 60 | 559 | for rel in parent.children_relationships.all() | ||
| 61 | 560 | if (rel.child.id != self.instance.id and | ||
| 62 | 561 | rel.child.type != INTERFACE_TYPE.VLAN) | ||
| 63 | 562 | } | ||
| 64 | 563 | |||
| 65 | 547 | def clean(self): | 564 | def clean(self): |
| 66 | 548 | cleaned_data = super().clean() | 565 | cleaned_data = super().clean() |
| 67 | 549 | if self.fields_ok(['vlan', 'parents']): | 566 | if self.fields_ok(['vlan', 'parents']): |
| 68 | @@ -552,7 +569,7 @@ | |||
| 69 | 552 | # created. | 569 | # created. |
| 70 | 553 | if parents: | 570 | if parents: |
| 71 | 554 | self._set_default_child_mac(parents) | 571 | self._set_default_child_mac(parents) |
| 73 | 555 | self._validate_parental_fidelity(parents) | 572 | self.validate_parental_fidelity(parents) |
| 74 | 556 | self._set_default_vlan(parents) | 573 | self._set_default_vlan(parents) |
| 75 | 557 | return cleaned_data | 574 | return cleaned_data |
| 76 | 558 | 575 | ||
| 77 | 559 | 576 | ||
| 78 | === modified file 'src/maasserver/forms/tests/test_interface.py' | |||
| 79 | --- src/maasserver/forms/tests/test_interface.py 2017-03-29 11:11:35 +0000 | |||
| 80 | +++ src/maasserver/forms/tests/test_interface.py 2017-04-05 23:39:39 +0000 | |||
| 81 | @@ -82,7 +82,7 @@ | |||
| 82 | 82 | data={ | 82 | data={ |
| 83 | 83 | 'vlan': new_vlan.id, | 83 | 'vlan': new_vlan.id, |
| 84 | 84 | }) | 84 | }) |
| 86 | 85 | self.assertTrue(form.is_valid(), form.errors) | 85 | self.assertTrue(form.is_valid(), dict(form.errors)) |
| 87 | 86 | interface = form.save() | 86 | interface = form.save() |
| 88 | 87 | self.assertThat( | 87 | self.assertThat( |
| 89 | 88 | interface, | 88 | interface, |
| 90 | @@ -98,7 +98,7 @@ | |||
| 91 | 98 | data={ | 98 | data={ |
| 92 | 99 | 'vlan': None, | 99 | 'vlan': None, |
| 93 | 100 | }) | 100 | }) |
| 95 | 101 | self.assertTrue(form.is_valid(), form.errors) | 101 | self.assertTrue(form.is_valid(), dict(form.errors)) |
| 96 | 102 | interface = form.save() | 102 | interface = form.save() |
| 97 | 103 | self.assertThat( | 103 | self.assertThat( |
| 98 | 104 | interface, | 104 | interface, |
| 99 | @@ -119,7 +119,7 @@ | |||
| 100 | 119 | 'name': new_name, | 119 | 'name': new_name, |
| 101 | 120 | 'mac_address': new_mac, | 120 | 'mac_address': new_mac, |
| 102 | 121 | }) | 121 | }) |
| 104 | 122 | self.assertTrue(form.is_valid(), form.errors) | 122 | self.assertTrue(form.is_valid(), dict(form.errors)) |
| 105 | 123 | interface = form.save() | 123 | interface = form.save() |
| 106 | 124 | self.assertThat( | 124 | self.assertThat( |
| 107 | 125 | interface, | 125 | interface, |
| 108 | @@ -147,7 +147,7 @@ | |||
| 109 | 147 | 'vlan': vlan.id, | 147 | 'vlan': vlan.id, |
| 110 | 148 | 'tags': ",".join(tags), | 148 | 'tags': ",".join(tags), |
| 111 | 149 | }) | 149 | }) |
| 113 | 150 | self.assertTrue(form.is_valid(), form.errors) | 150 | self.assertTrue(form.is_valid(), dict(form.errors)) |
| 114 | 151 | interface = form.save() | 151 | interface = form.save() |
| 115 | 152 | self.assertThat( | 152 | self.assertThat( |
| 116 | 153 | interface, | 153 | interface, |
| 117 | @@ -174,7 +174,7 @@ | |||
| 118 | 174 | 'vlan': vlan.id, | 174 | 'vlan': vlan.id, |
| 119 | 175 | 'tags': ",".join(tags), | 175 | 'tags': ",".join(tags), |
| 120 | 176 | }) | 176 | }) |
| 122 | 177 | self.assertTrue(form.is_valid(), form.errors) | 177 | self.assertTrue(form.is_valid(), dict(form.errors)) |
| 123 | 178 | interface = form.save() | 178 | interface = form.save() |
| 124 | 179 | self.assertThat( | 179 | self.assertThat( |
| 125 | 180 | interface, | 180 | interface, |
| 126 | @@ -198,7 +198,7 @@ | |||
| 127 | 198 | 'mac_address': mac_address, | 198 | 'mac_address': mac_address, |
| 128 | 199 | 'tags': ",".join(tags), | 199 | 'tags': ",".join(tags), |
| 129 | 200 | }) | 200 | }) |
| 131 | 201 | self.assertTrue(form.is_valid(), form.errors) | 201 | self.assertTrue(form.is_valid(), dict(form.errors)) |
| 132 | 202 | interface = form.save() | 202 | interface = form.save() |
| 133 | 203 | self.assertThat( | 203 | self.assertThat( |
| 134 | 204 | interface, | 204 | interface, |
| 135 | @@ -225,7 +225,7 @@ | |||
| 136 | 225 | 'vlan': vlan.id, | 225 | 'vlan': vlan.id, |
| 137 | 226 | 'tags': ",".join(tags), | 226 | 'tags': ",".join(tags), |
| 138 | 227 | }) | 227 | }) |
| 140 | 228 | self.assertTrue(form.is_valid(), form.errors) | 228 | self.assertTrue(form.is_valid(), dict(form.errors)) |
| 141 | 229 | interface = form.save() | 229 | interface = form.save() |
| 142 | 230 | self.assertIsNotNone( | 230 | self.assertIsNotNone( |
| 143 | 231 | interface.ip_addresses.filter(alloc_type=IPADDRESS_TYPE.STICKY)) | 231 | interface.ip_addresses.filter(alloc_type=IPADDRESS_TYPE.STICKY)) |
| 144 | @@ -240,7 +240,7 @@ | |||
| 145 | 240 | 'name': interface_name, | 240 | 'name': interface_name, |
| 146 | 241 | 'vlan': vlan.id, | 241 | 'vlan': vlan.id, |
| 147 | 242 | }) | 242 | }) |
| 149 | 243 | self.assertFalse(form.is_valid(), form.errors) | 243 | self.assertFalse(form.is_valid(), dict(form.errors)) |
| 150 | 244 | self.assertItemsEqual( | 244 | self.assertItemsEqual( |
| 151 | 245 | ['mac_address'], form.errors.keys(), form.errors) | 245 | ['mac_address'], form.errors.keys(), form.errors) |
| 152 | 246 | self.assertIn( | 246 | self.assertIn( |
| 153 | @@ -259,7 +259,7 @@ | |||
| 154 | 259 | 'mac_address': mac_address, | 259 | 'mac_address': mac_address, |
| 155 | 260 | 'vlan': interface.vlan.id, | 260 | 'vlan': interface.vlan.id, |
| 156 | 261 | }) | 261 | }) |
| 158 | 262 | self.assertFalse(form.is_valid(), form.errors) | 262 | self.assertFalse(form.is_valid(), dict(form.errors)) |
| 159 | 263 | self.assertItemsEqual( | 263 | self.assertItemsEqual( |
| 160 | 264 | ['name'], form.errors.keys(), form.errors) | 264 | ['name'], form.errors.keys(), form.errors) |
| 161 | 265 | self.assertIn( | 265 | self.assertIn( |
| 162 | @@ -279,7 +279,7 @@ | |||
| 163 | 279 | 'mac_address': mac_address, | 279 | 'mac_address': mac_address, |
| 164 | 280 | 'vlan': vlan.id, | 280 | 'vlan': vlan.id, |
| 165 | 281 | }) | 281 | }) |
| 167 | 282 | self.assertFalse(form.is_valid(), form.errors) | 282 | self.assertFalse(form.is_valid(), dict(form.errors)) |
| 168 | 283 | self.assertItemsEqual( | 283 | self.assertItemsEqual( |
| 169 | 284 | ['vlan'], form.errors.keys(), form.errors) | 284 | ['vlan'], form.errors.keys(), form.errors) |
| 170 | 285 | self.assertIn( | 285 | self.assertIn( |
| 171 | @@ -301,7 +301,7 @@ | |||
| 172 | 301 | 'mac_address': mac_address, | 301 | 'mac_address': mac_address, |
| 173 | 302 | 'vlan': vlan.id, | 302 | 'vlan': vlan.id, |
| 174 | 303 | }) | 303 | }) |
| 176 | 304 | self.assertTrue(form.is_valid(), form.errors) | 304 | self.assertTrue(form.is_valid(), dict(form.errors)) |
| 177 | 305 | interface = form.save() | 305 | interface = form.save() |
| 178 | 306 | self.assertEquals(vlan, interface.vlan) | 306 | self.assertEquals(vlan, interface.vlan) |
| 179 | 307 | 307 | ||
| 180 | @@ -317,7 +317,7 @@ | |||
| 181 | 317 | 'vlan': vlan.id, | 317 | 'vlan': vlan.id, |
| 182 | 318 | 'parents': [parent.id], | 318 | 'parents': [parent.id], |
| 183 | 319 | }) | 319 | }) |
| 185 | 320 | self.assertFalse(form.is_valid(), form.errors) | 320 | self.assertFalse(form.is_valid(), dict(form.errors)) |
| 186 | 321 | self.assertItemsEqual( | 321 | self.assertItemsEqual( |
| 187 | 322 | ['parents'], form.errors.keys(), form.errors) | 322 | ['parents'], form.errors.keys(), form.errors) |
| 188 | 323 | self.assertIn( | 323 | self.assertIn( |
| 189 | @@ -338,7 +338,7 @@ | |||
| 190 | 338 | 'enabled': False, | 338 | 'enabled': False, |
| 191 | 339 | 'tags': "", | 339 | 'tags': "", |
| 192 | 340 | }) | 340 | }) |
| 194 | 341 | self.assertTrue(form.is_valid(), form.errors) | 341 | self.assertTrue(form.is_valid(), dict(form.errors)) |
| 195 | 342 | interface = form.save() | 342 | interface = form.save() |
| 196 | 343 | self.assertThat( | 343 | self.assertThat( |
| 197 | 344 | interface, | 344 | interface, |
| 198 | @@ -358,7 +358,7 @@ | |||
| 199 | 358 | 'enabled': False, | 358 | 'enabled': False, |
| 200 | 359 | 'tags': "", | 359 | 'tags': "", |
| 201 | 360 | }) | 360 | }) |
| 203 | 361 | self.assertTrue(form.is_valid(), form.errors) | 361 | self.assertTrue(form.is_valid(), dict(form.errors)) |
| 204 | 362 | interface = form.save() | 362 | interface = form.save() |
| 205 | 363 | self.assertThat( | 363 | self.assertThat( |
| 206 | 364 | interface, | 364 | interface, |
| 207 | @@ -378,7 +378,7 @@ | |||
| 208 | 378 | 'enabled': False, | 378 | 'enabled': False, |
| 209 | 379 | 'tags': "", | 379 | 'tags': "", |
| 210 | 380 | }) | 380 | }) |
| 212 | 381 | self.assertTrue(form.is_valid(), form.errors) | 381 | self.assertTrue(form.is_valid(), dict(form.errors)) |
| 213 | 382 | interface = form.save() | 382 | interface = form.save() |
| 214 | 383 | self.assertThat( | 383 | self.assertThat( |
| 215 | 384 | interface, | 384 | interface, |
| 216 | @@ -410,7 +410,7 @@ | |||
| 217 | 410 | 'accept_ra': accept_ra, | 410 | 'accept_ra': accept_ra, |
| 218 | 411 | 'autoconf': autoconf, | 411 | 'autoconf': autoconf, |
| 219 | 412 | }) | 412 | }) |
| 221 | 413 | self.assertTrue(form.is_valid(), form.errors) | 413 | self.assertTrue(form.is_valid(), dict(form.errors)) |
| 222 | 414 | interface = form.save() | 414 | interface = form.save() |
| 223 | 415 | self.assertEqual({ | 415 | self.assertEqual({ |
| 224 | 416 | "mtu": mtu, | 416 | "mtu": mtu, |
| 225 | @@ -440,7 +440,7 @@ | |||
| 226 | 440 | 'enabled': False, | 440 | 'enabled': False, |
| 227 | 441 | 'tags': "", | 441 | 'tags': "", |
| 228 | 442 | }) | 442 | }) |
| 230 | 443 | self.assertTrue(form.is_valid(), form.errors) | 443 | self.assertTrue(form.is_valid(), dict(form.errors)) |
| 231 | 444 | interface = form.save() | 444 | interface = form.save() |
| 232 | 445 | self.assertEqual({ | 445 | self.assertEqual({ |
| 233 | 446 | "mtu": mtu, | 446 | "mtu": mtu, |
| 234 | @@ -469,7 +469,7 @@ | |||
| 235 | 469 | "accept_ra": new_accept_ra, | 469 | "accept_ra": new_accept_ra, |
| 236 | 470 | "autoconf": new_autoconf, | 470 | "autoconf": new_autoconf, |
| 237 | 471 | }) | 471 | }) |
| 239 | 472 | self.assertTrue(form.is_valid(), form.errors) | 472 | self.assertTrue(form.is_valid(), dict(form.errors)) |
| 240 | 473 | interface = form.save() | 473 | interface = form.save() |
| 241 | 474 | self.assertEqual({ | 474 | self.assertEqual({ |
| 242 | 475 | "mtu": new_mtu, | 475 | "mtu": new_mtu, |
| 243 | @@ -495,7 +495,7 @@ | |||
| 244 | 495 | "accept_ra": "", | 495 | "accept_ra": "", |
| 245 | 496 | "autoconf": "", | 496 | "autoconf": "", |
| 246 | 497 | }) | 497 | }) |
| 248 | 498 | self.assertTrue(form.is_valid(), form.errors) | 498 | self.assertTrue(form.is_valid(), dict(form.errors)) |
| 249 | 499 | interface = form.save() | 499 | interface = form.save() |
| 250 | 500 | self.assertEqual({}, interface.params) | 500 | self.assertEqual({}, interface.params) |
| 251 | 501 | 501 | ||
| 252 | @@ -511,7 +511,7 @@ | |||
| 253 | 511 | 'vlan': vlan.id, | 511 | 'vlan': vlan.id, |
| 254 | 512 | 'parents': [parent.id], | 512 | 'parents': [parent.id], |
| 255 | 513 | }) | 513 | }) |
| 257 | 514 | self.assertTrue(form.is_valid(), form.errors) | 514 | self.assertTrue(form.is_valid(), dict(form.errors)) |
| 258 | 515 | interface = form.save() | 515 | interface = form.save() |
| 259 | 516 | interface_name = build_vlan_interface_name(parent, vlan) | 516 | interface_name = build_vlan_interface_name(parent, vlan) |
| 260 | 517 | self.assertThat( | 517 | self.assertThat( |
| 261 | @@ -529,7 +529,7 @@ | |||
| 262 | 529 | 'vlan': vlan.id, | 529 | 'vlan': vlan.id, |
| 263 | 530 | 'parents': [parent.id], | 530 | 'parents': [parent.id], |
| 264 | 531 | }) | 531 | }) |
| 266 | 532 | self.assertTrue(form.is_valid(), form.errors) | 532 | self.assertTrue(form.is_valid(), dict(form.errors)) |
| 267 | 533 | interface = form.save() | 533 | interface = form.save() |
| 268 | 534 | self.assertIsNotNone( | 534 | self.assertIsNotNone( |
| 269 | 535 | interface.ip_addresses.filter(alloc_type=IPADDRESS_TYPE.STICKY)) | 535 | interface.ip_addresses.filter(alloc_type=IPADDRESS_TYPE.STICKY)) |
| 270 | @@ -541,7 +541,7 @@ | |||
| 271 | 541 | data={ | 541 | data={ |
| 272 | 542 | 'parents': [parent.id], | 542 | 'parents': [parent.id], |
| 273 | 543 | }) | 543 | }) |
| 275 | 544 | self.assertFalse(form.is_valid(), form.errors) | 544 | self.assertFalse(form.is_valid(), dict(form.errors)) |
| 276 | 545 | self.assertItemsEqual( | 545 | self.assertItemsEqual( |
| 277 | 546 | ['vlan'], form.errors.keys(), form.errors) | 546 | ['vlan'], form.errors.keys(), form.errors) |
| 278 | 547 | self.assertIn( | 547 | self.assertIn( |
| 279 | @@ -559,7 +559,7 @@ | |||
| 280 | 559 | 'vlan': vlan.id, | 559 | 'vlan': vlan.id, |
| 281 | 560 | 'parents': [parent.id], | 560 | 'parents': [parent.id], |
| 282 | 561 | }) | 561 | }) |
| 284 | 562 | self.assertFalse(form.is_valid(), form.errors) | 562 | self.assertFalse(form.is_valid(), dict(form.errors)) |
| 285 | 563 | self.assertItemsEqual( | 563 | self.assertItemsEqual( |
| 286 | 564 | ['name'], form.errors.keys(), form.errors) | 564 | ['name'], form.errors.keys(), form.errors) |
| 287 | 565 | self.assertIn( | 565 | self.assertIn( |
| 288 | @@ -575,7 +575,7 @@ | |||
| 289 | 575 | 'vlan': vlan.id, | 575 | 'vlan': vlan.id, |
| 290 | 576 | 'parents': [parent.id], | 576 | 'parents': [parent.id], |
| 291 | 577 | }) | 577 | }) |
| 293 | 578 | self.assertFalse(form.is_valid(), form.errors) | 578 | self.assertFalse(form.is_valid(), dict(form.errors)) |
| 294 | 579 | self.assertItemsEqual( | 579 | self.assertItemsEqual( |
| 295 | 580 | ['vlan'], form.errors.keys(), form.errors) | 580 | ['vlan'], form.errors.keys(), form.errors) |
| 296 | 581 | self.assertIn( | 581 | self.assertIn( |
| 297 | @@ -589,7 +589,7 @@ | |||
| 298 | 589 | data={ | 589 | data={ |
| 299 | 590 | 'vlan': vlan.id, | 590 | 'vlan': vlan.id, |
| 300 | 591 | }) | 591 | }) |
| 302 | 592 | self.assertFalse(form.is_valid(), form.errors) | 592 | self.assertFalse(form.is_valid(), dict(form.errors)) |
| 303 | 593 | self.assertItemsEqual(['parents'], form.errors.keys()) | 593 | self.assertItemsEqual(['parents'], form.errors.keys()) |
| 304 | 594 | self.assertIn( | 594 | self.assertIn( |
| 305 | 595 | "A VLAN interface must have exactly one parent.", | 595 | "A VLAN interface must have exactly one parent.", |
| 306 | @@ -607,7 +607,7 @@ | |||
| 307 | 607 | 'vlan': other_vlan.id, | 607 | 'vlan': other_vlan.id, |
| 308 | 608 | 'parents': [vlan_parent.id], | 608 | 'parents': [vlan_parent.id], |
| 309 | 609 | }) | 609 | }) |
| 311 | 610 | self.assertFalse(form.is_valid(), form.errors) | 610 | self.assertFalse(form.is_valid(), dict(form.errors)) |
| 312 | 611 | self.assertItemsEqual(['parents'], form.errors.keys()) | 611 | self.assertItemsEqual(['parents'], form.errors.keys()) |
| 313 | 612 | self.assertIn( | 612 | self.assertIn( |
| 314 | 613 | "VLAN interface can't have another VLAN interface as parent.", | 613 | "VLAN interface can't have another VLAN interface as parent.", |
| 315 | @@ -621,7 +621,7 @@ | |||
| 316 | 621 | 'vlan': None, | 621 | 'vlan': None, |
| 317 | 622 | 'parents': [parent.id], | 622 | 'parents': [parent.id], |
| 318 | 623 | }) | 623 | }) |
| 320 | 624 | self.assertFalse(form.is_valid(), form.errors) | 624 | self.assertFalse(form.is_valid(), dict(form.errors)) |
| 321 | 625 | self.assertItemsEqual(['vlan'], form.errors.keys()) | 625 | self.assertItemsEqual(['vlan'], form.errors.keys()) |
| 322 | 626 | self.assertIn( | 626 | self.assertIn( |
| 323 | 627 | "A VLAN interface must be connected to a tagged VLAN.", | 627 | "A VLAN interface must be connected to a tagged VLAN.", |
| 324 | @@ -637,7 +637,7 @@ | |||
| 325 | 637 | 'vlan': other_vlan.id, | 637 | 'vlan': other_vlan.id, |
| 326 | 638 | 'parents': [parent.id], | 638 | 'parents': [parent.id], |
| 327 | 639 | }) | 639 | }) |
| 329 | 640 | self.assertFalse(form.is_valid(), form.errors) | 640 | self.assertFalse(form.is_valid(), dict(form.errors)) |
| 330 | 641 | self.assertItemsEqual(['vlan'], form.errors.keys()) | 641 | self.assertItemsEqual(['vlan'], form.errors.keys()) |
| 331 | 642 | self.assertIn( | 642 | self.assertIn( |
| 332 | 643 | "A VLAN interface can only belong to a tagged VLAN on " | 643 | "A VLAN interface can only belong to a tagged VLAN on " |
| 333 | @@ -654,7 +654,7 @@ | |||
| 334 | 654 | 'vlan': vlan.id, | 654 | 'vlan': vlan.id, |
| 335 | 655 | 'parents': [parent.id], | 655 | 'parents': [parent.id], |
| 336 | 656 | }) | 656 | }) |
| 338 | 657 | self.assertFalse(form.is_valid(), form.errors) | 657 | self.assertFalse(form.is_valid(), dict(form.errors)) |
| 339 | 658 | self.assertItemsEqual(['parents'], form.errors.keys()) | 658 | self.assertItemsEqual(['parents'], form.errors.keys()) |
| 340 | 659 | self.assertIn( | 659 | self.assertIn( |
| 341 | 660 | "A VLAN interface can't have a parent that is already in a bond.", | 660 | "A VLAN interface can't have a parent that is already in a bond.", |
| 342 | @@ -671,7 +671,7 @@ | |||
| 343 | 671 | 'vlan': vlan.id, | 671 | 'vlan': vlan.id, |
| 344 | 672 | 'parents': [parent1.id, parent2.id], | 672 | 'parents': [parent1.id, parent2.id], |
| 345 | 673 | }) | 673 | }) |
| 347 | 674 | self.assertFalse(form.is_valid(), form.errors) | 674 | self.assertFalse(form.is_valid(), dict(form.errors)) |
| 348 | 675 | self.assertItemsEqual(['parents'], form.errors.keys()) | 675 | self.assertItemsEqual(['parents'], form.errors.keys()) |
| 349 | 676 | self.assertIn( | 676 | self.assertIn( |
| 350 | 677 | "A VLAN interface must have exactly one parent.", | 677 | "A VLAN interface must have exactly one parent.", |
| 351 | @@ -688,7 +688,7 @@ | |||
| 352 | 688 | data={ | 688 | data={ |
| 353 | 689 | 'vlan': new_vlan.id | 689 | 'vlan': new_vlan.id |
| 354 | 690 | }) | 690 | }) |
| 356 | 691 | self.assertTrue(form.is_valid(), form.errors) | 691 | self.assertTrue(form.is_valid(), dict(form.errors)) |
| 357 | 692 | interface = form.save() | 692 | interface = form.save() |
| 358 | 693 | self.assertThat( | 693 | self.assertThat( |
| 359 | 694 | interface, | 694 | interface, |
| 360 | @@ -713,7 +713,7 @@ | |||
| 361 | 713 | 'parents': [parent1.id, parent2.id], | 713 | 'parents': [parent1.id, parent2.id], |
| 362 | 714 | 'bond_mode': bond_mode, | 714 | 'bond_mode': bond_mode, |
| 363 | 715 | }) | 715 | }) |
| 365 | 716 | self.assertFalse(form.is_valid(), form.errors) | 716 | self.assertFalse(form.is_valid(), dict(form.errors)) |
| 366 | 717 | self.assertEqual({ | 717 | self.assertEqual({ |
| 367 | 718 | "bond_mode": [ | 718 | "bond_mode": [ |
| 368 | 719 | compose_invalid_choice_text( | 719 | compose_invalid_choice_text( |
| 369 | @@ -731,7 +731,7 @@ | |||
| 370 | 731 | 'name': interface_name, | 731 | 'name': interface_name, |
| 371 | 732 | 'parents': [parent1.id, parent2.id], | 732 | 'parents': [parent1.id, parent2.id], |
| 372 | 733 | }) | 733 | }) |
| 374 | 734 | self.assertTrue(form.is_valid(), form.errors) | 734 | self.assertTrue(form.is_valid(), dict(form.errors)) |
| 375 | 735 | interface = form.save() | 735 | interface = form.save() |
| 376 | 736 | self.assertThat( | 736 | self.assertThat( |
| 377 | 737 | interface, | 737 | interface, |
| 378 | @@ -755,7 +755,7 @@ | |||
| 379 | 755 | 'name': interface_name, | 755 | 'name': interface_name, |
| 380 | 756 | 'parents': [parent1.id, parent2.id], | 756 | 'parents': [parent1.id, parent2.id], |
| 381 | 757 | }) | 757 | }) |
| 383 | 758 | self.assertTrue(form.is_valid(), form.errors) | 758 | self.assertTrue(form.is_valid(), dict(form.errors)) |
| 384 | 759 | interface = form.save() | 759 | interface = form.save() |
| 385 | 760 | self.assertEqual( | 760 | self.assertEqual( |
| 386 | 761 | 0, | 761 | 0, |
| 387 | @@ -780,7 +780,7 @@ | |||
| 388 | 780 | 'parents': [parent1.id, parent2.id], | 780 | 'parents': [parent1.id, parent2.id], |
| 389 | 781 | 'mac_address': parent1.mac_address, | 781 | 'mac_address': parent1.mac_address, |
| 390 | 782 | }) | 782 | }) |
| 392 | 783 | self.assertTrue(form.is_valid(), form.errors) | 783 | self.assertTrue(form.is_valid(), dict(form.errors)) |
| 393 | 784 | interface = form.save() | 784 | interface = form.save() |
| 394 | 785 | self.assertThat( | 785 | self.assertThat( |
| 395 | 786 | interface, | 786 | interface, |
| 396 | @@ -800,7 +800,7 @@ | |||
| 397 | 800 | 'name': interface_name, | 800 | 'name': interface_name, |
| 398 | 801 | 'parents': [parent1.id, parent2.id], | 801 | 'parents': [parent1.id, parent2.id], |
| 399 | 802 | }) | 802 | }) |
| 401 | 803 | self.assertTrue(form.is_valid(), form.errors) | 803 | self.assertTrue(form.is_valid(), dict(form.errors)) |
| 402 | 804 | interface = form.save() | 804 | interface = form.save() |
| 403 | 805 | self.assertEqual({ | 805 | self.assertEqual({ |
| 404 | 806 | "bond_mode": "balance-rr", | 806 | "bond_mode": "balance-rr", |
| 405 | @@ -835,7 +835,7 @@ | |||
| 406 | 835 | 'bond_lacp_rate': bond_lacp_rate, | 835 | 'bond_lacp_rate': bond_lacp_rate, |
| 407 | 836 | 'bond_xmit_hash_policy': bond_xmit_hash_policy, | 836 | 'bond_xmit_hash_policy': bond_xmit_hash_policy, |
| 408 | 837 | }) | 837 | }) |
| 410 | 838 | self.assertTrue(form.is_valid(), form.errors) | 838 | self.assertTrue(form.is_valid(), dict(form.errors)) |
| 411 | 839 | interface = form.save() | 839 | interface = form.save() |
| 412 | 840 | self.assertEqual({ | 840 | self.assertEqual({ |
| 413 | 841 | "bond_mode": bond_mode, | 841 | "bond_mode": bond_mode, |
| 414 | @@ -853,7 +853,7 @@ | |||
| 415 | 853 | data={ | 853 | data={ |
| 416 | 854 | 'name': interface_name, | 854 | 'name': interface_name, |
| 417 | 855 | }) | 855 | }) |
| 419 | 856 | self.assertFalse(form.is_valid(), form.errors) | 856 | self.assertFalse(form.is_valid(), dict(form.errors)) |
| 420 | 857 | self.assertItemsEqual(['parents', 'mac_address'], form.errors.keys()) | 857 | self.assertItemsEqual(['parents', 'mac_address'], form.errors.keys()) |
| 421 | 858 | self.assertIn( | 858 | self.assertIn( |
| 422 | 859 | "A bond interface must have one or more parents.", | 859 | "A bond interface must have one or more parents.", |
| 423 | @@ -871,7 +871,7 @@ | |||
| 424 | 871 | 'mac_address': parent.mac_address, | 871 | 'mac_address': parent.mac_address, |
| 425 | 872 | 'vlan': vlan.id, | 872 | 'vlan': vlan.id, |
| 426 | 873 | }) | 873 | }) |
| 428 | 874 | self.assertFalse(form.is_valid(), form.errors) | 874 | self.assertFalse(form.is_valid(), dict(form.errors)) |
| 429 | 875 | self.assertItemsEqual(['vlan'], form.errors.keys()) | 875 | self.assertItemsEqual(['vlan'], form.errors.keys()) |
| 430 | 876 | self.assertIn( | 876 | self.assertIn( |
| 431 | 877 | "A bond interface can only belong to an untagged VLAN.", | 877 | "A bond interface can only belong to an untagged VLAN.", |
| 432 | @@ -892,7 +892,7 @@ | |||
| 433 | 892 | 'name': interface_name, | 892 | 'name': interface_name, |
| 434 | 893 | 'parents': [parent1.id, parent2.id] | 893 | 'parents': [parent1.id, parent2.id] |
| 435 | 894 | }) | 894 | }) |
| 437 | 895 | self.assertFalse(form.is_valid(), form.errors) | 895 | self.assertFalse(form.is_valid(), dict(form.errors)) |
| 438 | 896 | self.assertIn( | 896 | self.assertIn( |
| 439 | 897 | "Interfaces already in-use: eth0, eth1.", | 897 | "Interfaces already in-use: eth0, eth1.", |
| 440 | 898 | form.errors['parents'][0]) | 898 | form.errors['parents'][0]) |
| 441 | @@ -910,7 +910,7 @@ | |||
| 442 | 910 | 'name': interface_name, | 910 | 'name': interface_name, |
| 443 | 911 | 'parents': [parent1.id, parent2.id] | 911 | 'parents': [parent1.id, parent2.id] |
| 444 | 912 | }) | 912 | }) |
| 446 | 913 | self.assertFalse(form.is_valid(), form.errors) | 913 | self.assertFalse(form.is_valid(), dict(form.errors)) |
| 447 | 914 | self.assertEquals( | 914 | self.assertEquals( |
| 448 | 915 | "All parents must belong to the same VLAN.", | 915 | "All parents must belong to the same VLAN.", |
| 449 | 916 | form.errors['parents'][0]) | 916 | form.errors['parents'][0]) |
| 450 | @@ -934,7 +934,7 @@ | |||
| 451 | 934 | 'name': new_name, | 934 | 'name': new_name, |
| 452 | 935 | 'parents': [parent1.id, parent2.id, new_parent.id], | 935 | 'parents': [parent1.id, parent2.id, new_parent.id], |
| 453 | 936 | }) | 936 | }) |
| 455 | 937 | self.assertTrue(form.is_valid(), form.errors) | 937 | self.assertTrue(form.is_valid(), dict(form.errors)) |
| 456 | 938 | interface = form.save() | 938 | interface = form.save() |
| 457 | 939 | self.assertThat( | 939 | self.assertThat( |
| 458 | 940 | interface, | 940 | interface, |
| 459 | @@ -959,7 +959,7 @@ | |||
| 460 | 959 | data={ | 959 | data={ |
| 461 | 960 | 'vlan': None, | 960 | 'vlan': None, |
| 462 | 961 | }) | 961 | }) |
| 464 | 962 | self.assertTrue(form.is_valid(), form.errors) | 962 | self.assertTrue(form.is_valid(), dict(form.errors)) |
| 465 | 963 | interface = form.save() | 963 | interface = form.save() |
| 466 | 964 | self.assertThat( | 964 | self.assertThat( |
| 467 | 965 | interface, | 965 | interface, |
| 468 | @@ -983,7 +983,7 @@ | |||
| 469 | 983 | 'name': new_name, | 983 | 'name': new_name, |
| 470 | 984 | 'parents': [parent1.id, parent2.id], | 984 | 'parents': [parent1.id, parent2.id], |
| 471 | 985 | }) | 985 | }) |
| 473 | 986 | self.assertTrue(form.is_valid(), form.errors) | 986 | self.assertTrue(form.is_valid(), dict(form.errors)) |
| 474 | 987 | interface = form.save() | 987 | interface = form.save() |
| 475 | 988 | self.assertThat( | 988 | self.assertThat( |
| 476 | 989 | interface, | 989 | interface, |
| 477 | @@ -1009,7 +1009,7 @@ | |||
| 478 | 1009 | 'name': new_name, | 1009 | 'name': new_name, |
| 479 | 1010 | 'parents': [parent1.id, parent2.id], | 1010 | 'parents': [parent1.id, parent2.id], |
| 480 | 1011 | }) | 1011 | }) |
| 482 | 1012 | self.assertTrue(form.is_valid(), form.errors) | 1012 | self.assertTrue(form.is_valid(), dict(form.errors)) |
| 483 | 1013 | interface = form.save() | 1013 | interface = form.save() |
| 484 | 1014 | self.assertThat( | 1014 | self.assertThat( |
| 485 | 1015 | interface, | 1015 | interface, |
| 486 | @@ -1049,7 +1049,7 @@ | |||
| 487 | 1049 | data={ | 1049 | data={ |
| 488 | 1050 | 'name': new_name, | 1050 | 'name': new_name, |
| 489 | 1051 | }) | 1051 | }) |
| 491 | 1052 | self.assertTrue(form.is_valid(), form.errors) | 1052 | self.assertTrue(form.is_valid(), dict(form.errors)) |
| 492 | 1053 | interface = form.save() | 1053 | interface = form.save() |
| 493 | 1054 | self.assertEqual({ | 1054 | self.assertEqual({ |
| 494 | 1055 | "bond_mode": bond_mode, | 1055 | "bond_mode": bond_mode, |
| 495 | @@ -1102,7 +1102,7 @@ | |||
| 496 | 1102 | 'bond_lacp_rate': new_bond_lacp_rate, | 1102 | 'bond_lacp_rate': new_bond_lacp_rate, |
| 497 | 1103 | 'bond_xmit_hash_policy': new_bond_xmit_hash_policy, | 1103 | 'bond_xmit_hash_policy': new_bond_xmit_hash_policy, |
| 498 | 1104 | }) | 1104 | }) |
| 500 | 1105 | self.assertTrue(form.is_valid(), form.errors) | 1105 | self.assertTrue(form.is_valid(), dict(form.errors)) |
| 501 | 1106 | interface = form.save() | 1106 | interface = form.save() |
| 502 | 1107 | self.assertEqual({ | 1107 | self.assertEqual({ |
| 503 | 1108 | "bond_mode": new_bond_mode, | 1108 | "bond_mode": new_bond_mode, |
| 504 | @@ -1155,7 +1155,7 @@ | |||
| 505 | 1155 | 'bond_lacp_rate': new_bond_lacp_rate, | 1155 | 'bond_lacp_rate': new_bond_lacp_rate, |
| 506 | 1156 | 'bond_xmit_hash_policy': new_bond_xmit_hash_policy, | 1156 | 'bond_xmit_hash_policy': new_bond_xmit_hash_policy, |
| 507 | 1157 | }) | 1157 | }) |
| 509 | 1158 | self.assertTrue(form.is_valid(), form.errors) | 1158 | self.assertTrue(form.is_valid(), dict(form.errors)) |
| 510 | 1159 | interface = form.save() | 1159 | interface = form.save() |
| 511 | 1160 | self.assertEqual({ | 1160 | self.assertEqual({ |
| 512 | 1161 | "bond_mode": new_bond_mode, | 1161 | "bond_mode": new_bond_mode, |
| 513 | @@ -1178,14 +1178,62 @@ | |||
| 514 | 1178 | 'name': interface_name, | 1178 | 'name': interface_name, |
| 515 | 1179 | 'parents': [parent.id], | 1179 | 'parents': [parent.id], |
| 516 | 1180 | }) | 1180 | }) |
| 525 | 1181 | self.assertTrue(form.is_valid(), form.errors) | 1181 | self.assertTrue(form.is_valid(), dict(form.errors)) |
| 526 | 1182 | interface = form.save() | 1182 | interface = form.save() |
| 527 | 1183 | self.assertThat( | 1183 | self.assertThat( |
| 528 | 1184 | interface, | 1184 | interface, |
| 529 | 1185 | MatchesStructure.byEquality( | 1185 | MatchesStructure.byEquality( |
| 530 | 1186 | name=interface_name, type=INTERFACE_TYPE.BRIDGE)) | 1186 | name=interface_name, type=INTERFACE_TYPE.BRIDGE)) |
| 531 | 1187 | self.assertEqual(interface.mac_address, parent.mac_address) | 1187 | self.assertEqual(interface.mac_address, parent.mac_address) |
| 532 | 1188 | self.assertItemsEqual([parent], interface.parents.all()) | 1188 | self.assertItemsEqual([parent], interface.parents.all()) |
| 533 | 1189 | |||
| 534 | 1190 | def test__allows_bridge_on_parent_with_vlan_bridges(self): | ||
| 535 | 1191 | parent = factory.make_Interface(INTERFACE_TYPE.PHYSICAL) | ||
| 536 | 1192 | vlan1 = factory.make_Interface(INTERFACE_TYPE.VLAN, parents=[parent]) | ||
| 537 | 1193 | factory.make_Interface(INTERFACE_TYPE.BRIDGE, parents=[vlan1]) | ||
| 538 | 1194 | vlan2 = factory.make_Interface(INTERFACE_TYPE.VLAN, parents=[parent]) | ||
| 539 | 1195 | factory.make_Interface(INTERFACE_TYPE.BRIDGE, parents=[vlan2]) | ||
| 540 | 1196 | interface_name = factory.make_name() | ||
| 541 | 1197 | form = BridgeInterfaceForm( | ||
| 542 | 1198 | node=parent.node, | ||
| 543 | 1199 | data={ | ||
| 544 | 1200 | 'name': interface_name, | ||
| 545 | 1201 | 'parents': [parent.id], | ||
| 546 | 1202 | }) | ||
| 547 | 1203 | self.assertTrue(form.is_valid(), dict(form.errors)) | ||
| 548 | 1204 | interface = form.save() | ||
| 549 | 1205 | self.assertThat( | ||
| 550 | 1206 | interface, | ||
| 551 | 1207 | MatchesStructure.byEquality( | ||
| 552 | 1208 | name=interface_name, type=INTERFACE_TYPE.BRIDGE)) | ||
| 553 | 1209 | self.assertEqual(interface.mac_address, parent.mac_address) | ||
| 554 | 1210 | self.assertItemsEqual([parent], interface.parents.all()) | ||
| 555 | 1211 | |||
| 556 | 1212 | def test__allows_bridge_on_bond_with_vlan_bridges(self): | ||
| 557 | 1213 | node = factory.make_Node() | ||
| 558 | 1214 | eth0 = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, node=node) | ||
| 559 | 1215 | eth1 = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, node=node) | ||
| 560 | 1216 | bond0 = factory.make_Interface( | ||
| 561 | 1217 | INTERFACE_TYPE.BOND, parents=[eth0, eth1]) | ||
| 562 | 1218 | vlan1 = factory.make_Interface(INTERFACE_TYPE.VLAN, parents=[bond0]) | ||
| 563 | 1219 | factory.make_Interface(INTERFACE_TYPE.BRIDGE, parents=[vlan1]) | ||
| 564 | 1220 | vlan2 = factory.make_Interface(INTERFACE_TYPE.VLAN, parents=[bond0]) | ||
| 565 | 1221 | factory.make_Interface(INTERFACE_TYPE.BRIDGE, parents=[vlan2]) | ||
| 566 | 1222 | interface_name = factory.make_name() | ||
| 567 | 1223 | form = BridgeInterfaceForm( | ||
| 568 | 1224 | node=node, | ||
| 569 | 1225 | data={ | ||
| 570 | 1226 | 'name': interface_name, | ||
| 571 | 1227 | 'parents': [bond0.id], | ||
| 572 | 1228 | }) | ||
| 573 | 1229 | self.assertTrue(form.is_valid(), dict(form.errors)) | ||
| 574 | 1230 | interface = form.save() | ||
| 575 | 1231 | self.assertThat( | ||
| 576 | 1232 | interface, | ||
| 577 | 1233 | MatchesStructure.byEquality( | ||
| 578 | 1234 | name=interface_name, type=INTERFACE_TYPE.BRIDGE)) | ||
| 579 | 1235 | self.assertEqual(interface.mac_address, bond0.mac_address) | ||
| 580 | 1236 | self.assertItemsEqual([bond0], interface.parents.all()) | ||
| 581 | 1189 | 1237 | ||
| 582 | 1190 | def test__create_removes_parent_links_and_sets_link_up_on_bridge(self): | 1238 | def test__create_removes_parent_links_and_sets_link_up_on_bridge(self): |
| 583 | 1191 | parent = factory.make_Interface(INTERFACE_TYPE.PHYSICAL) | 1239 | parent = factory.make_Interface(INTERFACE_TYPE.PHYSICAL) |
| 584 | @@ -1197,7 +1245,7 @@ | |||
| 585 | 1197 | 'name': interface_name, | 1245 | 'name': interface_name, |
| 586 | 1198 | 'parents': [parent.id], | 1246 | 'parents': [parent.id], |
| 587 | 1199 | }) | 1247 | }) |
| 589 | 1200 | self.assertTrue(form.is_valid(), form.errors) | 1248 | self.assertTrue(form.is_valid(), dict(form.errors)) |
| 590 | 1201 | interface = form.save() | 1249 | interface = form.save() |
| 591 | 1202 | self.assertEqual( | 1250 | self.assertEqual( |
| 592 | 1203 | 0, | 1251 | 0, |
| 593 | @@ -1216,7 +1264,7 @@ | |||
| 594 | 1216 | 'parents': [parent.id], | 1264 | 'parents': [parent.id], |
| 595 | 1217 | 'mac_address': parent.mac_address, | 1265 | 'mac_address': parent.mac_address, |
| 596 | 1218 | }) | 1266 | }) |
| 598 | 1219 | self.assertTrue(form.is_valid(), form.errors) | 1267 | self.assertTrue(form.is_valid(), dict(form.errors)) |
| 599 | 1220 | interface = form.save() | 1268 | interface = form.save() |
| 600 | 1221 | self.assertThat( | 1269 | self.assertThat( |
| 601 | 1222 | interface, | 1270 | interface, |
| 602 | @@ -1232,7 +1280,7 @@ | |||
| 603 | 1232 | data={ | 1280 | data={ |
| 604 | 1233 | 'name': interface_name, | 1281 | 'name': interface_name, |
| 605 | 1234 | }) | 1282 | }) |
| 607 | 1235 | self.assertFalse(form.is_valid(), form.errors) | 1283 | self.assertFalse(form.is_valid(), dict(form.errors)) |
| 608 | 1236 | self.assertItemsEqual(['parents', 'mac_address'], form.errors.keys()) | 1284 | self.assertItemsEqual(['parents', 'mac_address'], form.errors.keys()) |
| 609 | 1237 | self.assertIn( | 1285 | self.assertIn( |
| 610 | 1238 | "A bridge interface must have exactly one parent.", | 1286 | "A bridge interface must have exactly one parent.", |
| 611 | @@ -1240,17 +1288,24 @@ | |||
| 612 | 1240 | 1288 | ||
| 613 | 1241 | def test__rejects_when_parent_already_have_children(self): | 1289 | def test__rejects_when_parent_already_have_children(self): |
| 614 | 1242 | node = factory.make_Node() | 1290 | node = factory.make_Node() |
| 616 | 1243 | parent = factory.make_Interface( | 1291 | eth0 = factory.make_Interface( |
| 617 | 1244 | INTERFACE_TYPE.PHYSICAL, node=node, name="eth0") | 1292 | INTERFACE_TYPE.PHYSICAL, node=node, name="eth0") |
| 619 | 1245 | factory.make_Interface(INTERFACE_TYPE.VLAN, parents=[parent]) | 1293 | eth1 = factory.make_Interface( |
| 620 | 1294 | INTERFACE_TYPE.PHYSICAL, node=node, name="eth1") | ||
| 621 | 1295 | invalid0 = factory.make_Interface( | ||
| 622 | 1296 | INTERFACE_TYPE.BOND, parents=[eth0, eth1]) | ||
| 623 | 1297 | # This should never happen, but in order to validate the case we're | ||
| 624 | 1298 | # trying to validate, we need a child that isn't a bond or bridge. | ||
| 625 | 1299 | invalid0.type = INTERFACE_TYPE.UNKNOWN | ||
| 626 | 1300 | invalid0.save() | ||
| 627 | 1246 | interface_name = factory.make_name() | 1301 | interface_name = factory.make_name() |
| 628 | 1247 | form = BridgeInterfaceForm( | 1302 | form = BridgeInterfaceForm( |
| 629 | 1248 | node=node, | 1303 | node=node, |
| 630 | 1249 | data={ | 1304 | data={ |
| 631 | 1250 | 'name': interface_name, | 1305 | 'name': interface_name, |
| 633 | 1251 | 'parents': [parent.id] | 1306 | 'parents': [eth0.id] |
| 634 | 1252 | }) | 1307 | }) |
| 636 | 1253 | self.assertFalse(form.is_valid(), form.errors) | 1308 | self.assertFalse(form.is_valid(), dict(form.errors)) |
| 637 | 1254 | self.assertIn( | 1309 | self.assertIn( |
| 638 | 1255 | "Interfaces already in-use: eth0.", | 1310 | "Interfaces already in-use: eth0.", |
| 639 | 1256 | form.errors['parents'][0]) | 1311 | form.errors['parents'][0]) |
| 640 | @@ -1265,7 +1320,7 @@ | |||
| 641 | 1265 | 'name': interface_name, | 1320 | 'name': interface_name, |
| 642 | 1266 | 'parents': [bridge.id] | 1321 | 'parents': [bridge.id] |
| 643 | 1267 | }) | 1322 | }) |
| 645 | 1268 | self.assertFalse(form.is_valid(), form.errors) | 1323 | self.assertFalse(form.is_valid(), dict(form.errors)) |
| 646 | 1269 | self.assertIn( | 1324 | self.assertIn( |
| 647 | 1270 | "A bridge interface can't have another bridge interface as " | 1325 | "A bridge interface can't have another bridge interface as " |
| 648 | 1271 | "parent.", | 1326 | "parent.", |
| 649 | @@ -1283,7 +1338,7 @@ | |||
| 650 | 1283 | 'name': interface_name, | 1338 | 'name': interface_name, |
| 651 | 1284 | 'parents': [parent.id] | 1339 | 'parents': [parent.id] |
| 652 | 1285 | }) | 1340 | }) |
| 654 | 1286 | self.assertFalse(form.is_valid(), form.errors) | 1341 | self.assertFalse(form.is_valid(), dict(form.errors)) |
| 655 | 1287 | self.assertIn( | 1342 | self.assertIn( |
| 656 | 1288 | "A bridge interface can't have a parent that is already " | 1343 | "A bridge interface can't have a parent that is already " |
| 657 | 1289 | "in a bond or a bridge.", | 1344 | "in a bond or a bridge.", |
| 658 | @@ -1302,7 +1357,7 @@ | |||
| 659 | 1302 | 'name': interface_name, | 1357 | 'name': interface_name, |
| 660 | 1303 | 'parents': [parent1.id] | 1358 | 'parents': [parent1.id] |
| 661 | 1304 | }) | 1359 | }) |
| 663 | 1305 | self.assertFalse(form.is_valid(), form.errors) | 1360 | self.assertFalse(form.is_valid(), dict(form.errors)) |
| 664 | 1306 | self.assertIn( | 1361 | self.assertIn( |
| 665 | 1307 | "A bridge interface can't have a parent that is already " | 1362 | "A bridge interface can't have a parent that is already " |
| 666 | 1308 | "in a bond or a bridge.", | 1363 | "in a bond or a bridge.", |
| 667 | @@ -1325,7 +1380,7 @@ | |||
| 668 | 1325 | 'name': new_name, | 1380 | 'name': new_name, |
| 669 | 1326 | 'parents': [new_parent.id], | 1381 | 'parents': [new_parent.id], |
| 670 | 1327 | }) | 1382 | }) |
| 672 | 1328 | self.assertTrue(form.is_valid(), form.errors) | 1383 | self.assertTrue(form.is_valid(), dict(form.errors)) |
| 673 | 1329 | interface = form.save() | 1384 | interface = form.save() |
| 674 | 1330 | self.assertThat( | 1385 | self.assertThat( |
| 675 | 1331 | interface, | 1386 | interface, |
| 676 | @@ -1345,7 +1400,7 @@ | |||
| 677 | 1345 | data={ | 1400 | data={ |
| 678 | 1346 | 'vlan': None, | 1401 | 'vlan': None, |
| 679 | 1347 | }) | 1402 | }) |
| 681 | 1348 | self.assertTrue(form.is_valid(), form.errors) | 1403 | self.assertTrue(form.is_valid(), dict(form.errors)) |
| 682 | 1349 | interface = form.save() | 1404 | interface = form.save() |
| 683 | 1350 | self.assertThat( | 1405 | self.assertThat( |
| 684 | 1351 | interface, | 1406 | interface, |
| 685 | @@ -1372,7 +1427,7 @@ | |||
| 686 | 1372 | data={ | 1427 | data={ |
| 687 | 1373 | 'name': new_name, | 1428 | 'name': new_name, |
| 688 | 1374 | }) | 1429 | }) |
| 690 | 1375 | self.assertTrue(form.is_valid(), form.errors) | 1430 | self.assertTrue(form.is_valid(), dict(form.errors)) |
| 691 | 1376 | interface = form.save() | 1431 | interface = form.save() |
| 692 | 1377 | self.assertEqual({ | 1432 | self.assertEqual({ |
| 693 | 1378 | "bridge_stp": bridge_stp, | 1433 | "bridge_stp": bridge_stp, |
| 694 | @@ -1400,7 +1455,7 @@ | |||
| 695 | 1400 | 'bridge_stp': new_bridge_stp, | 1455 | 'bridge_stp': new_bridge_stp, |
| 696 | 1401 | 'bridge_fd': new_bridge_fd, | 1456 | 'bridge_fd': new_bridge_fd, |
| 697 | 1402 | }) | 1457 | }) |
| 699 | 1403 | self.assertTrue(form.is_valid(), form.errors) | 1458 | self.assertTrue(form.is_valid(), dict(form.errors)) |
| 700 | 1404 | interface = form.save() | 1459 | interface = form.save() |
| 701 | 1405 | self.assertEqual({ | 1460 | self.assertEqual({ |
| 702 | 1406 | "bridge_stp": new_bridge_stp, | 1461 | "bridge_stp": new_bridge_stp, |
| 703 | @@ -1426,7 +1481,7 @@ | |||
| 704 | 1426 | 'bridge_stp': new_bridge_stp, | 1481 | 'bridge_stp': new_bridge_stp, |
| 705 | 1427 | 'bridge_fd': new_bridge_fd, | 1482 | 'bridge_fd': new_bridge_fd, |
| 706 | 1428 | }) | 1483 | }) |
| 708 | 1429 | self.assertTrue(form.is_valid(), form.errors) | 1484 | self.assertTrue(form.is_valid(), dict(form.errors)) |
| 709 | 1430 | interface = form.save() | 1485 | interface = form.save() |
| 710 | 1431 | self.assertEqual({ | 1486 | self.assertEqual({ |
| 711 | 1432 | 'bridge_stp': new_bridge_stp, | 1487 | 'bridge_stp': new_bridge_stp, |
| 712 | @@ -1459,7 +1514,7 @@ | |||
| 713 | 1459 | 'parents': [parent.id], | 1514 | 'parents': [parent.id], |
| 714 | 1460 | 'tags': tags, | 1515 | 'tags': tags, |
| 715 | 1461 | }) | 1516 | }) |
| 717 | 1462 | self.assertTrue(form.is_valid(), form.errors) | 1517 | self.assertTrue(form.is_valid(), dict(form.errors)) |
| 718 | 1463 | interface = form.save() | 1518 | interface = form.save() |
| 719 | 1464 | self.assertThat( | 1519 | self.assertThat( |
| 720 | 1465 | interface, | 1520 | interface, |
| 721 | @@ -1478,25 +1533,30 @@ | |||
| 722 | 1478 | data={ | 1533 | data={ |
| 723 | 1479 | 'name': interface_name, | 1534 | 'name': interface_name, |
| 724 | 1480 | }) | 1535 | }) |
| 726 | 1481 | self.assertFalse(form.is_valid(), form.errors) | 1536 | self.assertFalse(form.is_valid(), dict(form.errors)) |
| 727 | 1482 | self.assertItemsEqual(['parents', 'mac_address'], form.errors.keys()) | 1537 | self.assertItemsEqual(['parents', 'mac_address'], form.errors.keys()) |
| 728 | 1483 | self.assertIn( | 1538 | self.assertIn( |
| 729 | 1484 | "A bridge interface must have exactly one parent.", | 1539 | "A bridge interface must have exactly one parent.", |
| 730 | 1485 | form.errors['parents'][0]) | 1540 | form.errors['parents'][0]) |
| 731 | 1486 | 1541 | ||
| 733 | 1487 | def test__rejects_when_parent_already_have_children(self): | 1542 | def test__rejects_when_parent_already_have_non_vlan_children(self): |
| 734 | 1488 | node = factory.make_Node() | 1543 | node = factory.make_Node() |
| 736 | 1489 | parent = factory.make_Interface( | 1544 | eth0 = factory.make_Interface( |
| 737 | 1490 | INTERFACE_TYPE.PHYSICAL, node=node, name="eth0") | 1545 | INTERFACE_TYPE.PHYSICAL, node=node, name="eth0") |
| 739 | 1491 | factory.make_Interface(INTERFACE_TYPE.VLAN, parents=[parent]) | 1546 | eth1 = factory.make_Interface( |
| 740 | 1547 | INTERFACE_TYPE.PHYSICAL, node=node, name="eth1") | ||
| 741 | 1548 | bond0 = factory.make_Interface( | ||
| 742 | 1549 | INTERFACE_TYPE.BOND, parents=[eth0, eth1]) | ||
| 743 | 1550 | bond0.type = INTERFACE_TYPE.UNKNOWN | ||
| 744 | 1551 | bond0.save() | ||
| 745 | 1492 | interface_name = factory.make_name() | 1552 | interface_name = factory.make_name() |
| 746 | 1493 | form = AcquiredBridgeInterfaceForm( | 1553 | form = AcquiredBridgeInterfaceForm( |
| 747 | 1494 | node=node, | 1554 | node=node, |
| 748 | 1495 | data={ | 1555 | data={ |
| 749 | 1496 | 'name': interface_name, | 1556 | 'name': interface_name, |
| 751 | 1497 | 'parents': [parent.id] | 1557 | 'parents': [eth0.id] |
| 752 | 1498 | }) | 1558 | }) |
| 754 | 1499 | self.assertFalse(form.is_valid(), form.errors) | 1559 | self.assertFalse(form.is_valid(), dict(form.errors)) |
| 755 | 1500 | self.assertIn( | 1560 | self.assertIn( |
| 756 | 1501 | "Interfaces already in-use: eth0.", | 1561 | "Interfaces already in-use: eth0.", |
| 757 | 1502 | form.errors['parents'][0]) | 1562 | form.errors['parents'][0]) |
| 758 | @@ -1511,7 +1571,7 @@ | |||
| 759 | 1511 | 'name': interface_name, | 1571 | 'name': interface_name, |
| 760 | 1512 | 'parents': [bridge.id] | 1572 | 'parents': [bridge.id] |
| 761 | 1513 | }) | 1573 | }) |
| 763 | 1514 | self.assertFalse(form.is_valid(), form.errors) | 1574 | self.assertFalse(form.is_valid(), dict(form.errors)) |
| 764 | 1515 | self.assertIn( | 1575 | self.assertIn( |
| 765 | 1516 | "A bridge interface can't have another bridge interface as " | 1576 | "A bridge interface can't have another bridge interface as " |
| 766 | 1517 | "parent.", | 1577 | "parent.", |
| 767 | @@ -1529,7 +1589,7 @@ | |||
| 768 | 1529 | 'name': interface_name, | 1589 | 'name': interface_name, |
| 769 | 1530 | 'parents': [parent.id] | 1590 | 'parents': [parent.id] |
| 770 | 1531 | }) | 1591 | }) |
| 772 | 1532 | self.assertFalse(form.is_valid(), form.errors) | 1592 | self.assertFalse(form.is_valid(), dict(form.errors)) |
| 773 | 1533 | self.assertIn( | 1593 | self.assertIn( |
| 774 | 1534 | "A bridge interface can't have a parent that is already " | 1594 | "A bridge interface can't have a parent that is already " |
| 775 | 1535 | "in a bond or a bridge.", | 1595 | "in a bond or a bridge.", |
| 776 | @@ -1548,7 +1608,7 @@ | |||
| 777 | 1548 | 'name': interface_name, | 1608 | 'name': interface_name, |
| 778 | 1549 | 'parents': [parent1.id] | 1609 | 'parents': [parent1.id] |
| 779 | 1550 | }) | 1610 | }) |
| 781 | 1551 | self.assertFalse(form.is_valid(), form.errors) | 1611 | self.assertFalse(form.is_valid(), dict(form.errors)) |
| 782 | 1552 | self.assertIn( | 1612 | self.assertIn( |
| 783 | 1553 | "A bridge interface can't have a parent that is already " | 1613 | "A bridge interface can't have a parent that is already " |
| 784 | 1554 | "in a bond or a bridge.", | 1614 | "in a bond or a bridge.", |
LGTM.