From: Yujun Zhang <zhang.yujunz@zte.com.cn>
Date: Sat, 8 Oct 2016 01:27:36 +0000 (+0000)
Subject: Merge "Add benchmark name in post request parameters"
X-Git-Tag: danube.1.0~267
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=fbd80aeee2f3605ebbfe18b4401e255476ab688a;p=qtip.git

Merge "Add benchmark name in post request parameters"
---

fbd80aeee2f3605ebbfe18b4401e255476ab688a
diff --cc restful_server/qtip_server.py
index 565a0e5d,e036a1cb..a059ca3c
--- a/restful_server/qtip_server.py
+++ b/restful_server/qtip_server.py
@@@ -24,12 -24,13 +24,13 @@@ class JobModel
      resource_fields = {
          'installer_type': fields.String,
          'installer_ip': fields.String,
 -        'max-minutes': fields.Integer,
 +        'max_minutes': fields.Integer,
          'pod_name': fields.String,
          'suite_name': fields.String,
-         'type': fields.String
+         'type': fields.String,
+         'benchmark_name': fields.String
      }
-     required = ['installer_type', 'install_ip']
+     required = ['installer_type', 'installer_ip']
  
  
  @swagger.model
@@@ -129,9 -132,10 +132,10 @@@ default is all benchmarks in suite wit
          parser.add_argument('pod_name', type=str, required=False, default='default', help='pod_name should be string')
          parser.add_argument('suite_name', type=str, required=False, default='compute', help='suite_name should be string')
          parser.add_argument('type', type=str, required=False, default='BM', help='type should be BM, VM and ALL')
+         parser.add_argument('benchmark_name', type=str, required=False, default='all', help='benchmark_name should be string')
          args = parser.parse_args()
 -        if not args_handler.check_suit_in_test_list(args["suite_name"]):
 -            return abort(404, 'message:Test Suit {0} does not exist in test_list'.format(args["suite_name"]))
 +        if not args_handler.check_suite_in_test_list(args["suite_name"]):
 +            return abort(404, 'message:Test suite {0} does not exist in test_list'.format(args["suite_name"]))
          if not args_handler.check_lab_name(args["pod_name"]):
              return abort(404, 'message: You have specified a lab {0}\
                                 that is not present in test_cases'.format(args['pod_name']))
diff --cc tests/qtip_server_test.py
index 59e011ef,6659fc07..2f9eebf1
--- a/tests/qtip_server_test.py
+++ b/tests/qtip_server_test.py
@@@ -45,22 -45,19 +45,19 @@@ class TestClass
          ({'installer_type': 'fuel',
            'installer_ip': '10.20.0.2',
            'pod_name': 'zte-pod1',
 -          'max-minutes': 20,
 +          'max_minutes': 20,
            'suite_name': 'compute',
-           'type': 'VM'},
+           'type': 'VM',
+           'benchmark_name': 'dhrystone_vm.yaml'},
           {'job_id': '',
            'installer_type': 'fuel',
            'installer_ip': '10.20.0.2',
            'pod_name': 'zte-pod1',
            'suite_name': 'compute',
 -          'max-minutes': 20,
 +          'max_minutes': 20,
            'type': 'VM',
            'state': 'finished',
-           'state_detail': [{u'state': u'finished', u'benchmark': u'dhrystone_vm.yaml'},
-                            {u'state': u'finished', u'benchmark': u'whetstone_vm.yaml'},
-                            {u'state': u'finished', u'benchmark': u'ramspeed_vm.yaml'},
-                            {u'state': u'finished', u'benchmark': u'dpi_vm.yaml'},
-                            {u'state': u'finished', u'benchmark': u'ssl_vm.yaml'}],
+           'state_detail': [{u'state': u'finished', u'benchmark': u'dhrystone_vm.yaml'}],
            'result': 0})
      ])
      @mock.patch('restful_server.qtip_server.args_handler.prepare_and_run_benchmark')