Merge lp:~blake-rouse/maas/read-only-view-node-networking into lp:~maas-committers/maas/trunk
- read-only-view-node-networking
- Merge into trunk
| Status: | Merged |
|---|---|
| Approved by: | Blake Rouse |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 4447 |
| Proposed branch: | lp:~blake-rouse/maas/read-only-view-node-networking |
| Merge into: | lp:~maas-committers/maas/trunk |
| Diff against target: |
451 lines (+227/-13) 12 files modified
src/maasserver/api/interfaces.py (+5/-0) src/maasserver/api/nodes.py (+1/-0) src/maasserver/api/tests/test_interfaces.py (+11/-2) src/maasserver/forms_interface.py (+6/-1) src/maasserver/models/interface.py (+25/-1) src/maasserver/models/tests/test_interface.py (+33/-1) src/maasserver/static/js/angular/controllers/node_details_networking.js (+5/-0) src/maasserver/static/js/angular/controllers/tests/test_node_details_networking.js (+14/-0) src/maasserver/static/partials/node-details.html (+15/-5) src/maasserver/tests/test_forms_interface.py (+55/-0) src/maasserver/websockets/handlers/node.py (+16/-1) src/maasserver/websockets/handlers/tests/test_node.py (+41/-2) |
| To merge this branch: | bzr merge lp:~blake-rouse/maas/read-only-view-node-networking |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Andres Rodriguez (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Add the discovered field to the API and websocket for the interface. Use that field in the WebUI to show the current discovered IP address when the node is commissioning. Also update the WebUI to be all in one line once a node is out of edit mode.
Description of the change
| Blake Rouse (blake-rouse) wrote : | # |
| MAAS Lander (maas-lander) wrote : | # |
The attempt to merge lp:~blake-rouse/maas/read-only-view-node-networking into lp:maas failed. Below is the output from the failed tests.
Hit http://
Ign http://
Get:1 http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Get:2 http://
Hit http://
Get:3 http://
Get:4 http://
Get:5 http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Ign http://
Ign http://
Fetched 1,415 kB in 3s (376 kB/s)
Reading package lists...
sudo DEBIAN_
--
| Andres Rodriguez (andreserl) wrote : | # |
metadataserver.
metadataserver.
metadataserver.
| MAAS Lander (maas-lander) wrote : | # |
The attempt to merge lp:~blake-rouse/maas/read-only-view-node-networking into lp:maas failed. Below is the output from the failed tests.
Hit http://
Ign http://
Get:1 http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Get:2 http://
Hit http://
Hit http://
Get:3 http://
Get:4 http://
Get:5 http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Ign http://
Ign http://
Fetched 1,415 kB in 3s (373 kB/s)
Reading package lists...
sudo DEBIAN_
--
| MAAS Lander (maas-lander) wrote : | # |
The attempt to merge lp:~blake-rouse/maas/read-only-view-node-networking into lp:maas failed. Below is the output from the failed tests.
Hit http://
Ign http://
Get:1 http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Get:2 http://
Hit http://
Hit http://
Get:3 http://
Get:4 http://
Get:5 http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Ign http://
Ign http://
Fetched 1,415 kB in 4s (323 kB/s)
Reading package lists...
sudo DEBIAN_
--
Preview Diff
| 1 | === modified file 'src/maasserver/api/interfaces.py' | |||
| 2 | --- src/maasserver/api/interfaces.py 2015-10-23 21:33:14 +0000 | |||
| 3 | +++ src/maasserver/api/interfaces.py 2015-10-31 23:55:40 +0000 | |||
| 4 | @@ -63,6 +63,7 @@ | |||
| 5 | 63 | 'enabled', | 63 | 'enabled', |
| 6 | 64 | 'links', | 64 | 'links', |
| 7 | 65 | 'params', | 65 | 'params', |
| 8 | 66 | 'discovered', | ||
| 9 | 66 | ) | 67 | ) |
| 10 | 67 | 68 | ||
| 11 | 68 | 69 | ||
| 12 | @@ -279,6 +280,10 @@ | |||
| 13 | 279 | def links(cls, interface): | 280 | def links(cls, interface): |
| 14 | 280 | return interface.get_links() | 281 | return interface.get_links() |
| 15 | 281 | 282 | ||
| 16 | 283 | @classmethod | ||
| 17 | 284 | def discovered(cls, interface): | ||
| 18 | 285 | return interface.get_discovered() | ||
| 19 | 286 | |||
| 20 | 282 | def read(self, request, system_id, interface_id): | 287 | def read(self, request, system_id, interface_id): |
| 21 | 283 | """Read interface on node. | 288 | """Read interface on node. |
| 22 | 284 | 289 | ||
| 23 | 285 | 290 | ||
| 24 | === modified file 'src/maasserver/api/nodes.py' | |||
| 25 | --- src/maasserver/api/nodes.py 2015-10-26 18:15:08 +0000 | |||
| 26 | +++ src/maasserver/api/nodes.py 2015-10-31 23:55:40 +0000 | |||
| 27 | @@ -132,6 +132,7 @@ | |||
| 28 | 132 | 'enabled', | 132 | 'enabled', |
| 29 | 133 | 'links', | 133 | 'links', |
| 30 | 134 | 'params', | 134 | 'params', |
| 31 | 135 | 'discovered', | ||
| 32 | 135 | )), | 136 | )), |
| 33 | 136 | 'routers', | 137 | 'routers', |
| 34 | 137 | 'zone', | 138 | 'zone', |
| 35 | 138 | 139 | ||
| 36 | === modified file 'src/maasserver/api/tests/test_interfaces.py' | |||
| 37 | --- src/maasserver/api/tests/test_interfaces.py 2015-10-23 21:57:59 +0000 | |||
| 38 | +++ src/maasserver/api/tests/test_interfaces.py 2015-10-31 23:55:40 +0000 | |||
| 39 | @@ -443,13 +443,19 @@ | |||
| 40 | 443 | dhcp_ip = factory.make_StaticIPAddress( | 443 | dhcp_ip = factory.make_StaticIPAddress( |
| 41 | 444 | alloc_type=IPADDRESS_TYPE.DHCP, ip="", | 444 | alloc_type=IPADDRESS_TYPE.DHCP, ip="", |
| 42 | 445 | subnet=dhcp_subnet, interface=bond) | 445 | subnet=dhcp_subnet, interface=bond) |
| 43 | 446 | discovered_ip = factory.pick_ip_in_network( | ||
| 44 | 447 | dhcp_subnet.get_ipnetwork()) | ||
| 45 | 448 | factory.make_StaticIPAddress( | ||
| 46 | 449 | alloc_type=IPADDRESS_TYPE.DISCOVERED, ip=discovered_ip, | ||
| 47 | 450 | subnet=dhcp_subnet, interface=bond) | ||
| 48 | 446 | links.append( | 451 | links.append( |
| 49 | 447 | MatchesDict({ | 452 | MatchesDict({ |
| 50 | 448 | "id": Equals(dhcp_ip.id), | 453 | "id": Equals(dhcp_ip.id), |
| 51 | 449 | "mode": Equals(INTERFACE_LINK_TYPE.DHCP), | 454 | "mode": Equals(INTERFACE_LINK_TYPE.DHCP), |
| 52 | 450 | "subnet": ContainsDict({ | 455 | "subnet": ContainsDict({ |
| 53 | 451 | "id": Equals(dhcp_subnet.id) | 456 | "id": Equals(dhcp_subnet.id) |
| 55 | 452 | }) | 457 | }), |
| 56 | 458 | "ip_address": Equals(discovered_ip), | ||
| 57 | 453 | })) | 459 | })) |
| 58 | 454 | 460 | ||
| 59 | 455 | # Second link is a STATIC ip link. | 461 | # Second link is a STATIC ip link. |
| 60 | @@ -506,7 +512,7 @@ | |||
| 61 | 506 | "tags": Equals(bond.tags), | 512 | "tags": Equals(bond.tags), |
| 62 | 507 | "resource_uri": Equals(get_node_interface_uri(bond)), | 513 | "resource_uri": Equals(get_node_interface_uri(bond)), |
| 63 | 508 | "params": Equals(bond.params), | 514 | "params": Equals(bond.params), |
| 65 | 509 | })) | 515 | })) |
| 66 | 510 | self.assertEquals(sorted( | 516 | self.assertEquals(sorted( |
| 67 | 511 | nic.name | 517 | nic.name |
| 68 | 512 | for nic in parents | 518 | for nic in parents |
| 69 | @@ -516,6 +522,9 @@ | |||
| 70 | 516 | for nic in children | 522 | for nic in children |
| 71 | 517 | ), parsed_interface["children"]) | 523 | ), parsed_interface["children"]) |
| 72 | 518 | self.assertThat(parsed_interface["links"], MatchesListwise(links)) | 524 | self.assertThat(parsed_interface["links"], MatchesListwise(links)) |
| 73 | 525 | json_discovered = parsed_interface["discovered"][0] | ||
| 74 | 526 | self.assertEquals(dhcp_subnet.id, json_discovered["subnet"]["id"]) | ||
| 75 | 527 | self.assertEquals(discovered_ip, json_discovered["ip_address"]) | ||
| 76 | 519 | 528 | ||
| 77 | 520 | def test_read_404_when_invalid_id(self): | 529 | def test_read_404_when_invalid_id(self): |
| 78 | 521 | node = factory.make_Node() | 530 | node = factory.make_Node() |
| 79 | 522 | 531 | ||
| 80 | === modified file 'src/maasserver/forms_interface.py' | |||
| 81 | --- src/maasserver/forms_interface.py 2015-10-04 20:47:36 +0000 | |||
| 82 | +++ src/maasserver/forms_interface.py 2015-10-31 23:55:40 +0000 | |||
| 83 | @@ -346,7 +346,12 @@ | |||
| 84 | 346 | ] | 346 | ] |
| 85 | 347 | for bond_field in bond_fields: | 347 | for bond_field in bond_fields: |
| 86 | 348 | value = self.cleaned_data.get(bond_field) | 348 | value = self.cleaned_data.get(bond_field) |
| 88 | 349 | if value: | 349 | if (value is not None and |
| 89 | 350 | isinstance(value, (bytes, unicode)) and | ||
| 90 | 351 | len(value) > 0 and not value.isspace()): | ||
| 91 | 352 | interface.params[bond_field] = value | ||
| 92 | 353 | elif (value is not None and | ||
| 93 | 354 | not isinstance(value, (bytes, unicode))): | ||
| 94 | 350 | interface.params[bond_field] = value | 355 | interface.params[bond_field] = value |
| 95 | 351 | elif created: | 356 | elif created: |
| 96 | 352 | interface.params[bond_field] = self.fields[bond_field].initial | 357 | interface.params[bond_field] = self.fields[bond_field].initial |
| 97 | 353 | 358 | ||
| 98 | === modified file 'src/maasserver/models/interface.py' | |||
| 99 | --- src/maasserver/models/interface.py 2015-10-27 17:45:01 +0000 | |||
| 100 | +++ src/maasserver/models/interface.py 2015-10-31 23:55:40 +0000 | |||
| 101 | @@ -253,7 +253,7 @@ | |||
| 102 | 253 | { | 253 | { |
| 103 | 254 | "id": 1, | 254 | "id": 1, |
| 104 | 255 | "mode": "dhcp", | 255 | "mode": "dhcp", |
| 106 | 256 | "ip": "192.168.1.2", | 256 | "ip_address": "192.168.1.2", |
| 107 | 257 | "subnet": <Subnet object> | 257 | "subnet": <Subnet object> |
| 108 | 258 | } | 258 | } |
| 109 | 259 | 259 | ||
| 110 | @@ -276,6 +276,30 @@ | |||
| 111 | 276 | links.append(link) | 276 | links.append(link) |
| 112 | 277 | return links | 277 | return links |
| 113 | 278 | 278 | ||
| 114 | 279 | def get_discovered(self): | ||
| 115 | 280 | """Return the definition of discovered IP addresses belonging to this | ||
| 116 | 281 | interface. | ||
| 117 | 282 | |||
| 118 | 283 | Example definition: | ||
| 119 | 284 | { | ||
| 120 | 285 | "ip_address": "192.168.1.2", | ||
| 121 | 286 | "subnet": <Subnet object> | ||
| 122 | 287 | } | ||
| 123 | 288 | """ | ||
| 124 | 289 | discovered_ips = self.ip_addresses.filter( | ||
| 125 | 290 | alloc_type=IPADDRESS_TYPE.DISCOVERED) | ||
| 126 | 291 | if len(discovered_ips) > 0: | ||
| 127 | 292 | discovered = [] | ||
| 128 | 293 | for discovered_ip in discovered_ips: | ||
| 129 | 294 | if discovered_ip.ip is not None and discovered_ip.ip != "": | ||
| 130 | 295 | discovered.append({ | ||
| 131 | 296 | "subnet": discovered_ip.subnet, | ||
| 132 | 297 | "ip_address": "%s" % discovered_ip.ip, | ||
| 133 | 298 | }) | ||
| 134 | 299 | return discovered | ||
| 135 | 300 | else: | ||
| 136 | 301 | return None | ||
| 137 | 302 | |||
| 138 | 279 | def only_has_link_up(self): | 303 | def only_has_link_up(self): |
| 139 | 280 | """Return True if this interface is only set to LINK_UP.""" | 304 | """Return True if this interface is only set to LINK_UP.""" |
| 140 | 281 | ip_addresses = self.ip_addresses.exclude( | 305 | ip_addresses = self.ip_addresses.exclude( |
| 141 | 282 | 306 | ||
| 142 | === modified file 'src/maasserver/models/tests/test_interface.py' | |||
| 143 | --- src/maasserver/models/tests/test_interface.py 2015-10-30 16:14:33 +0000 | |||
| 144 | +++ src/maasserver/models/tests/test_interface.py 2015-10-31 23:55:40 +0000 | |||
| 145 | @@ -222,6 +222,38 @@ | |||
| 146 | 222 | })) | 222 | })) |
| 147 | 223 | self.assertThat(interface.get_links(), MatchesListwise(links)) | 223 | self.assertThat(interface.get_links(), MatchesListwise(links)) |
| 148 | 224 | 224 | ||
| 149 | 225 | def test_get_discovered_returns_None_when_empty(self): | ||
| 150 | 226 | interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL) | ||
| 151 | 227 | self.assertIsNone(interface.get_discovered()) | ||
| 152 | 228 | |||
| 153 | 229 | def test_get_discovered_returns_discovered_address_for_ipv4_and_ipv6(self): | ||
| 154 | 230 | interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL) | ||
| 155 | 231 | discovered_ips = [] | ||
| 156 | 232 | network_v4 = factory.make_ipv4_network() | ||
| 157 | 233 | subnet_v4 = factory.make_Subnet(cidr=unicode(network_v4.cidr)) | ||
| 158 | 234 | ip_v4 = factory.pick_ip_in_network(network_v4) | ||
| 159 | 235 | factory.make_StaticIPAddress( | ||
| 160 | 236 | alloc_type=IPADDRESS_TYPE.DISCOVERED, ip=ip_v4, | ||
| 161 | 237 | subnet=subnet_v4, interface=interface) | ||
| 162 | 238 | discovered_ips.append( | ||
| 163 | 239 | MatchesDict({ | ||
| 164 | 240 | "ip_address": Equals(ip_v4), | ||
| 165 | 241 | "subnet": Equals(subnet_v4), | ||
| 166 | 242 | })) | ||
| 167 | 243 | network_v6 = factory.make_ipv6_network() | ||
| 168 | 244 | subnet_v6 = factory.make_Subnet(cidr=unicode(network_v6.cidr)) | ||
| 169 | 245 | ip_v6 = factory.pick_ip_in_network(network_v6) | ||
| 170 | 246 | factory.make_StaticIPAddress( | ||
| 171 | 247 | alloc_type=IPADDRESS_TYPE.DISCOVERED, ip=ip_v6, | ||
| 172 | 248 | subnet=subnet_v6, interface=interface) | ||
| 173 | 249 | discovered_ips.append( | ||
| 174 | 250 | MatchesDict({ | ||
| 175 | 251 | "ip_address": Equals(ip_v6), | ||
| 176 | 252 | "subnet": Equals(subnet_v6), | ||
| 177 | 253 | })) | ||
| 178 | 254 | self.assertThat( | ||
| 179 | 255 | interface.get_discovered(), MatchesListwise(discovered_ips)) | ||
| 180 | 256 | |||
| 181 | 225 | def test_delete_deletes_related_ip_addresses(self): | 257 | def test_delete_deletes_related_ip_addresses(self): |
| 182 | 226 | interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL) | 258 | interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL) |
| 183 | 227 | discovered_ip = factory.make_StaticIPAddress( | 259 | discovered_ip = factory.make_StaticIPAddress( |
| 184 | @@ -806,7 +838,7 @@ | |||
| 185 | 806 | "Unknown interfaces should have been deleted.") | 838 | "Unknown interfaces should have been deleted.") |
| 186 | 807 | self.assertEqual(num_connections, interface.ip_addresses.count()) | 839 | self.assertEqual(num_connections, interface.ip_addresses.count()) |
| 187 | 808 | for i in range(num_connections): | 840 | for i in range(num_connections): |
| 189 | 809 | ip = interface.ip_addresses.all()[i] | 841 | ip = interface.ip_addresses.order_by('id')[i] |
| 190 | 810 | self.assertThat(ip, MatchesStructure.byEquality( | 842 | self.assertThat(ip, MatchesStructure.byEquality( |
| 191 | 811 | alloc_type=IPADDRESS_TYPE.DISCOVERED, subnet=subnet_list[i], | 843 | alloc_type=IPADDRESS_TYPE.DISCOVERED, subnet=subnet_list[i], |
| 192 | 812 | ip=unicode(IPNetwork(cidr_list[i]).ip))) | 844 | ip=unicode(IPNetwork(cidr_list[i]).ip))) |
| 193 | 813 | 845 | ||
| 194 | === modified file 'src/maasserver/static/js/angular/controllers/node_details_networking.js' | |||
| 195 | --- src/maasserver/static/js/angular/controllers/node_details_networking.js 2015-10-30 16:35:25 +0000 | |||
| 196 | +++ src/maasserver/static/js/angular/controllers/node_details_networking.js 2015-10-31 23:55:40 +0000 | |||
| 197 | @@ -557,6 +557,11 @@ | |||
| 198 | 557 | } | 557 | } |
| 199 | 558 | }; | 558 | }; |
| 200 | 559 | 559 | ||
| 201 | 560 | // Get the subnet from its ID. | ||
| 202 | 561 | $scope.getSubnet = function(subnetId) { | ||
| 203 | 562 | return SubnetsManager.getItemFromList(subnetId); | ||
| 204 | 563 | }; | ||
| 205 | 564 | |||
| 206 | 560 | // Toggle showing or hiding the members of the interface. | 565 | // Toggle showing or hiding the members of the interface. |
| 207 | 561 | $scope.toggleMembers = function(nic) { | 566 | $scope.toggleMembers = function(nic) { |
| 208 | 562 | var idx = $scope.showingMembers.indexOf(nic.id); | 567 | var idx = $scope.showingMembers.indexOf(nic.id); |
| 209 | 563 | 568 | ||
| 210 | === modified file 'src/maasserver/static/js/angular/controllers/tests/test_node_details_networking.js' | |||
| 211 | --- src/maasserver/static/js/angular/controllers/tests/test_node_details_networking.js 2015-10-30 16:35:25 +0000 | |||
| 212 | +++ src/maasserver/static/js/angular/controllers/tests/test_node_details_networking.js 2015-10-31 23:55:40 +0000 | |||
| 213 | @@ -1035,6 +1035,20 @@ | |||
| 214 | 1035 | }); | 1035 | }); |
| 215 | 1036 | }); | 1036 | }); |
| 216 | 1037 | 1037 | ||
| 217 | 1038 | describe("getSubnet", function() { | ||
| 218 | 1039 | |||
| 219 | 1040 | it("calls SubnetsManager.getItemFromList", function() { | ||
| 220 | 1041 | var controller = makeController(); | ||
| 221 | 1042 | var subnetId = makeInteger(0, 100); | ||
| 222 | 1043 | var subnet = {}; | ||
| 223 | 1044 | spyOn(SubnetsManager, "getItemFromList").and.returnValue(subnet); | ||
| 224 | 1045 | |||
| 225 | 1046 | expect($scope.getSubnet(subnetId)).toBe(subnet); | ||
| 226 | 1047 | expect(SubnetsManager.getItemFromList).toHaveBeenCalledWith( | ||
| 227 | 1048 | subnetId); | ||
| 228 | 1049 | }); | ||
| 229 | 1050 | }); | ||
| 230 | 1051 | |||
| 231 | 1038 | describe("toggleMembers", function() { | 1052 | describe("toggleMembers", function() { |
| 232 | 1039 | 1053 | ||
| 233 | 1040 | it("adds interface id to showingMembers", function() { | 1054 | it("adds interface id to showingMembers", function() { |
| 234 | 1041 | 1055 | ||
| 235 | === modified file 'src/maasserver/static/partials/node-details.html' | |||
| 236 | --- src/maasserver/static/partials/node-details.html 2015-10-30 16:43:21 +0000 | |||
| 237 | +++ src/maasserver/static/partials/node-details.html 2015-10-31 23:55:40 +0000 | |||
| 238 | @@ -415,14 +415,18 @@ | |||
| 239 | 415 | </div> | 415 | </div> |
| 240 | 416 | <div class="table__data table__column--18"> | 416 | <div class="table__data table__column--18"> |
| 241 | 417 | <select class="table__input" name="subnet" id="subnet" | 417 | <select class="table__input" name="subnet" id="subnet" |
| 242 | 418 | data-ng-hide="isAllNetworkingDisabled() && interface.discovered[0].subnet_id" | ||
| 243 | 418 | data-ng-model="interface.subnet" | 419 | data-ng-model="interface.subnet" |
| 244 | 419 | data-ng-change="subnetChanged(interface)" | 420 | data-ng-change="subnetChanged(interface)" |
| 245 | 420 | data-ng-options="subnet as getSubnetText(subnet) for subnet in subnets | filterByVLAN:interface.vlan"> | 421 | data-ng-options="subnet as getSubnetText(subnet) for subnet in subnets | filterByVLAN:interface.vlan"> |
| 246 | 421 | <option value="" data-ng-hide="interface.links.length > 1">Unconfigured</option> | 422 | <option value="" data-ng-hide="interface.links.length > 1">Unconfigured</option> |
| 247 | 422 | </select> | 423 | </select> |
| 248 | 424 | <span class="ng-hide" data-ng-show="isAllNetworkingDisabled() && interface.discovered[0].subnet_id"> | ||
| 249 | 425 | {$ getSubnetText(getSubnet(interface.discovered[0].subnet_id)) $} | ||
| 250 | 426 | </span> | ||
| 251 | 423 | </div> | 427 | </div> |
| 254 | 424 | <div class="table__data table__column--14"> | 428 | <div class="table__data table__column--21"> |
| 255 | 425 | <ul class="no-bullets"> | 429 | <ul class="no-bullets" data-ng-hide="isAllNetworkingDisabled()"> |
| 256 | 426 | <li> | 430 | <li> |
| 257 | 427 | <select class="table__input" name="link-mode" id="link-mode" | 431 | <select class="table__input" name="link-mode" id="link-mode" |
| 258 | 428 | data-ng-model="interface.mode" | 432 | data-ng-model="interface.mode" |
| 259 | @@ -441,8 +445,14 @@ | |||
| 260 | 441 | data-ng-disabled="interface.mode != 'static'"> | 445 | data-ng-disabled="interface.mode != 'static'"> |
| 261 | 442 | </li> | 446 | </li> |
| 262 | 443 | </ul> | 447 | </ul> |
| 263 | 448 | <span class="ng-hide" data-ng-show="isAllNetworkingDisabled() && !interface.discovered[0].ip_address"> | ||
| 264 | 449 | {$ interface.ip_address $} ({$ getLinkModeText(interface) $}) | ||
| 265 | 450 | </span> | ||
| 266 | 451 | <span class="ng-hide" data-ng-show="isAllNetworkingDisabled() && interface.discovered[0].ip_address"> | ||
| 267 | 452 | {$ interface.discovered[0].ip_address $} (DHCP) | ||
| 268 | 453 | </span> | ||
| 269 | 444 | </div> | 454 | </div> |
| 271 | 445 | <div class="table__data table__column--13"> | 455 | <div class="table__data table__column--6"> |
| 272 | 446 | <div class="table__controls align-right"> | 456 | <div class="table__controls align-right"> |
| 273 | 447 | <a class="icon add" | 457 | <a class="icon add" |
| 274 | 448 | data-ng-click="quickAdd(interface)" | 458 | data-ng-click="quickAdd(interface)" |
| 275 | @@ -500,14 +510,14 @@ | |||
| 276 | 500 | <option value="" data-ng-hide="newInterface.type === 'alias'">Unconfigured</option> | 510 | <option value="" data-ng-hide="newInterface.type === 'alias'">Unconfigured</option> |
| 277 | 501 | </select> | 511 | </select> |
| 278 | 502 | </div> | 512 | </div> |
| 280 | 503 | <div class="table__data table__column--14"> | 513 | <div class="table__data table__column--21"> |
| 281 | 504 | <select class="table__input" name="link-mode" id="link-mode" | 514 | <select class="table__input" name="link-mode" id="link-mode" |
| 282 | 505 | data-ng-model="newInterface.mode" | 515 | data-ng-model="newInterface.mode" |
| 283 | 506 | data-ng-disabled="isLinkModeDisabled(newInterface)" | 516 | data-ng-disabled="isLinkModeDisabled(newInterface)" |
| 284 | 507 | data-ng-options="mode.mode as mode.text for mode in modes | filterLinkModes:newInterface"> | 517 | data-ng-options="mode.mode as mode.text for mode in modes | filterLinkModes:newInterface"> |
| 285 | 508 | </select> | 518 | </select> |
| 286 | 509 | </div> | 519 | </div> |
| 288 | 510 | <div class="table__data table_column--13"></div> | 520 | <div class="table__data table_column--6"></div> |
| 289 | 511 | </div> | 521 | </div> |
| 290 | 512 | <div class="table__row table__dropdown-row"> | 522 | <div class="table__row table__dropdown-row"> |
| 291 | 513 | <div class="ng-hide" data-ng-show="isShowingInterfaceOptions()"> | 523 | <div class="ng-hide" data-ng-show="isShowingInterfaceOptions()"> |
| 292 | 514 | 524 | ||
| 293 | === modified file 'src/maasserver/tests/test_forms_interface.py' | |||
| 294 | --- src/maasserver/tests/test_forms_interface.py 2015-09-16 20:14:09 +0000 | |||
| 295 | +++ src/maasserver/tests/test_forms_interface.py 2015-10-31 23:55:40 +0000 | |||
| 296 | @@ -806,3 +806,58 @@ | |||
| 297 | 806 | "bond_lacp_rate": new_bond_lacp_rate, | 806 | "bond_lacp_rate": new_bond_lacp_rate, |
| 298 | 807 | "bond_xmit_hash_policy": new_bond_xmit_hash_policy, | 807 | "bond_xmit_hash_policy": new_bond_xmit_hash_policy, |
| 299 | 808 | }, interface.params) | 808 | }, interface.params) |
| 300 | 809 | |||
| 301 | 810 | def test__edit_allows_zero_params(self): | ||
| 302 | 811 | parent1 = factory.make_Interface(INTERFACE_TYPE.PHYSICAL) | ||
| 303 | 812 | parent2 = factory.make_Interface( | ||
| 304 | 813 | INTERFACE_TYPE.PHYSICAL, node=parent1.node) | ||
| 305 | 814 | interface = factory.make_Interface( | ||
| 306 | 815 | INTERFACE_TYPE.BOND, | ||
| 307 | 816 | parents=[parent1, parent2]) | ||
| 308 | 817 | bond_mode = factory.pick_choice(BOND_MODE_CHOICES) | ||
| 309 | 818 | bond_miimon = random.randint(0, 1000) | ||
| 310 | 819 | bond_downdelay = random.randint(0, 1000) | ||
| 311 | 820 | bond_updelay = random.randint(0, 1000) | ||
| 312 | 821 | bond_lacp_rate = factory.pick_choice(BOND_LACP_RATE_CHOICES) | ||
| 313 | 822 | bond_xmit_hash_policy = factory.pick_choice( | ||
| 314 | 823 | BOND_XMIT_HASH_POLICY_CHOICES) | ||
| 315 | 824 | interface.params = { | ||
| 316 | 825 | "bond_mode": bond_mode, | ||
| 317 | 826 | "bond_miimon": bond_miimon, | ||
| 318 | 827 | "bond_downdelay": bond_downdelay, | ||
| 319 | 828 | "bond_updelay": bond_updelay, | ||
| 320 | 829 | "bond_lacp_rate": bond_lacp_rate, | ||
| 321 | 830 | "bond_xmit_hash_policy": bond_xmit_hash_policy, | ||
| 322 | 831 | } | ||
| 323 | 832 | interface.save() | ||
| 324 | 833 | new_vlan = factory.make_VLAN(vid=33) | ||
| 325 | 834 | new_name = factory.make_name() | ||
| 326 | 835 | new_bond_mode = factory.pick_choice(BOND_MODE_CHOICES) | ||
| 327 | 836 | new_bond_miimon = 0 | ||
| 328 | 837 | new_bond_downdelay = 0 | ||
| 329 | 838 | new_bond_updelay = 0 | ||
| 330 | 839 | new_bond_lacp_rate = factory.pick_choice(BOND_LACP_RATE_CHOICES) | ||
| 331 | 840 | new_bond_xmit_hash_policy = factory.pick_choice( | ||
| 332 | 841 | BOND_XMIT_HASH_POLICY_CHOICES) | ||
| 333 | 842 | form = BondInterfaceForm( | ||
| 334 | 843 | instance=interface, | ||
| 335 | 844 | data={ | ||
| 336 | 845 | 'vlan': new_vlan.id, | ||
| 337 | 846 | 'name': new_name, | ||
| 338 | 847 | 'bond_mode': new_bond_mode, | ||
| 339 | 848 | 'bond_miimon': new_bond_miimon, | ||
| 340 | 849 | 'bond_downdelay': new_bond_downdelay, | ||
| 341 | 850 | 'bond_updelay': new_bond_updelay, | ||
| 342 | 851 | 'bond_lacp_rate': new_bond_lacp_rate, | ||
| 343 | 852 | 'bond_xmit_hash_policy': new_bond_xmit_hash_policy, | ||
| 344 | 853 | }) | ||
| 345 | 854 | self.assertTrue(form.is_valid(), form.errors) | ||
| 346 | 855 | interface = form.save() | ||
| 347 | 856 | self.assertEquals({ | ||
| 348 | 857 | "bond_mode": new_bond_mode, | ||
| 349 | 858 | "bond_miimon": new_bond_miimon, | ||
| 350 | 859 | "bond_downdelay": new_bond_downdelay, | ||
| 351 | 860 | "bond_updelay": new_bond_updelay, | ||
| 352 | 861 | "bond_lacp_rate": new_bond_lacp_rate, | ||
| 353 | 862 | "bond_xmit_hash_policy": new_bond_xmit_hash_policy, | ||
| 354 | 863 | }, interface.params) | ||
| 355 | 809 | 864 | ||
| 356 | === modified file 'src/maasserver/websockets/handlers/node.py' | |||
| 357 | --- src/maasserver/websockets/handlers/node.py 2015-10-29 20:10:11 +0000 | |||
| 358 | +++ src/maasserver/websockets/handlers/node.py 2015-10-31 23:55:40 +0000 | |||
| 359 | @@ -498,7 +498,7 @@ | |||
| 360 | 498 | subnet = link.pop("subnet", None) | 498 | subnet = link.pop("subnet", None) |
| 361 | 499 | if subnet is not None: | 499 | if subnet is not None: |
| 362 | 500 | link["subnet_id"] = subnet.id | 500 | link["subnet_id"] = subnet.id |
| 364 | 501 | return { | 501 | data = { |
| 365 | 502 | "id": interface.id, | 502 | "id": interface.id, |
| 366 | 503 | "type": interface.type, | 503 | "type": interface.type, |
| 367 | 504 | "name": interface.get_name(), | 504 | "name": interface.get_name(), |
| 368 | @@ -517,6 +517,21 @@ | |||
| 369 | 517 | "links": links, | 517 | "links": links, |
| 370 | 518 | } | 518 | } |
| 371 | 519 | 519 | ||
| 372 | 520 | # When the node is commissioning display the discovered IP address for | ||
| 373 | 521 | # this interface. This will only be shown on interfaces that are | ||
| 374 | 522 | # connected to a MAAS managed subnet. | ||
| 375 | 523 | if obj.status == NODE_STATUS.COMMISSIONING: | ||
| 376 | 524 | discovereds = interface.get_discovered() | ||
| 377 | 525 | if discovereds is not None: | ||
| 378 | 526 | for discovered in discovereds: | ||
| 379 | 527 | # Replace the subnet object with the subnet_id. The client | ||
| 380 | 528 | # will use this information to pull the subnet information | ||
| 381 | 529 | # from the websocket. | ||
| 382 | 530 | discovered["subnet_id"] = discovered.pop("subnet").id | ||
| 383 | 531 | data["discovered"] = discovereds | ||
| 384 | 532 | |||
| 385 | 533 | return data | ||
| 386 | 534 | |||
| 387 | 520 | def dehydrate_summary_output(self, obj, data): | 535 | def dehydrate_summary_output(self, obj, data): |
| 388 | 521 | """Dehydrate the machine summary output.""" | 536 | """Dehydrate the machine summary output.""" |
| 389 | 522 | # Produce a "clean" composite details document. | 537 | # Produce a "clean" composite details document. |
| 390 | 523 | 538 | ||
| 391 | === modified file 'src/maasserver/websockets/handlers/tests/test_node.py' | |||
| 392 | --- src/maasserver/websockets/handlers/tests/test_node.py 2015-10-29 20:10:11 +0000 | |||
| 393 | +++ src/maasserver/websockets/handlers/tests/test_node.py 2015-10-31 23:55:40 +0000 | |||
| 394 | @@ -557,9 +557,9 @@ | |||
| 395 | 557 | filesystem.fstype in FILESYSTEM_FORMAT_TYPE_CHOICES_DICT), | 557 | filesystem.fstype in FILESYSTEM_FORMAT_TYPE_CHOICES_DICT), |
| 396 | 558 | }, handler.dehydrate_filesystem(filesystem)) | 558 | }, handler.dehydrate_filesystem(filesystem)) |
| 397 | 559 | 559 | ||
| 399 | 560 | def test_dehydrate_interface(self): | 560 | def test_dehydrate_interface_for_ready_node(self): |
| 400 | 561 | owner = factory.make_User() | 561 | owner = factory.make_User() |
| 402 | 562 | node = factory.make_Node(owner=owner) | 562 | node = factory.make_Node(owner=owner, status=NODE_STATUS.READY) |
| 403 | 563 | handler = NodeHandler(owner, {}) | 563 | handler = NodeHandler(owner, {}) |
| 404 | 564 | interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, node=node) | 564 | interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, node=node) |
| 405 | 565 | factory.make_StaticIPAddress( | 565 | factory.make_StaticIPAddress( |
| 406 | @@ -587,6 +587,45 @@ | |||
| 407 | 587 | "links": expected_links, | 587 | "links": expected_links, |
| 408 | 588 | }, handler.dehydrate_interface(interface, node)) | 588 | }, handler.dehydrate_interface(interface, node)) |
| 409 | 589 | 589 | ||
| 410 | 590 | def test_dehydrate_interface_for_commissioning_node(self): | ||
| 411 | 591 | owner = factory.make_User() | ||
| 412 | 592 | node = factory.make_Node(owner=owner, status=NODE_STATUS.COMMISSIONING) | ||
| 413 | 593 | handler = NodeHandler(owner, {}) | ||
| 414 | 594 | interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, node=node) | ||
| 415 | 595 | factory.make_StaticIPAddress( | ||
| 416 | 596 | alloc_type=IPADDRESS_TYPE.AUTO, ip="", | ||
| 417 | 597 | subnet=factory.make_Subnet(), interface=interface) | ||
| 418 | 598 | expected_links = interface.get_links() | ||
| 419 | 599 | for link in expected_links: | ||
| 420 | 600 | link["subnet_id"] = link.pop("subnet").id | ||
| 421 | 601 | discovered_subnet = factory.make_Subnet() | ||
| 422 | 602 | factory.make_StaticIPAddress( | ||
| 423 | 603 | alloc_type=IPADDRESS_TYPE.DISCOVERED, | ||
| 424 | 604 | ip=factory.pick_ip_in_network(discovered_subnet.get_ipnetwork()), | ||
| 425 | 605 | subnet=discovered_subnet, interface=interface) | ||
| 426 | 606 | expected_discovered = interface.get_discovered() | ||
| 427 | 607 | for discovered in expected_discovered: | ||
| 428 | 608 | discovered["subnet_id"] = discovered.pop("subnet").id | ||
| 429 | 609 | self.assertEquals({ | ||
| 430 | 610 | "id": interface.id, | ||
| 431 | 611 | "type": interface.type, | ||
| 432 | 612 | "name": interface.get_name(), | ||
| 433 | 613 | "enabled": interface.is_enabled(), | ||
| 434 | 614 | "is_boot": interface == node.boot_interface, | ||
| 435 | 615 | "mac_address": "%s" % interface.mac_address, | ||
| 436 | 616 | "vlan_id": interface.vlan_id, | ||
| 437 | 617 | "parents": [ | ||
| 438 | 618 | nic.id | ||
| 439 | 619 | for nic in interface.parents.all() | ||
| 440 | 620 | ], | ||
| 441 | 621 | "children": [ | ||
| 442 | 622 | nic.child.id | ||
| 443 | 623 | for nic in interface.children_relationships.all() | ||
| 444 | 624 | ], | ||
| 445 | 625 | "links": expected_links, | ||
| 446 | 626 | "discovered": expected_discovered, | ||
| 447 | 627 | }, handler.dehydrate_interface(interface, node)) | ||
| 448 | 628 | |||
| 449 | 590 | def test_dehydrate_summary_output_returns_None(self): | 629 | def test_dehydrate_summary_output_returns_None(self): |
| 450 | 591 | owner = factory.make_User() | 630 | owner = factory.make_User() |
| 451 | 592 | node = factory.make_Node(owner=owner) | 631 | node = factory.make_Node(owner=owner) |
Here is an screenshot of what it looks like. This screenshot is a little bit older, as the subnet is also correct now in the branch.
http://