Code Review / vnfsdk / refrepo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 9865969)
Res Mgr defect fix
authorseshukm <seshu.kumar.m@huawei.com>
Tue, 25 Apr 2017 12:23:56 +0000 (17:53 +0530)
committerseshukm <seshu.kumar.m@huawei.com>
Tue, 25 Apr 2017 12:23:56 +0000 (17:53 +0530)
IssueId : CLIENT-200

Change-Id: I2f106ac9a7f253cd4fae6995986dbe6f59541fb3
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
resmgr/src/main/webapp/resmgr/index.html patch | blob | history
resmgr/src/main/webapp/resmgr/js/app.js patch | blob | history
resmgr/src/main/webapp/resmgr/nfv-resmgr/vim/vimgraph.html patch | blob | history
resmgr/src/main/webapp/resmgr/templates/templateContainer.html patch | blob | history
resmgr/src/main/webapp/resmgr/templates/templateWidget.html patch | blob | history

diff --git a/resmgr/src/main/webapp/resmgr/index.html b/resmgr/src/main/webapp/resmgr/index.html
index 36a6b17..9572b11 100644 (file)
--- a/resmgr/src/main/webapp/resmgr/index.html
+++ b/resmgr/src/main/webapp/resmgr/index.html
@@ -1,4 +1,4 @@
-<!--/* Copyright 2017, Huawei Technologies Co., Ltd.
+<!-- Copyright 2017, Huawei Technologies Co., Ltd.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
-*/-->
+-->
 
 
 <!DOCTYPE html>
diff --git a/resmgr/src/main/webapp/resmgr/js/app.js b/resmgr/src/main/webapp/resmgr/js/app.js
index 2ca5177..1c06d8a 100644 (file)
--- a/resmgr/src/main/webapp/resmgr/js/app.js
+++ b/resmgr/src/main/webapp/resmgr/js/app.js
@@ -198,6 +198,9 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             var portOperatingState = {"ErrMsg" :     {"errmsg" : "The name is required.", "modalVar":"port.operState"}};\r
             $('#myModal #operState').append($compile(Mustache.to_html(text, portOperatingState.ErrMsg))($scope));\r
 \r
+            var neNativeId = {"ErrMsg" :     {"errmsg" : "The nativeid required.", "modalVar":"port.nativeId"}};\r
+            $('#myModal #nativeId').append($compile(Mustache.to_html(text, neNativeId.ErrMsg))($scope));\r
+\r
             $scope.checkboxes = { 'checked': false, items: {} };\r
 \r
             $scope.portTableParams = new NgTableParams({count: 5, sorting: {name: 'asc'}    //{page: 1,count: 10,filter: {name: 'M'},sorting: {name: 'desc'}\r
@@ -292,6 +295,9 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             $scope.numericErr = false;\r
         }\r
         $scope.saveData = function(id) {\r
+            $scope.port.edgePoint = $('#portEdropdown').val();\r
+            $scope.port.type = $('#portdropdown').val();\r
+            $scope.port.me = $('#medropdown').val();\r
             if (!$scope.textboxErrName && !$scope.textboxErrMe) {\r
                                var ports ={};\r
                                ports.logicalTerminationPoint=$scope.port;\r
@@ -532,6 +538,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             $scope.textboxErrName = false;\r
         }\r
         $scope.saveData = function(id) {\r
+            $scope.site.type = $('#sitedropdown').val();\r
             if (!$scope.textboxErrName) {\r
                                \r
 \r
@@ -1040,6 +1047,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             $scope.numericErr = false;\r
         }\r
         $scope.saveData = function(id) {\r
+            $scope.link.type = $('#linkdropdown').val();\r
             if (!$scope.textboxErr) {\r
                                \r
                        var links ={}\r
@@ -1214,9 +1222,9 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
 \r
             $('#myModal #controller').append($compile(Mustache.to_html(dropDown, dropSimple_data))($scope));*/\r
                        \r
-                       var dropdownResponse=[{"serviceTemplateId":"meCtrl","templateName":"mecontroller1"},{"serviceTemplateId":"meCtrl2","templateName":"mecontroller"}];\r
+                       /*var dropdownResponse=[{"serviceTemplateId":"meCtrl","templateName":"mecontroller1"},{"serviceTemplateId":"meCtrl2","templateName":"mecontroller"}];\r
                        var dropdownInfo = translateToDropdownInfo(dropdownResponse);\r
-            document.getElementById("medropdown").innerHTML = dropdownInfo;\r
+            document.getElementById("medropdown").innerHTML = dropdownInfo;*/\r
 \r
 \r
             neDataService.getNECtrlDDList()\r
@@ -1372,6 +1380,9 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"])
             $("#myModal").modal({}).draggable();\r
         }\r
         $scope.saveData = function(id) {\r
+            $scope.ne.controller = $('#medropdown').val();\r
+            $scope.ne.siteId = $('#siteIdDropdown').val();\r
+\r
             if (!$scope.textboxErrName && !$scope.textboxErrIP) {\r
                                \r
                                var nes = {};\r
diff --git a/resmgr/src/main/webapp/resmgr/nfv-resmgr/vim/vimgraph.html b/resmgr/src/main/webapp/resmgr/nfv-resmgr/vim/vimgraph.html
index 2bde05b..badaa02 100644 (file)
--- a/resmgr/src/main/webapp/resmgr/nfv-resmgr/vim/vimgraph.html
+++ b/resmgr/src/main/webapp/resmgr/nfv-resmgr/vim/vimgraph.html
@@ -50,7 +50,7 @@
         <br>\r
         <label style="font-size:14px;">Cpu status</label>\r
     </div>\r
-    <div style="...">\r
+    <div style="width:30%;float: left;text-align:center;display: inline">\r
         <canvas id="memoryChart"></canvas>\r
         <br>\r
         <label style="font-size:14px;">Memory status</label>\r
diff --git a/resmgr/src/main/webapp/resmgr/templates/templateContainer.html b/resmgr/src/main/webapp/resmgr/templates/templateContainer.html
index ef6f01c..a1640ac 100644 (file)
--- a/resmgr/src/main/webapp/resmgr/templates/templateContainer.html
+++ b/resmgr/src/main/webapp/resmgr/templates/templateContainer.html
@@ -61,7 +61,7 @@
 \r
 <!--Table-->\r
 <script id="table" type="text/html">\r
-    {{#filter}}<input type="text" id="myInput" onkeyup="{{action}}" placeholder="Search for {{searchField}}">{{/filter}}\r
+    {{#filter}}<input type="text" autocomplete="off" id="myInput" onkeyup="{{action}}" placeholder="Search for {{searchField}}">{{/filter}}\r
     <table id="myTable{{#filter}}_search{{/filter}}" class="table {{#striped}}table-striped{{/striped}} {{#border}}table-bordered{{/border}} {{#hover}}table-hover{{/hover}} {{#condensed}}table-condensed{{/condensed}}">\r
         <thead>\r
         <tr>\r
diff --git a/resmgr/src/main/webapp/resmgr/templates/templateWidget.html b/resmgr/src/main/webapp/resmgr/templates/templateWidget.html
index bb8eef4..338cf47 100644 (file)
--- a/resmgr/src/main/webapp/resmgr/templates/templateWidget.html
+++ b/resmgr/src/main/webapp/resmgr/templates/templateWidget.html
@@ -97,7 +97,7 @@
 <!--text-->\r
 <script id="textfield" type="text/html">\r
     <div class="css-form">\r
-       <input id ="textbox" name="textbox" class="form-control inputfield" placeholder="{{placeholder}}" ng-model="{{modalVar}}" type="text"  ng-blur="{{errfunc}}({{modalVar}})" {{#required}}required{{/required}}> {{#required}}<span class="staricon">*</span>{{/required}}\r
+       <input id ="textbox" autocomplete="off" name="textbox" class="form-control inputfield" placeholder="{{placeholder}}" ng-model="{{modalVar}}" type="text"  ng-blur="{{errfunc}}({{modalVar}})" {{#required}}required{{/required}}> {{#required}}<span class="staricon">*</span>{{/required}}\r
         <span class="errMsg" ng-show="{{errtag}}">{{errmsg}}</span>\r
     </div>\r
 </script>\r
@@ -105,7 +105,7 @@
 <!--email-->\r
 <script id="email" type="text/html">\r
     <div class="css-form">\r
-        <input class="form-control inputfield"  placeholder="{{placeholder}}" ng-model="{{modalVar}}" type="email"  ng-blur="{{errfunc}}({{modalVar}})" {{#required}}required{{/required}}>{{#required}}<span class="staricon">*</span>{{/required}}\r
+        <input class="form-control inputfield" autocomplete="off" placeholder="{{placeholder}}" ng-model="{{modalVar}}" type="email"  ng-blur="{{errfunc}}({{modalVar}})" {{#required}}required{{/required}}>{{#required}}<span class="staricon">*</span>{{/required}}\r
         <span class="errMsg" ng-show="{{errtag}}">{{errmsg}}</span>\r
     </div>\r
 </script>\r
@@ -113,7 +113,7 @@
 <!--url-->\r
 <script  id="url" type="text/html">\r
     <div class="css-form">\r
-        <input class="form-control inputfield" placeholder="{{placeholder}}" ng-model="{{modalVar}}" type="url"  ng-blur="{{errfunc}}({{modalVar}})" {{#required}}required{{/required}}>{{#required}}<span class="staricon">*</span>{{/required}}\r
+        <input class="form-control inputfield" autocomplete="off" placeholder="{{placeholder}}" ng-model="{{modalVar}}" type="url"  ng-blur="{{errfunc}}({{modalVar}})" {{#required}}required{{/required}}>{{#required}}<span class="staricon">*</span>{{/required}}\r
         <span class="errMsg" ng-show="{{errtag}}">{{errmsg}}</span>\r
     </div>\r
 </script>\r
@@ -123,7 +123,7 @@
     <div class="css-form">\r
 \r
 \r
-        <input class="form-control inputfield" placeholder="{{placeholder}}" ng-model="{{modalVar}}" type="password" pattern=".{3,}" maxlength="{{#maxLength}}{{maxLength}}{{/maxLength}}{{^maxLength}}9{{/maxLength}}" ng-blur="{{errfunc}}({{modalVar}})" {{#required}}required{{/required}}>{{#required}}<span class="staricon">*</span>{{/required}}\r
+        <input class="form-control inputfield" autocomplete="off" placeholder="{{placeholder}}" ng-model="{{modalVar}}" type="password" pattern=".{3,}" maxlength="{{#maxLength}}{{maxLength}}{{/maxLength}}{{^maxLength}}9{{/maxLength}}" ng-blur="{{errfunc}}({{modalVar}})" {{#required}}required{{/required}}>{{#required}}<span class="staricon">*</span>{{/required}}\r
         <span class="errMsg" ng-show="{{errtag}}">{{errmsg}}</span>\r
     </div>\r
 </script>\r
@@ -131,7 +131,7 @@
 <!--numeric-->\r
 <script id="numeric" type="text/html">\r
     <div class="css-form">\r
-        <input  class="form-control inputfield" placeholder="{{placeholder}}" ng-model="{{modalVar}}" type="number"  ng-blur="{{errfunc}}({{modalVar}})" {{#required}}required{{/required}}/>{{#required}}<span class="staricon">*</span>{{/required}}\r
+        <input  class="form-control inputfield" autocomplete="off" placeholder="{{placeholder}}" ng-model="{{modalVar}}" type="number"  ng-blur="{{errfunc}}({{modalVar}})" {{#required}}required{{/required}}/>{{#required}}<span class="staricon">*</span>{{/required}}\r
         <span class="errMsg" ng-show="{{errtag}}">{{errmsg}}</span>\r
     </div>\r
 </script>\r
@@ -139,7 +139,7 @@
 <!--dot-->\r
 <script  id="dot" type="text/html">\r
     <div class="css-form">\r
-        <input class="form-control inputfield"  placeholder="{{placeholder}}" ng-model="{{modalVar}}" type="datetime-local"  ng-blur="{{errfunc}}({{modalVar}})" {{#required}}required{{/required}}>{{#required}}<span class="staricon">*</span>{{/required}}\r
+        <input class="form-control inputfield" autocomplete="off" placeholder="{{placeholder}}" ng-model="{{modalVar}}" type="datetime-local"  ng-blur="{{errfunc}}({{modalVar}})" {{#required}}required{{/required}}>{{#required}}<span class="staricon">*</span>{{/required}}\r
         <span class="errMsg" ng-show="{{errtag}}">{{errmsg}}</span>\r
     </div>\r
 </script>\r
@@ -180,7 +180,7 @@
 <!--ipv4-->\r
 <script   id="ipv4" type="text/html">\r
     <div class="css-form">\r
-        <input class="form-control inputfield" type="ipv4" placeholder="{{placeholder}}" ng-model="{{modalVar}}" pattern="((^|\.)((25[0-5])|(2[0-4]\d)|(1\d\d)|([1-9]?\d))){4}$"  ng-blur="{{errfunc}}({{modalVar}})" {{#required}}required{{/required}}>{{#required}}<span class="staricon">*</span>{{/required}}\r
+        <input class="form-control inputfield" autocomplete="off" type="ipv4" placeholder="{{placeholder}}" ng-model="{{modalVar}}" pattern="((^|\.)((25[0-5])|(2[0-4]\d)|(1\d\d)|([1-9]?\d))){4}$"  ng-blur="{{errfunc}}({{modalVar}})" {{#required}}required{{/required}}>{{#required}}<span class="staricon">*</span>{{/required}}\r
         <span class="errMsg" ng-show="{{errtag}}">{{errmsg}}</span>\r
     </div>\r
 </script>\r
@@ -196,7 +196,7 @@
 <!--textarea-->\r
 <script id="textarea" type="text/html">\r
     <div class="css-form">\r
-        <textarea class="form-control inputfield"  rows="4" cols="50" placeholder="{{placeholder}}" ng-model="{{modalVar}}"  ng-blur="{{errfunc}}({{modalVar}})" {{#required}}required{{/required}}></textarea>{{#required}}<span class="staricon">*</span>{{/required}}\r
+        <textarea class="form-control inputfield" autocomplete="off" rows="4" cols="50" placeholder="{{placeholder}}" ng-model="{{modalVar}}"  ng-blur="{{errfunc}}({{modalVar}})" {{#required}}required{{/required}}></textarea>{{#required}}<span class="staricon">*</span>{{/required}}\r
         <span class="errMsg" ng-show="{{errtag}}">{{errmsg}}</span>\r
     </div>\r
 </script>\r
This repository is for a reference vnf repository