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
diff --git a/src/maasserver/static/partials/vlan-details.html b/src/maasserver/static/partials/vlan-details.html
index 1a2e330..0461460 100644
--- a/src/maasserver/static/partials/vlan-details.html
+++ b/src/maasserver/static/partials/vlan-details.html
@@ -26,7 +26,7 @@
26 <h3 class="page-header__dropdown-title">Provide DHCP</h3>26 <h3 class="page-header__dropdown-title">Provide DHCP</h3>
27 <form class="p-form p-form--stacked">27 <form class="p-form p-form--stacked">
28 <!-- This is just for visual reasons, since we need an additional border to begin the form if there is no error. -->28 <!-- This is just for visual reasons, since we need an additional border to begin the form if there is no error. -->
29 <fieldset class="p-form__fieldset col-6">29 <div class="p-form__fieldset col-6">
30 <div class="p-form__group" data-ng-hide="vlanDetails.relatedSubnets.length === 0">30 <div class="p-form__group" data-ng-hide="vlanDetails.relatedSubnets.length === 0">
31 <label for="primary-rack" class="p-form__group-label col-2">{$ vlanDetails.relatedControllers.length <= 1 ? "Rack controller" : "Primary controller" $}</label>31 <label for="primary-rack" class="p-form__group-label col-2">{$ vlanDetails.relatedControllers.length <= 1 ? "Rack controller" : "Primary controller" $}</label>
32 <div class="p-form__group-input col-3">32 <div class="p-form__group-input col-3">
@@ -68,9 +68,9 @@
68 <option value="" data-ng-if=""></option>68 <option value="" data-ng-if=""></option>
69 </select>69 </select>
70 </div>70 </div>
71 </div>
71 </div>72 </div>
72 </fieldset>73 <div class="p-form__fieldset col-6" data-ng-if="vlanDetails.actionOption.name === 'enable_dhcp'">
73 <fieldset class="p-form__fieldset col-6" data-ng-if="vlanDetails.actionOption.name === 'enable_dhcp'">
74 <div class="p-form__group"74 <div class="p-form__group"
75 data-ng-hide="vlanDetails.provideDHCPAction.needsDynamicRange === false || vlanDetails.relatedSubnets.length === 0">75 data-ng-hide="vlanDetails.provideDHCPAction.needsDynamicRange === false || vlanDetails.relatedSubnets.length === 0">
76 <label for="start-ip" class="p-form__group-label col-2">Dynamic range start IP</label>76 <label for="start-ip" class="p-form__group-label col-2">Dynamic range start IP</label>
@@ -116,16 +116,16 @@
116 <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()">116 <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()">
117 </div>117 </div>
118 -->118 -->
119 </fieldset>119 </div>
120 </form>120 </form>
121 </section>121 </section>
122 </div>122 </div>
123 <div class="row">123 <div class="row">
124 <section class="page-header__section" data-ng-if="vlanDetails.actionOption.name === 'relay_dhcp'">124 <section class="page-header__section" data-ng-if="vlanDetails.actionOption.name === 'relay_dhcp'">
125 <h3 class="page-header__dropdown-title">Relay DHCP</h3>125 <h3 class="page-header__dropdown-title">Relay DHCP</h3>
126 <form class="form form--stack">126 <form class="p-form p-form--stacked">
127 <!-- This is just for visual reasons, since we need an additional border to begin the form if there is no error. -->127 <!-- This is just for visual reasons, since we need an additional border to begin the form if there is no error. -->
128 <fieldset class="p-form__fieldset col-6">128 <div class="p-form__fieldset col-6">
129 <div class="p-form__group">129 <div class="p-form__group">
130 <label for="relay_vlan" class="p-form__group-label col-2">Relay VLAN</label>130 <label for="relay_vlan" class="p-form__group-label col-2">Relay VLAN</label>
131 <div class="p-form__group-input col-3">131 <div class="p-form__group-input col-3">
@@ -148,9 +148,9 @@
148 <option value="" data-ng-if=""></option>148 <option value="" data-ng-if=""></option>
149 </select>149 </select>
150 </div>150 </div>
151 </div>
151 </div>152 </div>
152 </fieldset>153 <div class="p-form__fieldset col-6">
153 <fieldset class="p-form__fieldset col-6">
154 <div class="p-form__group"154 <div class="p-form__group"
155 data-ng-hide="vlanDetails.provideDHCPAction.needsDynamicRange === false || vlanDetails.relatedSubnets.length === 0">155 data-ng-hide="vlanDetails.provideDHCPAction.needsDynamicRange === false || vlanDetails.relatedSubnets.length === 0">
156 <label for="start-ip" class="p-form__group-label col-2">Dynamic range start IP</label>156 <label for="start-ip" class="p-form__group-label col-2">Dynamic range start IP</label>
@@ -189,7 +189,7 @@
189 data-ng-change="vlanDetails.updatendIP()">189 data-ng-change="vlanDetails.updatendIP()">
190 </div>190 </div>
191 </div>191 </div>
192 </fieldset>192 </div>
193 </form>193 </form>
194 </section>194 </section>
195 </div>195 </div>
@@ -294,7 +294,7 @@
294 </div>294 </div>
295 <div class="p-form__group" data-ng-if="vlanDetails.relatedControllers">295 <div class="p-form__group" data-ng-if="vlanDetails.relatedControllers">
296 <div class="p-form__label">296 <div class="p-form__label">
297 <p><strong>Rack controllers</strong> 297 <p><strong>Rack controllers</strong>
298 <span class="p-tooltip p-tooltip--top-center">298 <span class="p-tooltip p-tooltip--top-center">
299 <i class="p-icon--information">Help:</i>299 <i class="p-icon--information">Help:</i>
300 <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>300 <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>
@@ -311,7 +311,7 @@
311 <div class="row">311 <div class="row">
312 <maas-obj-form obj="vlanDetails.vlan" manager="vlanDetails.vlanManager" data-ng-disabled="!vlanDetails.isSuperUser()" data-ng-if="vlanDetails.editSummary"312 <maas-obj-form obj="vlanDetails.vlan" manager="vlanDetails.vlanManager" data-ng-disabled="!vlanDetails.isSuperUser()" data-ng-if="vlanDetails.editSummary"
313 table-form="true" save-on-blur="false" after-save="vlanDetails.exitEditSummary">313 table-form="true" save-on-blur="false" after-save="vlanDetails.exitEditSummary">
314 <div class="row"> 314 <div class="row">
315 <div class="col-6">315 <div class="col-6">
316 <maas-obj-field type="text" key="vid" label="VID" placeholder="VLAN VID"316 <maas-obj-field type="text" key="vid" label="VID" placeholder="VLAN VID"
317 label-width="2" input-width="5" blur-on-enter="true"></maas-obj-field>317 label-width="2" input-width="5" blur-on-enter="true"></maas-obj-field>
@@ -336,7 +336,7 @@
336 </div>336 </div>
337 <div class="p-form__group" data-ng-if="vlanDetails.relatedControllers">337 <div class="p-form__group" data-ng-if="vlanDetails.relatedControllers">
338 <div class="p-form__label">338 <div class="p-form__label">
339 <p><strong>Rack controllers</strong> 339 <p><strong>Rack controllers</strong>
340 <span class="p-tooltip p-tooltip--top-center">340 <span class="p-tooltip p-tooltip--top-center">
341 <i class="p-icon--information">Help:</i>341 <i class="p-icon--information">Help:</i>
342 <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>342 <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