From 99c8ec98f4a7a1467922a076c5975aa2d2f81007 Mon Sep 17 00:00:00 2001
From: Elisha Oren <elisha.oren@hpe.com>
Date: Tue, 10 Jan 2017 15:27:19 +0200
Subject: [PATCH] Add learned MAC Timeout

+ Profiles icon

Change-Id: Iafb7203781515ec72fc881944c84bd803ad7c090
Signed-off-by: Elisha Oren <elisha.oren@hpe.com>
---
 .../src/main/resources/cpeui/admin.tpl.html       |  2 +-
 .../main/resources/cpeui/dialogs/AddEvc.tpl.html  | 15 +++++++++++++--
 .../resources/cpeui/services/cpeui.services.js    |  1 +
 3 files changed, 15 insertions(+), 3 deletions(-)

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 3ded6f0d..a5d74790 100644
--- 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 ff56a390..8507775d 100644
--- 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 cd64681c..6d41f7bb 100644
--- 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
                   },
-- 
2.36.6