aboutsummaryrefslogtreecommitdiffstats
path: root/api/resources/v1
AgeCommit message (Collapse)AuthorFilesLines
2018-02-28fix pep8 problem in env.pyrexlee87761-8/+10
JIRA: YARDSTICK-1033 Change-Id: Ia0f745b1a21845afc5c3b3ec58d7a79da56d6a6c Signed-off-by: rexlee8776 <limingjiang@huawei.com>
2017-09-26Merge "Read user & password from yardstick.conf in Grafana configuration"Rex Lee1-10/+4
2017-09-21Introduced timeout to post method of HttpClientMaciej Skrocki1-1/+1
We seen cases where grafana container bring-up code would fail, because of too quick access to the http api. Added 10sec timeout for the first query of the API. Change-Id: Ifc95a626d0ab5552a1f26fb167fc3f65791392d7 Signed-off-by: Maciej Skrocki <maciej.skrocki@intel.com>
2017-09-15Read user & password from yardstick.conf in Grafana configurationchenjiankun1-10/+4
JIRA: YARDSTICK-812 Currently grafana data source configuration is hardcoding . It is a risk. so I read it from yardstick.conf. Change-Id: I8a9c8afbce6c4534fc43a0bfb5c56d67a8b59db0 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-08-31Add API(v1) to get real time logchenjiankun1-0/+50
JIRA: YARDSTICK-805 We need to get real time log if we use API(v1) run test case. API: /yardstick/tasks/<task_id>/log For example: http://ip:port/yardstick/tasks/14795be8-f144-4f54-81ce-43f4e3eab33f/log?index=0 Change-Id: Ic0bf10f26f4f07d3264f2415c4923a1bfded2f81 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-08-22DRAFT: update yardstick generic test cases dashboardrexlee87761-3/+3
current dashboard is obselete and hard to understand add local grafana dashboard automatically import by "yardstick env grafana" update grafana version to latest steady Change-Id: Iffae9170231d3e0867a52a1f6b5e99c4650b7326 Signed-off-by: rexlee8776 <limingjiang@huawei.com>
2017-08-15YAML fixesRoss Brattain1-2/+2
There are multiple issues wiht YAML loading. 1. Jinja2 renders None values as a string 'None'. This is not valid YAML we need to render None values to '~' or 'null' which is the native YAML None value. 2. Jinja2 renders dict and lists that contain unicode with u'foo' values. This is not value YAML syntax. Because we are serializing dict and lists into YAML, we need to encode them as valid YAML. We can override Jinja2 finalize to use yaml.dump to dump inline YAML. We use yaml.safe_dump(elem, default_flow_style=True).replace('\n', '') to generate valid single-line YAML dict and list values. But this problem highlights the general difficulties with templating and loading files. We could avoid this Python->Jinja2->YAML->Python issue by directly injecting the list or dict after the YAML is loaded. I'm not sure of the real utility of these templates. 3. On Python 2 YAML loader is rendering all strings as unicode. This does not work for Trex because Trex is broken and badly coded. Trex does type checking against str() which is different for Python 2 and Python 3. The default YAML loader will return native string types, str() or unicode() for Python 2 and Python 3 respectively. The bad Trex codes is in convert_val: https://github.com/cisco-system-traffic-generator/trex-core/blob/master/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_packet_builder_scapy.py#L674 def convert_val (val): if is_integer(val): return val if type(val) == str: return ipv4_str_to_num (is_valid_ipv4(val)) raise CTRexPacketBuildException(-11,("init val invalid %s ") % val ); This code is doing type(val) == str. This is bad and broken. We can't fix Trex, so we have to render all strings as native str() types The bug here was that the Heat template loader template_format.py was overriding the global YAML loader to always return unicode. We don't want this global override. To fix this we have to use local subclasses of the yaml.SafeLoader class. But in order to dynamically subclass from CSafeLoader or SafeLoader we have to use the type() builtin to define a new class at runtime. Once we have new classes defined, we can safely isolate different YAML constructors and return unicode or not depending on the case. To be consistent we implement a new yaml_loader.py module to centralize all non-Heat template yaml loading to ensure correct uncode/str conversion Change-Id: Iebf9cf78fbda390977c390436b0869e7bbf503eb Signed-off-by: Ross Brattain <ross.b.brattain@intel.com> Signed-off-by: Deepak S <deepak.s@linux.intel.com> Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-08-01replace yaml.load with yaml.safe_loadRoss Brattain1-1/+1
yaml.safe_load is safer, obviously. anteater will check for this template_format use specialized constructor based on yaml.SafeLoader JIRA: YARDSTICK-760 Change-Id: Ia3b0b3aa0765385a0ee472a4d83f49d424b5a77f Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-07-25Merge "yardstick env influxdb/grafana cmd support centos"Rex Lee1-17/+35
2017-07-21Add API(v2) to run taskchenjiankun1-2/+3
JIRA: YARDSTICK-741 API: /api/v2/yardstick/tasks/<task_id> METHOD: PUT PARAMS: { 'action': 'run' } Change-Id: Ia5340c6ff45e3e7e70ab4597c39476138e7016f2 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-19yardstick env influxdb/grafana cmd support centoschenjiankun1-17/+35
JIRA: YARDSTICK-714 Currently yardstick env influxdb/grafana command do not support centos. Because we use the gateway ip to get the service of influxdb and grafana. But in centos, we can not access influxdb/grafana service via gateway ip. In this patch, I use docker inspect to get the ip of influxdb and grafana. So these command can support centos. Change-Id: Ie4abcb8048b92d61bc62777dfc362bb29f354b2b Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-11Yardstick API architecture improvementchenjiankun6-0/+742
JIRA: YARDSTICK-710 Since we have the plan to upload api v2 and gui. We need to add put and delete method. So the architecture need to be improved. Change-Id: Ie20a79c26ef6c581897ce4e63980fa2895b162d2 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>