MAAS

Merge ~ya-bo-ng/maas:vlan-provide-DHCP into maas:master

  1. Git
  2. lp:~ya-bo-ng/maas
  3. vlan-provide-DHCP
  4. Merge into master
Proposed by Anthony Dillon
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 189ec42fc2070310f8dbff249ea85be4a6628973
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~ya-bo-ng/maas:vlan-provide-DHCP
Merge into: maas:master
Diff against target: 93 lines (+12/-12)
1 file modified
src/maasserver/static/partials/vlan-details.html (+12/-12)
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
MAAS Lander Needs Fixing
Review via email: mp+340059@code.launchpad.net

Commit message

LP: #1751940 - Fix the layout of the VLAN provide and relay DHCP forms

Description of the change

## Done
Updated the layout of the VLANS actions. Both the provide and relay DHCP header action forms.

## QA
- Go to Subnets
- Click on a VLAN
- Select both actions in the header
- Check that the forms a formatted correctly

Fixes https://bugs.launchpad.net/maas/+bug/1751940

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

@Ant, do you happen to have an screenshot to see the result?

Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b vlan-provide-DHCP lp:~ya-bo-ng/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/1757/console
COMMIT: 189ec42fc2070310f8dbff249ea85be4a6628973

review: Needs Fixing
Revision history for this message
Anthony Dillon (ya-bo-ng) wrote :

Relay DHCP:
https://screenshots.firefox.com/zfQwxupfKY2q692e/10.54.72.113

Provide DHCP:
https://screenshots.firefox.com/anx9kZN9VpEkrAyV/10.54.72.113

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/vlan-details.html b/src/maasserver/static/partials/vlan-details.html
2index 1a2e330..0461460 100644
3--- a/src/maasserver/static/partials/vlan-details.html
4+++ b/src/maasserver/static/partials/vlan-details.html
5@@ -26,7 +26,7 @@
6 <h3 class="page-header__dropdown-title">Provide DHCP</h3>
7 <form class="p-form p-form--stacked">
8 <!-- This is just for visual reasons, since we need an additional border to begin the form if there is no error. -->
9- <fieldset class="p-form__fieldset col-6">
10+ <div class="p-form__fieldset col-6">
11 <div class="p-form__group" data-ng-hide="vlanDetails.relatedSubnets.length === 0">
12 <label for="primary-rack" class="p-form__group-label col-2">{$ vlanDetails.relatedControllers.length <= 1 ? "Rack controller" : "Primary controller" $}</label>
13 <div class="p-form__group-input col-3">
14@@ -68,9 +68,9 @@
15 <option value="" data-ng-if=""></option>
16 </select>
17 </div>
18+ </div>
19 </div>
20- </fieldset>
21- <fieldset class="p-form__fieldset col-6" data-ng-if="vlanDetails.actionOption.name === 'enable_dhcp'">
22+ <div class="p-form__fieldset col-6" data-ng-if="vlanDetails.actionOption.name === 'enable_dhcp'">
23 <div class="p-form__group"
24 data-ng-hide="vlanDetails.provideDHCPAction.needsDynamicRange === false || vlanDetails.relatedSubnets.length === 0">
25 <label for="start-ip" class="p-form__group-label col-2">Dynamic range start IP</label>
26@@ -116,16 +116,16 @@
27 <input type="text" class="col-3" name="number-of-ips" data-ng-model="vlanDetails.provideDHCPAction.numIPs" data-ng-disabled="true" data-ng-change="vlanDetails.updateNumAddresses()">
28 </div>
29 -->
30- </fieldset>
31+ </div>
32 </form>
33 </section>
34 </div>
35 <div class="row">
36 <section class="page-header__section" data-ng-if="vlanDetails.actionOption.name === 'relay_dhcp'">
37 <h3 class="page-header__dropdown-title">Relay DHCP</h3>
38- <form class="form form--stack">
39+ <form class="p-form p-form--stacked">
40 <!-- This is just for visual reasons, since we need an additional border to begin the form if there is no error. -->
41- <fieldset class="p-form__fieldset col-6">
42+ <div class="p-form__fieldset col-6">
43 <div class="p-form__group">
44 <label for="relay_vlan" class="p-form__group-label col-2">Relay VLAN</label>
45 <div class="p-form__group-input col-3">
46@@ -148,9 +148,9 @@
47 <option value="" data-ng-if=""></option>
48 </select>
49 </div>
50+ </div>
51 </div>
52- </fieldset>
53- <fieldset class="p-form__fieldset col-6">
54+ <div class="p-form__fieldset col-6">
55 <div class="p-form__group"
56 data-ng-hide="vlanDetails.provideDHCPAction.needsDynamicRange === false || vlanDetails.relatedSubnets.length === 0">
57 <label for="start-ip" class="p-form__group-label col-2">Dynamic range start IP</label>
58@@ -189,7 +189,7 @@
59 data-ng-change="vlanDetails.updatendIP()">
60 </div>
61 </div>
62- </fieldset>
63+ </div>
64 </form>
65 </section>
66 </div>
67@@ -294,7 +294,7 @@
68 </div>
69 <div class="p-form__group" data-ng-if="vlanDetails.relatedControllers">
70 <div class="p-form__label">
71- <p><strong>Rack controllers</strong>
72+ <p><strong>Rack controllers</strong>
73 <span class="p-tooltip p-tooltip--top-center">
74 <i class="p-icon--information">Help:</i>
75 <span class="p-tooltip__message" role="tooltip">A rack controller controls hosts and images and runs network services&#xa;like DHCP for connected VLANs.</span>
76@@ -311,7 +311,7 @@
77 <div class="row">
78 <maas-obj-form obj="vlanDetails.vlan" manager="vlanDetails.vlanManager" data-ng-disabled="!vlanDetails.isSuperUser()" data-ng-if="vlanDetails.editSummary"
79 table-form="true" save-on-blur="false" after-save="vlanDetails.exitEditSummary">
80- <div class="row">
81+ <div class="row">
82 <div class="col-6">
83 <maas-obj-field type="text" key="vid" label="VID" placeholder="VLAN VID"
84 label-width="2" input-width="5" blur-on-enter="true"></maas-obj-field>
85@@ -336,7 +336,7 @@
86 </div>
87 <div class="p-form__group" data-ng-if="vlanDetails.relatedControllers">
88 <div class="p-form__label">
89- <p><strong>Rack controllers</strong>
90+ <p><strong>Rack controllers</strong>
91 <span class="p-tooltip p-tooltip--top-center">
92 <i class="p-icon--information">Help:</i>
93 <span class="p-tooltip__message" role="tooltip">A rack controller controls hosts and images and runs network services&#xa;like DHCP for connected VLANs.</span>

Subscribers

People subscribed via source and target branches