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
diff --git a/src/maasserver/static/partials/node-details.html b/src/maasserver/static/partials/node-details.html
index 5f981bd..4be2c41 100755
--- a/src/maasserver/static/partials/node-details.html
+++ b/src/maasserver/static/partials/node-details.html
@@ -1006,6 +1006,23 @@
1006 </select>1006 </select>
1007 </div>1007 </div>
1008 </div>1008 </div>
1009 <div class="p-form__group" data-ng-if="!isLinkModeDisabled(newBridgeInterface)">
1010 <label for="link-mode" class="p-form__label">IP mode</label>
1011 <div class="p-form__control">
1012 <select name="link-mode"
1013 data-ng-model="newBridgeInterface.mode"
1014 data-ng-change="modeChanged(newBridgeInterface)"
1015 data-ng-options="mode.mode as mode.text for mode in modes | filterLinkModes:newBridgeInterface">
1016 </select>
1017 </div>
1018 </div>
1019 <div class="p-form__group" data-ng-if="newBridgeInterface.mode == 'static'">
1020 <label for="ip-address" class="p-form__label">IP address</label>
1021 <div class="p-form__control"
1022 data-ng-class="{ 'is-error': isIPAddressInvalid(newBridgeInterface) }">
1023 <input name="ip-address" type="text" placeholder="IP address" data-ng-model="newBridgeInterface.ip_address">
1024 </div>
1025 </div>
1009 </div>1026 </div>
1010 </div>1027 </div>
1011 </div>1028 </div>
@@ -1482,6 +1499,22 @@
1482 </select>1499 </select>
1483 </div>1500 </div>
1484 </div>1501 </div>
1502 <div class="p-form__group" data-ng-if="!isLinkModeDisabled(editInterface)">
1503 <label for="link-mode" class="p-form__label">IP mode</label>
1504 <div class="p-form__control">
1505 <select name="link-mode"
1506 data-ng-model="editInterface.mode"
1507 data-ng-change="modeChanged(editInterface)"
1508 data-ng-options="mode.mode as mode.text for mode in modes | filterLinkModes:editInterface">
1509 </select>
1510 </div>
1511 </div>
1512 <div class="p-form__group" data-ng-if="editInterface.mode == 'static'">
1513 <label for="ip-address" class="p-form__label">IP address</label>
1514 <div class="p-form__control" data-ng-class="{ 'is-error': isIPAddressInvalid(editInterface) }">
1515 <input name="ip-address" type="text" placeholder="IP address" data-ng-model="editInterface.ip_address">
1516 </div>
1517 </div>
1485 </div>1518 </div>
1486 </div>1519 </div>
1487 </div>1520 </div>
@@ -1778,6 +1811,22 @@
1778 </select>1811 </select>
1779 </div>1812 </div>
1780 </div>1813 </div>
1814 <div class="p-form__group u-vertically-center" data-ng-if="!isLinkModeDisabled(newBondInterface)">
1815 <label for="link-mode" class="p-form__label">IP mode</label>
1816 <div class="p-form__control">
1817 <select name="link-mode"
1818 data-ng-model="newBondInterface.mode"
1819 data-ng-change="modeChanged(newBondInterface)"
1820 data-ng-options="mode.mode as mode.text for mode in modes | filterLinkModes:newBondInterface">
1821 </select>
1822 </div>
1823 </div>
1824 <div class="p-form__group u-vertically-center" data-ng-if="newBondInterface.mode == 'static'">
1825 <label for="ip-address" class="p-form__label">IP address</label>
1826 <div class="p-form__control" data-ng-class="{ 'is-error': isIPAddressInvalid(newBondInterface) }">
1827 <input name="ip-address" type="text" placeholder="IP address" data-ng-model="newBondInterface.ip_address">
1828 </div>
1829 </div>
1781 </div>1830 </div>
1782 </div>1831 </div>
1783 </div>1832 </div>

Subscribers

People subscribed via source and target branches