Merge "Supporting user config task parameters in GUI"

7 files changed, 143 insertions, 29 deletions

diff --git a/api/database/v2/models.py b/api/database/v2/models.py
index 59dab3ebc..0ee811698 100644
--- a/api/database/v2/models.py
+++ b/api/database/v2/models.py
@@ -92,6 +92,7 @@ class V2Task(Base):
     case_name = Column(String(30))
     suite = Column(Boolean)
     content = Column(Text)
+    params = Column(Text)
     result = Column(Text)
     error = Column(Text)
     status = Column(Integer)
diff --git a/api/resources/v2/tasks.py b/api/resources/v2/tasks.py
index 25a9cf109..17241ed63 100644
--- a/api/resources/v2/tasks.py
+++ b/api/resources/v2/tasks.py
@@ -38,6 +38,8 @@ class V2Tasks(ApiResource):
         for t in tasks:
             result = t['result']
             t['result'] = jsonutils.loads(result) if result else None
+            params = t['params']
+            t['params'] = jsonutils.loads(params) if params else None
 
         return result_handler(consts.API_SUCCESS, {'tasks': tasks})
 
@@ -94,6 +96,9 @@ class V2Task(ApiResource):
         result = task_info['result']
         task_info['result'] = jsonutils.loads(result) if result else None
 
+        params = task_info['params']
+        task_info['params'] = jsonutils.loads(params) if params else None
+
         return result_handler(consts.API_SUCCESS, {'task': task_info})
 
     def delete(self, task_id):
@@ -127,7 +132,6 @@ class V2Task(ApiResource):
         return result_handler(consts.API_SUCCESS, {'task': task_id})
 
     def put(self, task_id):
-
         try:
             uuid.UUID(task_id)
         except ValueError:
@@ -166,6 +170,21 @@ class V2Task(ApiResource):
 
         return result_handler(consts.API_SUCCESS, {'uuid': task_id})
 
+    def add_params(self, args):
+        task_id = args['task_id']
+        try:
+            params = args['params']
+        except KeyError:
+            return result_handler(consts.API_ERROR, 'params must be provided')
+
+        LOG.info('update params info in task')
+
+        task_handler = V2TaskHandler()
+        task_update_data = {'params': jsonutils.dumps(params)}
+        task_handler.update_attr(task_id, task_update_data)
+
+        return result_handler(consts.API_SUCCESS, {'uuid': task_id})
+
     def add_case(self, args):
         task_id = args['task_id']
         try:
@@ -243,7 +262,8 @@ class V2Task(ApiResource):
 
         data = {
             'inputfile': ['/tmp/{}.yaml'.format(task.case_name)],
-            'task_id': task_id
+            'task_id': task_id,
+            'task-args': task.params
         }
         if task.suite:
             data.update({'suite': True})
diff --git a/gui/app/scripts/controllers/projectDetail.controller.js b/gui/app/scripts/controllers/projectDetail.controller.js
index e8468045d..353e02bcf 100644
--- a/gui/app/scripts/controllers/projectDetail.controller.js
+++ b/gui/app/scripts/controllers/projectDetail.controller.js
@@ -439,15 +439,36 @@ angular.module('yardStickGui2App')
 
                         $scope.displayTable = false;
                         $scope.contentInfo = response.result.testcase;
+                        $scope.optionalParams = response.result.args;
 
                     }
                 }, function(error) {
-                    toaster.pop({
-                        type: 'error',
-                        title: 'fail',
-                        body: 'unknow error',
-                        timeout: 3000
-                    });
+                    mainFactory.errorHandler2(error);
+                })
+            }
+
+
+            function addParamsToTask(){
+                var params = {}
+                angular.forEach($scope.optionalParams, function(value, name){
+                    if(value.value){
+                        params[name] = value.value;
+                    }
+                });
+
+                mainFactory.taskAddParams().put({
+                    'taskId': $scope.newUUID,
+                    'action': 'add_params',
+                    'args': {
+                        'params': params
+                    }
+                }).$promise.then(function(resp) {
+                    if (resp.status == 1) {
+                    } else {
+                        mainFactory.errorHandler1(resp);
+                    }
+                }, function(error) {
+                    mainFactory.errorHandler2(error);
                 })
             }
 
@@ -530,6 +551,7 @@ angular.module('yardStickGui2App')
             function confirmAddCaseOrSuite(content) {
                 if ($scope.selectType.name == "Test Case") {
                     addCasetoTask(content);
+                    addParamsToTask();
                 } else {
                     addSuitetoTask(content);
                 }
diff --git a/gui/app/scripts/controllers/taskModify.controller.js b/gui/app/scripts/controllers/taskModify.controller.js
index 757d65866..c9672fea8 100644
--- a/gui/app/scripts/controllers/taskModify.controller.js
+++ b/gui/app/scripts/controllers/taskModify.controller.js
@@ -20,6 +20,7 @@ angular.module('yardStickGui2App')
                 $scope.constructTestSuit = constructTestSuit;
                 $scope.constructTestCase = constructTestCase;
                 $scope.getTestDeatil = getTestDeatil;
+                $scope.getTestcaseArgs = getTestcaseArgs;
                 $scope.confirmToServer = confirmToServer;
                 $scope.addEnvToTask = addEnvToTask;
             }
@@ -46,6 +47,8 @@ angular.module('yardStickGui2App')
                             getItemIdDetail($scope.taskDetailData.environment_id);
                         }
 
+                        getTestcaseArgs();
+
                     }
                 }, function(error) {
                     toaster.pop({
@@ -277,7 +280,6 @@ angular.module('yardStickGui2App')
 
             function getTestDeatil() {
 
-
                 if ($scope.selectType.name == 'Test Case') {
                     getTestcaseDetail();
                 } else {
@@ -307,6 +309,29 @@ angular.module('yardStickGui2App')
             }
 
 
+            function getTestcaseArgs(){
+                mainFactory.getTestcaseDetail().get({
+                    'testcasename': $scope.taskDetailData.case_name
+                }).$promise.then(function(resp){
+                    if(resp.status == 1){
+                        $scope.optionalParams = resp.result.args;
+                        var params = $scope.taskDetailData.params;
+                        if(params){
+                            angular.forEach($scope.optionalParams, function(value, name){
+                                if(name in params){
+                                    value.value = params[name];
+                                }
+                            });
+                        }
+                    }else{
+                        mainFactory.errorHandler1(resp);
+                    }
+                }, function(error){
+                    mainFactory.errorHandler2(error);
+                });
+            }
+
+
             function getTestcaseDetail() {
                 mainFactory.getTestcaseDetail().get({
                     'testcasename': $scope.selectCase
@@ -316,15 +341,13 @@ angular.module('yardStickGui2App')
 
                         $scope.displayTable = false;
                         $scope.contentInfo = response.result.testcase;
+                        $scope.optionalParams = response.result.args;
 
+                    }else{
+                        mainFactory.errorHandler1(response);
                     }
                 }, function(error) {
-                    toaster.pop({
-                        type: 'error',
-                        title: 'fail',
-                        body: 'unknow error',
-                        timeout: 3000
-                    });
+                    mainFactory.errorHandler2(error);
                 })
             }
 
@@ -426,12 +449,38 @@ angular.module('yardStickGui2App')
                 if ($scope.selectCase == 'Test Case' || $scope.taskDetailData.suite == false) {
 
                     addCasetoTask(content);
+                    addParamsToTask();
                 } else {
                     addSuitetoTask(content);
                 }
             }
 
 
+            function addParamsToTask(){
+                var params = {}
+                angular.forEach($scope.optionalParams, function(value, name){
+                    if(value.value){
+                        params[name] = value.value;
+                    }
+                });
+
+                mainFactory.taskAddParams().put({
+                    'taskId': $stateParams.taskId,
+                    'action': 'add_params',
+                    'args': {
+                        'params': params
+                    }
+                }).$promise.then(function(resp) {
+                    if (resp.status == 1) {
+                    } else {
+                        mainFactory.errorHandler1(resp);
+                    }
+                }, function(error) {
+                    mainFactory.errorHandler2(error);
+                })
+            }
+
+
             function addEnvToTask() {
 
                 mainFactory.taskAddEnv().put({
diff --git a/gui/app/scripts/factory/main.factory.js b/gui/app/scripts/factory/main.factory.js
index 16e9c81fe..f75369336 100644
--- a/gui/app/scripts/factory/main.factory.js
+++ b/gui/app/scripts/factory/main.factory.js
@@ -221,6 +221,14 @@ angular.module('yardStickGui2App')
                     }
                 })
             },
+
+            taskAddParams: function() {
+                return $resource(Base_URL + '/api/v2/yardstick/tasks/:taskId', { taskId: "@taskId" }, {
+                    'put': {
+                        method: 'PUT'
+                    }
+                })
+            },
             //delete operate
             deleteEnv: function() {
                 return $resource(Base_URL + '/api/v2/yardstick/environments/:env_id', { env_id: '@env_id' }, {
diff --git a/gui/app/views/modal/taskCreate.html b/gui/app/views/modal/taskCreate.html
index 2d7f1dc3b..ab6ff0ca1 100644
--- a/gui/app/views/modal/taskCreate.html
+++ b/gui/app/views/modal/taskCreate.html
@@ -80,13 +80,20 @@
             </div>
         </div>
 
-        <div ng-show="displayTable==false">
-            <textarea ng-model="contentInfo" spellcheck="false">
-
-
-            </textarea>
-
 
+        <div ng-show="displayTable==false" style="display:flex;flex-direction:row;justify-content:space-between;margin-top:10px;">
+            <textarea class="col-md-8" ng-model="contentInfo" style="margin-top:5px;" spellcheck="false"></textarea>
+            <div class="col-md-4" style="border:1px solid #e8e8e8;margin-top:5px;margin-left:10px;padding-top:30px;">
+                <h4>Optional Paramters:</h4>
+                <form class="form-horizontal col-md-offset-2" style="margin-top:20px">
+                    <div ng-repeat="(name, value) in optionalParams" class="form-group">
+                        <label for="param{{$index}}" class="col-md-5" style="font-weight:normal;">{{ name }}:</label>
+                        <div class="col-md-5">
+                            <input type="text" ng-model="value.value" class="form-control" id="param{{$index}}">
+                        </div>
+                    </div>
+                </form>
+            </div>
         </div>
 
 
diff --git a/gui/app/views/taskmodify.html b/gui/app/views/taskmodify.html
index d12df4ba2..24b3d945f 100644
--- a/gui/app/views/taskmodify.html
+++ b/gui/app/views/taskmodify.html
@@ -42,11 +42,20 @@
                 <button class="btn btn-default" style="float:right" ng-disabled="sourceShow==null" ng-click="confirmToServer(contentInfo,taskDetailData.content)">Confirm</button>
             </div>
 
-
-            <textarea ng-model="taskDetailData.content" ng-show="sourceShow==false" style="margin-top:5px;" spellcheck="false">
-
-
-            </textarea>
+            <div ng-show="sourceShow==false" style="display:flex;flex-direction:row;justify-content:space-between;margin-top:10px;">
+                <textarea class="col-md-8" ng-model="taskDetailData.content" style="margin-top:5px;" spellcheck="false"></textarea>
+                <div class="col-md-4" style="border:1px solid #e8e8e8;margin-top:5px;margin-left:10px;padding-top:30px;">
+                    <h4>Optional Paramters:</h4>
+                    <form class="form-horizontal col-md-offset-2" style="margin-top:20px">
+                        <div ng-repeat="(name, value) in optionalParams" class="form-group">
+                            <label for="param{{$index}}" class="col-md-5" style="font-weight:normal;">{{ name }}:</label>
+                            <div class="col-md-5">
+                                <input type="text" ng-model="value.value" class="form-control" id="param{{$index}}">
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
 
             <div ng-show="sourceShow==true">
                 <div style="display:flex;flex-direction:row">
@@ -102,9 +111,7 @@
 
                 <div ng-show="displayTable==false">
                     <textarea ng-model="contentInfo" spellcheck="false">
-            </textarea>
-
-
+                    </textarea>
                 </div>
             </div>