summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-08-22Merge "test_vsperf_dpdk: remove unused and incorrect mock open"Ross Brattain1-2/+0
2017-08-21Merge "Refactor to make file sys more like class inheritance"Ross Brattain13-18/+23
2017-08-21Refactor to make file sys more like class inheritanceEdward MacGillivray13-18/+23
Change-Id: I5471d2e894ca78407a57f3ba01202264c69ad174 Signed-off-by: Edward MacGillivray <edward.s.macgillivray@intel.com>
2017-08-20vnf_generic: fixup topology probe logicRoss Brattain1-4/+4
fix exception handling Change-Id: I46fd0dbf21f3d3308e4f38fcfae5df2716ad7190 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-08-20test_vsperf_dpdk: remove unused and incorrect mock openRoss Brattain1-2/+0
need to use create=True with mock open anyway Change-Id: I3a35688cf8c367434db9d0cf057030d49deddd0d Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-08-20remove apexlake-verifyRoss Brattain1-29/+0
Change-Id: I5ac8e5d573c390460e2472c7b3b4649cc78dd295 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-08-21Merge "Add common openstack opertation scenarios: network"Jing Lu7-0/+316
2017-08-19Merge "import_modules_from_package: refactor with generators"Ross Brattain2-41/+20
2017-08-19Merge "Fix IxLoad traffic generator issue around running the traffic."Ross Brattain6-44/+107
2017-08-19Merge "Support traffic generator for testing more than 10 ports"Ross Brattain2-4/+4
2017-08-19Fix IxLoad traffic generator issue around running the traffic.Deepak S6-44/+107
Change-Id: Ic1f13c0d28c1a1b01bbf3c8a6a618a5b3ab5bbeb Signed-off-by: Deepak S <deepak.s@linux.intel.com> Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-08-19import_modules_from_package: refactor with generatorsRoss Brattain2-41/+20
remove ..... split and use os.path.relpath to remove prefix use set operations to find missing modules, so we don't need to check dict contains multiple times Change-Id: I9531360fb9b2999e83874f144f1d06d825b22b2c Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-08-19Fix parsing of the results from collectd pluginsDeepak S2-17/+19
Change-Id: I3f7b9ca17164564b11517116e7e73b47f42243b9 Signed-off-by: Deepak S <deepak.s@linux.intel.com>
2017-08-19Support traffic generator for testing more than 10 portsDeepak S2-4/+4
Change-Id: I9c027af082cedbadc23b0151d403dab4e9756da4 Signed-off-by: Deepak S <deepak.s@linux.intel.com>
2017-08-17Fix import error in IxNetworkDeepak S5-18/+15
This patch fixes import error related to ixnetwork and do not wait for TG server to start as IXIA is always running :) Change-Id: I49d6b100eadafad75431cb8974605a6faa496f23 Signed-off-by: Deepak S <deepak.s@linux.intel.com> Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-08-17samplevnf: fix make_ip_addrRoss Brattain1-1/+1
we get TypeError sometimes, so we need to catch them Change-Id: I5fc58006f18acf84f62d8f4a21077d71b2fb0ed8 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-08-17Merge "utils: create TASK_LOG_DIR if it doesn't exist"Ross Brattain2-1/+3
2017-08-17Merge "Verify the route list before parsing the data key"Ross Brattain1-1/+4
2017-08-17Merge "run_traffic: capture and exit gracefully if crash in trex run_traffic"Ross Brattain3-15/+24
2017-08-16Merge "YAML fixes"Ross Brattain23-148/+290
2017-08-16Verify the route list before parsing the data keyDeepak S1-1/+4
Exception: line 502, in get_route_data return next((route[data_key] for route in route_list if route['if'] == port), None) TypeError: 'NoneType' object is not iterable Change-Id: Ia45d90a4e9a61cb917b23efd03b86eafb249b747 Signed-off-by: Deepak S <deepak.s@linux.intel.com>
2017-08-16Merge "Remove redundancy file and do relative modification"Ross Brattain15-333/+71
2017-08-15YAML fixesRoss Brattain23-148/+290
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-15run_traffic: capture and exit gracefully if crash in trex run_trafficDeepak S3-15/+24
new non-blocking code of run_traffic has raise condition which causes trex client to exit with STLError. This patches captures the exception and exit gracefully Traceback (most recent call last): File "/usr/lib/python2.7/multiprocessing/process.py", line 258, in _bootstrap self.run() File "/usr/lib/python2.7/multiprocessing/process.py", line 114, in run self._target(*self._args, **self._kwargs) File "/opt/nsb_bin/yardstick_venv/lib/python2.7/site-packages/yardstick-0.1.dev0-py2.7.egg/yardstick/network_services/vnf_generic/vnf/sample_vnf.py", line 945, in _traffic_runner self.resource_helper.run_traffic(traffic_profile) File "/opt/nsb_bin/yardstick_venv/lib/python2.7/site-packages/yardstick-0.1.dev0-py2.7.egg/yardstick/network_services/vnf_generic/vnf/sample_vnf.py", line 506, in run_traffic self._run_traffic_once(traffic_profile) File "/opt/nsb_bin/yardstick_venv/lib/python2.7/site-packages/yardstick-0.1.dev0-py2.7.egg/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_trex.py", line 63, in _run_traffic_once self.client.stop(self.my_ports) File "/opt/nsb_bin/trex/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py", line 1202, in wrap2 raise STLError("'{0}' - connection to the server had been lost: '{1}'".format(func_name, client.conn.get_disconnection_cause())) STLError: Change-Id: Ie5741339451e0a3f9c4bb48f64fd35d86d18e5d4 Signed-off-by: Deepak S <deepak.s@linux.intel.com> Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-08-15html_template: can't use iteritems, use itemsRoss Brattain1-2/+2
iteritems is not supported in Python 3 we have to use items() Change-Id: Ib923dfea4220eeab311949c9f6f420fef378e98a Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-08-15Enable ixnet traffic generator to run trafficDeepak S5-12/+18
Change-Id: I8d7cea75aa864c37a058a154a38c9828ea5da434 Signed-off-by: Deepak S <deepak.s@linux.intel.com> Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-08-15Moving trex to latest version (v2.28) to support new NICsDeepak S1-1/+1
Change-Id: I81e119deec36ae90749c2eb1d555f75475ce2474 Signed-off-by: Deepak S <deepak.s@linux.intel.com>
2017-08-15Merge "Download the right dpdk bind tool before starting the test case"Ross Brattain1-0/+6
2017-08-15Merge "deepgetitem: try string index before int"Ross Brattain2-4/+22
2017-08-15Merge "gitignore: ignore .tox/"Ross Brattain1-0/+2
2017-08-15Download the right dpdk bind tool before starting the test caseDeepak S1-0/+6
Change-Id: Id8901aabef402d5743e2575e275b5a57046e897c Signed-off-by: Deepak S <deepak.s@linux.intel.com>
2017-08-14gitignore: ignore .tox/Ross Brattain1-0/+2
Change-Id: If021ed0f099c81492fd7509317efc31f020e6d18 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-08-15deepgetitem: try string index before intRoss Brattain2-4/+22
Change-Id: I3b353c5887db0ebbe33e37db505e72b85167b54e Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-08-15Merge "Update release note for Danube.3.2"Ross Brattain1-8/+19
2017-08-15Merge "ACL: remove failing testing"Ross Brattain1-24/+0
2017-08-15Merge "task: initialize result"Ross Brattain1-0/+2
2017-08-14task: initialize resultRoss Brattain1-0/+2
Change-Id: I8d6b9bed24c9afa4be54296515e6aa91e84fe650 Signed-off-by: Martin Banszel <martinx.banszel@intel.com> Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-08-15dynamictp: fix flake8 warningRoss Brattain1-1/+1
flake8 warns about indent Change-Id: Ib7a57dcb8462de24a2ccb1fdbc60db995cc60d33 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-08-14ACL: remove failing testingRoss Brattain1-24/+0
test_instantiate_panic fails randomly sometimes in Jenkins, the test doesn't really do anything useful, so remove it Change-Id: Ia44ebbe778b812ae1b4660d64e88bf029fed3701 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-08-15Merge "KVMFORNFV: Update Grafana config for Packet Forwarding test cases."Rex Lee2-68/+713
2017-08-15Integrate vsperf in Tgen modeJing Zhang7-0/+984
Problem: Running Vsperf in Tgen mode is supported but the integration is not complete at the code level i.e. not ready-to-use, and dpdk loopback is not supported inside the VM. Solution: (1) Completely automates VM image generation and supports 1G huge pages. (2) Adds a new test scenario VsperfDPDK for testpmd based loopback inside the VM. Update 1-2: Fixed "line too long" issues not reported by local run_tests.sh (why?) Update 3: Per comment change to use SSH.from_node() and add unit test cases Update 4: Add more unit test cases for coverage and ready the code for merge JIRA: YARDSTICK-661 Change-Id: Iea3014d4c83e1b0c079019a4ed27771d40a7eed8 Signed-off-by: Jing Zhang <jing.c.zhang@nokia.com>
2017-08-15Update release note for Danube.3.2JingLu51-8/+19
Note: This patch should be merger to stable branch. Change-Id: I7f07a7c367fc387494f2313143a300fef85a8fd1 Signed-off-by: JingLu5 <lvjing5@huawei.com>
2017-08-15Merge "Add yardstick report for each task"Ross Brattain4-0/+75
2017-08-14Ansible typo fix, whitespaceRoss Brattain3-2/+1
Change-Id: I3639ab84ab5b9e802e1bbd23674b0fbda46fdc66 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-08-14PROX VNF and TGRoss Brattain66-31/+40815
PROX was added to samplevnf project https://git.opnfv.org/samplevnf/tree/VNFs/DPPD-PROX JIRA: YARDSTICK-638 Change-Id: If9875b1130c6bed87deb8720b0d8b28ede9289d9 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-08-14Merge "cli: typo, s/dispath/dispatch/g"Ross Brattain1-4/+4
2017-08-14Add yardstick report for each taskchenjiankun4-0/+75
JIRA: YARDSTICK-784 Currently we have yardstick report in GUI. But if users do not use GUI, they can't see this report. So we need generate a report each task. After run each test case, we can see report: http://ip:port/report/report.html Change-Id: Ic76cf57f55aa6680b91272e210135136f0225373 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-08-13utils: create TASK_LOG_DIR if it doesn't existRoss Brattain2-1/+3
Change-Id: I10630599065e6c159b137bd4d6ee89353a1c411b Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-08-13cli: typo, s/dispath/dispatch/gRoss Brattain1-4/+4
Change-Id: I3df6bc606f2ac78baf611aee22b9247f6f9d5136 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-08-12Move the comment above the config parameter line to avoid the expectionDeepak S1-1/+2
Traceback (most recent call last): File "/opt/nsb_bin/yardstick_venv/lib/python2.7/site-packages/yardstick-0.1.dev0-py2.7.egg/yardstick/cmd/commands/task.py", line 54, in do_start result = Task().start(param, **kwargs) File "/opt/nsb_bin/yardstick_venv/lib/python2.7/site-packages/yardstick-0.1.dev0-py2.7.egg/yardstick/benchmark/core/task.py", line 148, in start self._do_output(output_config, result) File "/opt/nsb_bin/yardstick_venv/lib/python2.7/site-packages/yardstick-0.1.dev0-py2.7.egg/yardstick/benchmark/core/task.py", line 227, in _do_output dispatchers = DispatcherBase.get(output_config) File "/opt/nsb_bin/yardstick_venv/lib/python2.7/site-packages/yardstick-0.1.dev0-py2.7.egg/yardstick/dispatcher/base.py", line 46, in get for out_type in config['DEFAULT']['dispatcher']] File "/opt/nsb_bin/yardstick_venv/lib/python2.7/site-packages/yardstick-0.1.dev0-py2.7.egg/yardstick/dispatcher/base.py", line 38, in get_cls raise RuntimeError("No such dispatcher_type %s" % dispatcher_type) RuntimeError: No such dispatcher_type Http # setup multiple dipatcher with comma deperted e.g. file Change-Id: I497d0d9ce7fdb7ea2913af6ebeb4bb9008344fed Signed-off-by: Deepak S <deepak.s@linux.intel.com>