MAAS

Merge ~steverydz/maas:bond-ip-mode into maas:master

  1. Git
  2. lp:~steverydz/maas
  3. bond-ip-mode
  4. Merge into master
Proposed by Steve Rydz
Status: Merged
Approved by: Andres Rodriguez
Approved revision: ab1aa6a24d2a3547217cb32f9a910eede0602848
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~steverydz/maas:bond-ip-mode
Merge into: maas:master
Diff against target: 74 lines (+49/-0)
1 file modified
src/maasserver/static/partials/node-details.html (+49/-0)
Reviewer Review Type Date Requested Status
Mike Pontillo (community) Approve
MAAS Lander Approve
Anthony Dillon Approve
Review via email: mp+359910@code.launchpad.net

Commit message

LP: #1805700 - Fix IP mode and IP address fields appearing when editing a bond

To post a comment you must log in.
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b bond-ip-mode lp:~steverydz/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 8f7622d6c17854e62c54816d14eacfdf52406b2e

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

LGTM thanks +1

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

UNIT TESTS
-b bond-ip-mode lp:~steverydz/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: ab1aa6a24d2a3547217cb32f9a910eede0602848

review: Approve
Revision history for this message
Mike Pontillo (mpontillo) wrote :

Looks good; thanks for the fix!

review: Approve

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

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 5f981bd..4be2c41 100755
3--- a/src/maasserver/static/partials/node-details.html
4+++ b/src/maasserver/static/partials/node-details.html
5@@ -1006,6 +1006,23 @@
6 </select>
7 </div>
8 </div>
9+ <div class="p-form__group" data-ng-if="!isLinkModeDisabled(newBridgeInterface)">
10+ <label for="link-mode" class="p-form__label">IP mode</label>
11+ <div class="p-form__control">
12+ <select name="link-mode"
13+ data-ng-model="newBridgeInterface.mode"
14+ data-ng-change="modeChanged(newBridgeInterface)"
15+ data-ng-options="mode.mode as mode.text for mode in modes | filterLinkModes:newBridgeInterface">
16+ </select>
17+ </div>
18+ </div>
19+ <div class="p-form__group" data-ng-if="newBridgeInterface.mode == 'static'">
20+ <label for="ip-address" class="p-form__label">IP address</label>
21+ <div class="p-form__control"
22+ data-ng-class="{ 'is-error': isIPAddressInvalid(newBridgeInterface) }">
23+ <input name="ip-address" type="text" placeholder="IP address" data-ng-model="newBridgeInterface.ip_address">
24+ </div>
25+ </div>
26 </div>
27 </div>
28 </div>
29@@ -1482,6 +1499,22 @@
30 </select>
31 </div>
32 </div>
33+ <div class="p-form__group" data-ng-if="!isLinkModeDisabled(editInterface)">
34+ <label for="link-mode" class="p-form__label">IP mode</label>
35+ <div class="p-form__control">
36+ <select name="link-mode"
37+ data-ng-model="editInterface.mode"
38+ data-ng-change="modeChanged(editInterface)"
39+ data-ng-options="mode.mode as mode.text for mode in modes | filterLinkModes:editInterface">
40+ </select>
41+ </div>
42+ </div>
43+ <div class="p-form__group" data-ng-if="editInterface.mode == 'static'">
44+ <label for="ip-address" class="p-form__label">IP address</label>
45+ <div class="p-form__control" data-ng-class="{ 'is-error': isIPAddressInvalid(editInterface) }">
46+ <input name="ip-address" type="text" placeholder="IP address" data-ng-model="editInterface.ip_address">
47+ </div>
48+ </div>
49 </div>
50 </div>
51 </div>
52@@ -1778,6 +1811,22 @@
53 </select>
54 </div>
55 </div>
56+ <div class="p-form__group u-vertically-center" data-ng-if="!isLinkModeDisabled(newBondInterface)">
57+ <label for="link-mode" class="p-form__label">IP mode</label>
58+ <div class="p-form__control">
59+ <select name="link-mode"
60+ data-ng-model="newBondInterface.mode"
61+ data-ng-change="modeChanged(newBondInterface)"
62+ data-ng-options="mode.mode as mode.text for mode in modes | filterLinkModes:newBondInterface">
63+ </select>
64+ </div>
65+ </div>
66+ <div class="p-form__group u-vertically-center" data-ng-if="newBondInterface.mode == 'static'">
67+ <label for="ip-address" class="p-form__label">IP address</label>
68+ <div class="p-form__control" data-ng-class="{ 'is-error': isIPAddressInvalid(newBondInterface) }">
69+ <input name="ip-address" type="text" placeholder="IP address" data-ng-model="newBondInterface.ip_address">
70+ </div>
71+ </div>
72 </div>
73 </div>
74 </div>

Subscribers

People subscribed via source and target branches