Merge ~deadlight/maas:1770273-ip-assignment into maas:master

Proposed by Karl Williams
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 4f3709c3c47879c726b004bba43a992e3ab3c227
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~deadlight/maas:1770273-ip-assignment
Merge into: maas:master
Diff against target: 14 lines (+0/-3)
1 file modified
src/maasserver/static/partials/node-details.html (+0/-3)
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
MAAS Lander unittests Pending
Review via email: mp+345404@code.launchpad.net

Commit message

LP: #1770273 - remove IP Assignment and additional Subnet fields from machine interfaces form

Description of the change

Removed the IP Assignment and additional Subnet fields from machine interfaces form.

QA:
Check the interface forms for both machines and devices:

"""
Effectively, a machine interface should have:

 - fabric
 - vlan
 - subnet
 - IP mode

Stuff that's only for devices:

 - IP Assignment
 - Subnet
"""

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) wrote :

lgtm!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maasserver/static/partials/node-details.html b/src/maasserver/static/partials/node-details.html
2index 5dca856..7e78d3f 100755
3--- a/src/maasserver/static/partials/node-details.html
4+++ b/src/maasserver/static/partials/node-details.html
5@@ -1240,9 +1240,6 @@
6 on-change="vlanChangedForm"
7 options="vlan as getVLANText(vlan) for vlan in vlans | removeDefaultVLANIfVLAN:interface.type | filterByFabric:editInterface.$maasForm.getValue('fabric')">
8 </maas-obj-field>
9- <maas-obj-field type="options" key="ip_assignment" label="IP Assignment" label-width="2" input-width="5"
10- disable-label="false"
11- options="assignment.name as assignment.text for assignment in ipAssignments"></maas-obj-field>
12 <maas-obj-field type="options" key="subnet" label="Subnet" placeholder="Unconfigured" placeholder-enabled="true"
13 disable-label="false" label-width="2" input-width="5"
14 data-ng-if="editInterface.$maasForm.getValue('fabric')"

Subscribers

People subscribed via source and target branches