From: Elisha Oren <elisha.oren@hpe.com>
Date: Thu, 22 Dec 2016 15:29:40 +0000 (+0200)
Subject: Edit Profile, default burst time,draggable dialogs
X-Git-Tag: release/carbon~55
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=7c46f62e309d5b688ea3640ca8f43aff5c62ef8f;p=unimgr.git

Edit Profile, default burst time,draggable dialogs

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

diff --git a/dlux/cpeui/cpeui-module/src/main/resources/cpeui/admin.controller.js b/dlux/cpeui/cpeui-module/src/main/resources/cpeui/admin.controller.js
index 4d142635..2dcd3bbe 100644
--- a/dlux/cpeui/cpeui-module/src/main/resources/cpeui/admin.controller.js
+++ b/dlux/cpeui/cpeui-module/src/main/resources/cpeui/admin.controller.js
@@ -48,11 +48,25 @@ define([ 'app/cpeui/cpeui.module' ], function(cpeui) {
         };
 
         $scope.addProfile = new CpeuiDialogs.Dialog('AddProfile', {}, function(obj) {
-          CpeuiSvc.addProfile(obj['bw-profile'], obj.cir, obj.cbs, function() {
-            $scope.updateProfilesView();
-          });
+            if (obj.default_cbs) {
+                obj.cbs = Math.floor(obj.cir/10);
+            }
+            CpeuiSvc.addProfile(obj['bw-profile'], obj.cir, obj.cbs, function() {
+              $scope.updateProfilesView();
+            });
         });
 
+        $scope.editProfile = function(profileName, cbs, cir) {
+            new CpeuiDialogs.Dialog('AddProfile', {}, function(obj) {
+                if (obj.default_cbs) {
+                    obj.cbs = Math.floor(obj.cir/10);
+                }
+                CpeuiSvc.editProfile(obj['bw-profile'], obj.cir, obj.cbs, function() {
+                  $scope.updateProfilesView();
+                });
+            }).show(null,{edit:true, profileName:profileName, cbs:cbs, cir:cir});
+        };
+
         $scope.deleteProfile = function(profileName) {
           CpeuiDialogs.confirm(function() {
             CpeuiSvc.deleteProfile(profileName, function() {
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 c53b818a..8827a486 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
@@ -124,7 +124,7 @@
 			<thead>
 				<tr>
 					<th>Profile Name</th>
-					<th>Committed Information Rate (Kb/s)</th>
+					<th>Committed Information Rate (KB/s)</th>
 					<th>Committed Burst Size (bytes)</th>
 					<th></th>
 				</tr>
@@ -135,6 +135,10 @@
 					<td class="minimal-width">{{ profile.cir }}</td>
 					<td class="minimal-width">{{ profile.cbs }}</td>
 					<td class="delete-tr">
+					   <button class="btn btn-md btn-info" ng-click="editProfile(profile['bw-profile'],profile.cbs,profile.cir)">
+                        <i class="icon-edit"></i>
+                        <md-tooltip>Edit Profile</md-tooltip>
+                        </button>
 						<button class="btn btn-md btn-danger" ng-click="deleteProfile(profile['bw-profile'])">
 						<i class="icon-trash"></i>
 						<md-tooltip>Delete Profile</md-tooltip>
diff --git a/dlux/cpeui/cpeui-module/src/main/resources/cpeui/dialogs/AddProfile.tpl.html b/dlux/cpeui/cpeui-module/src/main/resources/cpeui/dialogs/AddProfile.tpl.html
index 59b8a517..c298373f 100644
--- a/dlux/cpeui/cpeui-module/src/main/resources/cpeui/dialogs/AddProfile.tpl.html
+++ b/dlux/cpeui/cpeui-module/src/main/resources/cpeui/dialogs/AddProfile.tpl.html
@@ -1,7 +1,7 @@
 <md-dialog class="cpe-dialog" aria-label="Create Profile" ng-cloak>
 	<md-toolbar>
 		<div class="md-toolbar-tools">
-			<h2>Create Profile</h2>
+			<h2>{{params.edit ? 'Edit' : 'Create'}} Profile</h2>
 			<span flex></span>
 			<md-button class="md-icon-button" aria-label="Close dialog"
 				ng-click="cancel()"> <i class="icon-remove-sign"></i> </md-button>
@@ -11,22 +11,25 @@
 		<md-dialog-content>
 			<div layout="column" ng-cloak>
 				<md-content layout-padding>
-					<md-input-container class="md-block">
+					<md-input-container class="md-block" ng-init="obj['bw-profile'] = params.profileName">
 						<label>Profile Name</label>
-					 	<input name="profilename" ng-model="obj['bw-profile']">
+					 	<input name="profilename" ng-model="obj['bw-profile']" ng-disabled="params.edit">
 					 	<div ng-messages="projectForm.profilename.$error">
 							<div ng-message="required">This is required!</div>
 						</div>
 				 	</md-input-container>
-					<md-input-container class="md-block">
-						<label>Committed Information Rate (Kb/s)</label>
+					<md-input-container class="md-block" ng-init="obj.cir = params.cir">
+						<label>Committed Information Rate (KB/s)</label>
 						<input type="number" required name="cir" ng-model="obj.cir" min="0">
 						<div ng-messages="projectForm.cir.$error">
 							<div ng-message="required">Number is required!</div>
 							<div ng-message="min">Number must be positive!</div>
 						</div>
 					</md-input-container>
-					<md-input-container class="md-block">
+					<md-checkbox name="" ng-model="obj.default_cbs" ng-init="obj.default_cbs = true">
+					   Use default Committed Burst Size {{obj.cir ? '('+((obj.cir - (obj.cir % 10)) / 10) + ' bytes)': ''}}
+					</md-checkbox>
+					<md-input-container class="md-block" ng-if="!obj.default_cbs" ng-init="obj.cbs = params.cbs">
 						<label>Committed Burst Size (bytes)</label>
 						<input type="number" required name="cbs" ng-model="obj.cbs" min="0">
 						<div ng-messages="projectForm.cbs.$error">
diff --git a/dlux/cpeui/cpeui-module/src/main/resources/cpeui/services/cpeui.dialogs.js b/dlux/cpeui/cpeui-module/src/main/resources/cpeui/services/cpeui.dialogs.js
index 14706860..27b52ec1 100644
--- a/dlux/cpeui/cpeui-module/src/main/resources/cpeui/services/cpeui.dialogs.js
+++ b/dlux/cpeui/cpeui-module/src/main/resources/cpeui/services/cpeui.dialogs.js
@@ -41,7 +41,7 @@ define([ 'app/cpeui/cpeui.module' ], function(cpeui) {
           locals : {
             params : params
           },
-        // onComplete: function() {$('md-dialog').draggable();}
+         onComplete: function() {$('md-dialog').draggable();}
         });
       };
     };
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 78c25809..cd64681c 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
@@ -80,6 +80,22 @@ define(['app/cpeui/cpeui.module'],function(cpeui) {
           });
       };
 
+      svc.editProfile = function(name, cir, cbs, callback){
+          $http({
+              method:'PUT',
+              url:"/restconf/config/mef-global:mef-global/profiles/ingress-bwp-flows/bwp-flow/"+name,
+              data: {"bwp-flow":{
+                      "bw-profile": name,
+                      cir: cir,
+                      cbs:cbs
+                    }}
+          }).then(function successCallback(response) {
+              if (callback != undefined) {
+                  callback();
+              }
+          });
+      };
+      
       svc.deleteProfile = function(name, callback) {
           $http({
               method:'DELETE',