Add learned MAC Timeout

+ Profiles icon

Change-Id: Iafb7203781515ec72fc881944c84bd803ad7c090
Signed-off-by: Elisha Oren <elisha.oren@hpe.com>

diff --git a/dlux/cpeui/cpeui-module/src/main/resources/cpeui/admin.tpl.html b/dlux/cpeui/cpeui-module/src/main/resources/cpeui/admin.tpl.html
index 3ded6f0d94a984c84e91fff7d7490ed24e5d0b63..a5d74790ec7d010f434f519899b66e183119f625 100644 (file)
--- a/dlux/cpeui/cpeui-module/src/main/resources/cpeui/admin.tpl.html
+++ b/dlux/cpeui/cpeui-module/src/main/resources/cpeui/admin.tpl.html
@@ -17,7 +17,7 @@
                                <i class="icon-signal"></i> Networks</a>
                         </li>
                         <li ng-class="{ active: isTabSet('admin',5)}" ng-click="setTab('admin',5);updateProfilesView()">
-                               <a href="#/cpeui/admin/profiles"><i class="icon-signal"></i> Profiles</a>
+                               <a href="#/cpeui/admin/profiles"><i class="icon-book"></i> Profiles</a>
                         </li>
                        <li id="refresh_btn" class="active refresh-btn"
                                ng-click="updateView()"><button class="btn add-row"> <i class="icon-refresh"></i> Refresh</button>

diff --git a/dlux/cpeui/cpeui-module/src/main/resources/cpeui/dialogs/AddEvc.tpl.html b/dlux/cpeui/cpeui-module/src/main/resources/cpeui/dialogs/AddEvc.tpl.html
index ff56a3909fbe1c0fc364882c98e1f8a835c84b0e..8507775de0105f16f35e91308095053e20063ada 100644 (file)
--- a/dlux/cpeui/cpeui-module/src/main/resources/cpeui/dialogs/AddEvc.tpl.html
+++ b/dlux/cpeui/cpeui-module/src/main/resources/cpeui/dialogs/AddEvc.tpl.html
@@ -46,11 +46,14 @@
                <div ng-message="pattern">IP/Mask is required! (ex. 127.0.0.1/32)</div>
        </div>
       </md-input-container>
-       <div layout-gt-sm="row">
+       <div layout-gt-sm="row" style="padding:0">
                <md-input-container class="md-block" flex-gt-sm>
+               <!-- 
                        <md-switch name="is_preserve_vlan" ng-model="obj.is_preserve_vlan">{{obj.is_preserve_vlan ? "" : "Do Not"}} Preserve VLAN</md-switch>
+                -->
+                       <md-checkbox name="is_preserve_vlan" ng-model="obj.is_preserve_vlan">Preserve VLAN</md-checkbox>
                </md-input-container>
-               <md-input-container class="md-block" ng-if="obj.is_preserve_vlan" flex-gt-sm style="margin-bottom: 0px; margin-top: 36px;">
+               <md-input-container class="md-block" ng-if="obj.is_preserve_vlan" flex-gt-sm style="margin-bottom: 0px;">
                        <label>Preserved VLAN</label>
                        <input required type="number" step="1" name="p_vlan" ng-model="obj.preserved_vlan">
                        <div ng-messages="projectForm.p_vlan.$error">
@@ -58,11 +61,19 @@
                        </div>
                </md-input-container>
        </div>
+       <md-input-container class="md-block" ng-init="obj.mac_timeout = 300">
+               <label>Learned MAC Expiration Time (seconds)</label>
+               <input type="number" step="1" name="mac_timeout" min="0" ng-model="obj.mac_timeout">
+               <div ng-messages="projectForm.mac_timeout.$error">
+                       <div ng-message="min">Number must be positive</div>
+               </div>
+       </md-input-container>
        <md-input-container class="md-block" ng-init="obj.mtu_size = 1522">
                <label>EVC MTU size</label>
                <input type="number" step="1" name="mtu" min="1522" max="16384" ng-model="obj.mtu_size">
                <div ng-messages="projectForm.mtu.$error">
                        <div ng-message="min">Number must be in range [1522..16384]</div>
+                       <div ng-message="max">Number must be in range [1522..16384]</div>
                </div>
        </md-input-container>
        <md-input-container class="md-block">

diff --git a/dlux/cpeui/cpeui-module/src/main/resources/cpeui/services/cpeui.services.js b/dlux/cpeui/cpeui-module/src/main/resources/cpeui/services/cpeui.services.js
index cd64681cebeb77d4129f1916383080c8fbeb72b3..6d41f7bba8941ea63aeff9f205bd4db98c49107f 100644 (file)
--- a/dlux/cpeui/cpeui-module/src/main/resources/cpeui/services/cpeui.services.js
+++ b/dlux/cpeui/cpeui-module/src/main/resources/cpeui/services/cpeui.services.js
@@ -464,6 +464,7 @@ define(['app/cpeui/cpeui.module'],function(cpeui) {
                   "max-svc-frame-size" : evc.mtu_size,
                   "unicast-svc-frm-delivery" : evc.unicast,
                   "multicast-svc-frm-delivery" : evc.multicast,
+                  "mac-timeout":evc.mac_timeout,
                   "unis" : {
                     "uni" : uni_json
                   },