summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-10-20Update git submodulesKerim Gokarslan1-0/+0
* Update docs/submodules/nfvbench from branch 'stable/euphrates' - Updated docker tag Change-Id: If7b1d56d099bf8aae374baff91e8ab41572d4311 Signed-off-by: Kerim Gokarslan <kgokarsl@cisco.com>
2017-10-20Update git submodulesKerim Gokarslan1-0/+0
* Update docs/submodules/nfvbench from branch 'stable/euphrates' - NFVBENCH-35 Runlogdate is 0 in resultnfvbench Change-Id: Ib062a7c655b1e2f8bd9304e32e3ffc92948c02c4 Signed-off-by: Kerim Gokarslan <kgokarsl@cisco.com>
2017-10-20Update git submodulesKerim Gokarslan1-0/+0
* Update docs/submodules/nfvbench from branch 'stable/euphrates' - NFVBENCH-34 Pass configuration file to entrypoint script Change-Id: If44d5d9fb2db58b3e1a3ebd1c8d94c1452f84409 Signed-off-by: Kerim Gokarslan <kgokarsl@cisco.com>
2017-10-20Update git submodulesKerim Gokarslan1-0/+0
* Update docs/submodules/nfvbench from branch 'stable/euphrates' - NFVBENCH-33 STLError exception when the packet path drops all packets Change-Id: Ibe48bb04e1e8a11e920c46792fda261855edc20d Signed-off-by: Kerim Gokarslan <kgokarsl@cisco.com>
2017-10-20Update git submodulesahothan1-0/+0
* Update docs/submodules/nfvbench from branch 'stable/euphrates' - Move docker container to 1.0.10 Change-Id: Ie7b86f76f2762ac450c1f80a401dfc7290b0ae60 Signed-off-by: ahothan <ahothan@cisco.com>
2017-10-20Update git submodulesKerim Gokarslan1-0/+0
* Update docs/submodules/nfvbench from branch 'stable/euphrates' - Documentation update Change-Id: I7f7f2fab620ed42723093aac459622f993941e32 Signed-off-by: Kerim Gokarslan <kgokarsl@cisco.com>
2017-10-20Update git submodulesKerim Gokarslan1-0/+0
* Update docs/submodules/nfvbench from branch 'stable/euphrates' - DONT MERGE documentation test Change-Id: I49205d601148de35e5c643a8fba50d7dafc57dc6 Signed-off-by: Kerim Gokarslan <kgokarsl@cisco.com>
2017-10-20Update git submodulesKerim Gokarslan1-0/+0
* Update docs/submodules/nfvbench from branch 'stable/euphrates' - NFVBENCH-32 Check nan result values before integer casting Change-Id: Ia675672b40f93d7503ebe5a355896a084e3d0cbf Signed-off-by: Kerim Gokarslan <kgokarsl@cisco.com>
2017-10-20Update git submodulesKerim Gokarslan1-0/+0
* Update docs/submodules/nfvbench from branch 'stable/euphrates' - NFVBENCH-30 check_traffic_time_sec not working as expected Change-Id: I7d82b6b3c95df0ad5e1b95cb35e8f84d00717a3a Signed-off-by: Kerim Gokarslan <kgokarsl@cisco.com>
2017-10-20Update git submodulesKerim Gokarslan1-0/+0
* Update docs/submodules/nfvbench from branch 'stable/euphrates' - NFVBENCH-31 Build container with the VM image in it Change-Id: Ia6870ee63b50e677e00c1f91649e7c590288b44d Signed-off-by: Kerim Gokarslan <kgokarsl@cisco.com>
2017-10-20Update git submodulesmortenhillbom1-0/+0
* Update docs/submodules/nfvbench from branch 'stable/euphrates' - NFVBENCH-29 Add a user-provided label option to the fluentd perf records Change-Id: Ic8bece88a3235130cb0322bff41a09035e7c6d9f Signed-off-by: mortenhillbom <mortenhillbom@gmail.com>
2017-10-20Update git submodulesKerim Gokarslan1-0/+0
* Update docs/submodules/nfvbench from branch 'stable/euphrates' - NFVBENCH-28 Set result values for NDR/PDR if they cannot be found within the given epsilon Change-Id: Id8019c7f052c2b189f3ab6e39377f65fe00d9fee Signed-off-by: Kerim Gokarslan <kgokarsl@cisco.com>
2017-10-20Update git submodulesKerim Gokarslan1-0/+0
* Update docs/submodules/nfvbench from branch 'stable/euphrates' - NFVBENCH-25 Send run results to fluentd Change-Id: I671a9297b90784bc30eee48ea9244a9c63a24e85 Signed-off-by: Kerim Gokarslan <kgokarsl@cisco.com>
2017-10-20Update git submodulesahothan1-0/+0
* Update docs/submodules/nfvbench from branch 'stable/euphrates' - Documentation update Change-Id: I5b96349d2eb2fc21a15dde6adbd72f7e84c737bf Signed-off-by: ahothan <ahothan@cisco.com>
2017-10-20Update git submodulesahothan1-0/+0
* Update docs/submodules/nfvbench from branch 'stable/euphrates' - Run tox at top level Change-Id: I3e72377554568020bd4730aaa4cfaf3294128a2e Signed-off-by: ahothan <ahothan@cisco.com>
2017-10-20Update git submodulesahothan1-0/+0
* Update docs/submodules/nfvbench from branch 'stable/euphrates' - StatsManager must clean up self when there is an exception in __init__ ALso remove unused connection.py Change-Id: I1bf688ade511f2054e9d67edf8938df1988e4cb2 Signed-off-by: ahothan <ahothan@cisco.com>
2017-10-20Update git submodulesKerim Gokarslan1-0/+0
* Update docs/submodules/nfvbench from branch 'stable/euphrates' - NFVBENCH-27 Search vm image under project folder Change-Id: I0d9c148e868fbcd665734eb92ac5c182693c3c67 Signed-off-by: Kerim Gokarslan <kgokarsl@cisco.com>
2017-10-20Update git submodulesMartin Klozik1-0/+0
* Update docs/submodules/vswitchperf from branch 'stable/euphrates' - conf: Fix default VPP configuration Number of VPP workers (aka PMD threads) was not specified explicitly in default configuration file. Configuration has been fixed to use the same cores as OVS with DPDK. Change-Id: Icd3e5d6f429435fbc1ff580891f4b182d1c48729 Signed-off-by: Martin Klozik <martinx.klozik@intel.com> Reviewed-by: Al Morton <acmorton@att.com> Reviewed-by: Christian Trautman <ctrautma@redhat.com> Reviewed-by: Sridhar Rao <sridhar.rao@spirent.com> Reviewed-by: Trevor Cooper <trevor.cooper@intel.com> (cherry picked from commit e1080a507901f7b957f24c75170594b4f9bc9740)
2017-10-20Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/promise from branch 'stable/euphrates' - Fix table formatting in api_mapping Change-Id: Ia76924629a450e51fc2a2bdbf7821a3c5f7a053e Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2017-10-20Update git submodulesCedric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'stable/euphrates' - Merge "Get the right git commit ids for ubuntu image" into stable/euphrates - Get the right git commit ids for ubuntu image Complement https://gerrit.opnfv.org/gerrit/#/c/45017 Change-Id: If52dee7c16dcc8606e72ebc198bc36e713792418 Signed-off-by: Linda Wang <wangwulin@huawei.com> (cherry picked from commit ae660ffa3285307edd41898cb2eaba22864d4f2d)
2017-10-20Update git submodulesJingLu51-0/+0
* Update docs/submodules/yardstick from branch 'stable/euphrates' - Docs: add yardstick gui descrption in userguide Change-Id: I09bc55e296d2c641f10819972ec0d48a289432b8 Signed-off-by: JingLu5 <lvjing5@huawei.com>
2017-10-20Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'stable/euphrates' - Take into account a feedback from the meeting Change-Id: Ia221d08003588aae045604a18ce1ecc833f0e34e Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-10-20Merge "Remove Accidentally added Power Consumption doc" into stable/euphratesAric Gardner1-305/+0
2017-10-20Update git submodulesXuan Jia1-0/+0
* Update docs/submodules/container4nfv from branch 'stable/euphrates' - Add scenario document Change-Id: I487c5510bef42f71b5deb3165d01af733adc2154 Signed-off-by: Xuan Jia <jason.jiaxuan@gmail.com>
2017-10-20Update git submodulesGuo Ruijing1-0/+0
* Update docs/submodules/container4nfv from branch 'stable/euphrates' - Add K8s Installation Guide Change-Id: I293a48d25b1a7674f0105ced4b4d30facbd50aec Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
2017-10-20Update git submodulesJingLu51-0/+0
* Update docs/submodules/yardstick from branch 'stable/euphrates' - Docs: update new test cases in release note Change-Id: Ie5ff6fe4f867ce68a33a3a857d8d051ba0020395 Signed-off-by: JingLu5 <lvjing5@huawei.com> (cherry picked from commit b463496e6515a42e29b814194d8b19ed2f639239)
2017-10-20Update git submodulesXuan Jia1-0/+0
* Update docs/submodules/container4nfv from branch 'stable/euphrates' - E release note Change-Id: I1b5ecaf5e79df6800fdf44be797dbdbee75631a7 Signed-off-by: Xuan Jia <jason.jiaxuan@gmail.com> (cherry picked from commit e5476e92b95b4cca079381ceac7e3a7b147c38a2)
2017-10-20Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'stable/euphrates' - DRAFT: update release notes for Euphrates Change-Id: I7e437612ca52b75b71e38962a84d0dcdb453d5dd Signed-off-by: Ross Brattain <ross.b.brattain@intel.com> (cherry picked from commit 540659ee051d8c5b570541e1e4e0b92fa8b0e2ec)
2017-10-20Update git submodulesJing Lu1-0/+0
* Update docs/submodules/yardstick from branch 'stable/euphrates' - Merge "Add missing RFC2544 Ethernet frame sizes" into stable/euphrates - Add missing RFC2544 Ethernet frame sizes RFC2544 tests should include the following frame sizes: 9.1 Frame sizes to be used on Ethernet 64, 128, 256, 512, 1024, 1280, 1518 Change-Id: I6ab9cccf2bb3b2678f50da157a9a49c0d9564cbd Signed-off-by: Dino Simeon Madarang <dinox.madarang@intel.com> Reviewed-by: Alain Jebara <alain.jebara@intel.com> Reviewed-by: Deepak S <deepak.s@linux.intel.com> Reviewed-by: Ross Brattain <ross.b.brattain@intel.com> Reviewed-by: Edward MacGillivray <edward.s.macgillivray@intel.com> (cherry picked from commit 7046a9139a60e0bc3e65f5dc6dcb8e6999528136)
2017-10-20Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'stable/euphrates' - nsb_installation: updates JIRA: YARDSTICK-500 Change-Id: I6eef884ef6262abe49fc13bc353ca14a72a5b648 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com> Signed-off-by: Martin Banszel <martinx.banszel@intel.com> Signed-off-by: Abhijit Sinha <abhijit.sinha@intel.com> Signed-off-by: Maciej Skrocki <maciej.skrocki@intel.com> (cherry picked from commit 97b961aee6653553c5a35ecee5cb766924cd10f1)
2017-10-19Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'stable/euphrates' - Merge "lib.sh: Fix locals override in nested invocations" into stable/euphrates - lib.sh: Fix locals override in nested invocations 'wait_for' bash function is nested in another 'wait_for' call in some places, which leads to inner calls interfering with outer calls by overriding the locally scoped variables, including the 'attempt' internal counter. In some cases, the outer 'wait_for' would exit after a single attempt. Fix that by running all contents of `wait_for` inside a subshell, which inherits outer calls variables, but does not override them when the inner call is finished. Change-Id: I450eda3d023af2380c61ee930071fbfc393a5645 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 2776ab9d850e764a92c30c858befc48e474f6dd4)
2017-10-19Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/armband from branch 'stable/euphrates' - u/fuel: Bump & rebase for VCP VM timeout increase Change-Id: I12f65038f2617fef4a5a12675a364ef113188b52 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 6ed719d4587fa9e0d0a9dc2c85b81ac2a5d7e6e6)
2017-10-19Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'stable/euphrates' - [vcp] Increase timeout till VCP VMs online Change-Id: I95c284cbf374194694360bffbeaf6770db6111bf Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 4b63bd0ea961d06723b277b874168c2aaddb96c5)
2017-10-19Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/armband from branch 'stable/euphrates' - u/fuel: Bump & rebase for nested wait_for fix Change-Id: I0bf36ade79626704788d4b42baf0dddb8e30a665 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 532cc0804053f2b138f23fa85e7f30c839b0b85a)
2017-10-19Remove Accidentally added Power Consumption docTrevor Bramwell1-305/+0
The canonical location is docs/testing/ecosystem/energy-monitoring.rst, and this appears to have been an ealier draft added on accident. Change-Id: I6829d09a5fb8e08b1e3335726b94e56029921714 Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2017-10-19Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'stable/euphrates' - Merge "[baremetal] PDF-based network config" into stable/euphrates - [baremetal] PDF-based network config This change extends current PDF/IDF support with: - dynamic interface / vlan definition; - dynamic interface and/or bridge allocation of installer networks on top of interfaces (physical or vlans); This allows us to drop hardcoded interface names and vlan / bridge configuration in favor of a runtime determined model based on PDF/IDF. For now, we duplicate common jinja variable definitions in each template, but this will later be moved to a common include file. JIRA: FUEL-275 Change-Id: Ia80a66dbdf898b0bd0a4fb99d069ce9ebe33fa65 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit c360b972649028d2613fc8561899c2c8b7f71832)
2017-10-19Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'stable/euphrates' - Merge "[baremetal] Remove infinite loops from node checks" into stable/euphrates - [baremetal] Remove infinite loops from node checks Change-Id: I7a21c30d49aecca948f45535fec164c2f643450e Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 9cfa3c11bbd71ce4ec24dba9dbd9a2289b76a4a3)
2017-10-19Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/apex from branch 'stable/euphrates' - Merge "Fix interface role mapping config for odl-fdio scenarios" into stable/euphrates - Fix interface role mapping config for odl-fdio scenarios This patch fixes a bug in deploy config function that will make performance parameters overwrite interface role mapping config for honeycomb. apex-os-net-config: Ifa3b18aa6370c79ad6ad3ce983f1648ff0d1d79d Change-Id: Icdb7603577bc7edf1959238ddd3d686c310544ce Signed-off-by: Feng Pan <fpan@redhat.com> (cherry picked from commit da99ee8cf99824a7ee5ff19544d3eec4788edd68)
2017-10-19Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/apex from branch 'stable/euphrates' - Merge "Adapt zrpcd to work for Carbon/Nitrogen" into stable/euphrates - Adapt zrpcd to work for Carbon/Nitrogen It updates the quagga tar.gz file which is used to install zrpcd/quagga. The new rpms are compiled with thrift-version 4 Zrpcd is installed as a process. Additional changes takwqe place adopting the installation and checking of zrpcd process Note that an extra patch is needed to update or remove the building procedure, which is present within the project but not used actually. JIRA: APEX-508 Change-Id: If6da075d2aafdb8c2ecfc599f595a7201490aa23 Signed-off-by: tomsou <soth@intracom-telecom.com> (cherry picked from commit 663db511c540fe94b4396146f76bbc40bd3fd852)
2017-10-19Update git submodulesTrevor Bramwell1-0/+0
* Update docs/submodules/apex from branch 'stable/euphrates' - Fix releasenotes label and include paths for docs Change-Id: I50a8f35165954b9b4bdf62864055ad475843c179 Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2017-10-19Update git submodulesMichael Polenchuk1-0/+0
* Update docs/submodules/fuel from branch 'stable/euphrates' - [virtual] Rise memory for ovs/dpdk scenario Let's add more hugepages/memory to the compute nodes since snaps_smoke required 2Gb flavor for tests. Change-Id: If52f30d53a6469abeca67aaf2bdee551542d1653 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com> (cherry picked from commit 496c818b28b6d668428b3e8996675a7edd688f73)
2017-10-19Update git submodulesSofia Wallin1-0/+0
* Update docs/submodules/joid from branch 'stable/euphrates' - Corrected reference for scenario doc Change-Id: I1459b0056bf0934d4c62d6840e070017690bc759 Signed-off-by: Sofia Wallin <sofia.wallin@ericsson.com> (cherry picked from commit 470472f807b118b235d7ff473a3e58bfaf8c293d)
2017-10-19Update git submodulesNarinder Gupta1-0/+0
* Update docs/submodules/joid from branch 'stable/euphrates' - Merge "Added documentation for os-nosdn-openbaton-ha scenario" into stable/euphrates - Added documentation for os-nosdn-openbaton-ha scenario Change-Id: I0d1fff751e824f109347ec032149160f684321a8 Signed-off-by: Giuseppe Carella <cargius@gmail.com> (cherry picked from commit 2d24f7bb7132322c572d0d46863cd32f5de2f007)
2017-10-19Update git submodulesNarinder Gupta1-0/+0
* Update docs/submodules/joid from branch 'stable/euphrates' - fixes for Ephertes release documents. Change-Id: I105bcb653495b0cfe377d5f8bc07a55ebe0c2e16 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com> (cherry picked from commit 363444982f6ff194b60fe9e57d09c8dfe0742f35)
2017-10-19Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'stable/euphrates' - NSB: fix trex config to use dpdk port number From some reason Heat/Neutron is now creating interfaces such that xe0 and xe1 are swapped. xe0 fa:16:3e:38:c7:66 0000:00:05.0 xe1 fa:16:3e:2f:f3:e2 0000:00:03.0 this causes the DPDK port numbering to be swapped. xe0 is DPDK port 1 because it has higher PCI address xe1 is DPDK port 0 because it has lower PCI address. The VNF is configured correctly because it uses DPDK port numbers, whereas TRex was using interface list ordering. Modify trex_cfg.yaml to use DPDK port ordering. This also requires running generate_cfg() after setup() in instantiate() +------------------------------------+-------------------+------------------------------+--------+ | Name | MAC Address | Fixed IP Addresses | Status | +------------------------------------+-------------------+------------------------------+--------+ | vnf_0.yardstick-af5ccb47-xe0-port | fa:16:3e:66:a5:e4 | ip_address='10.1.0.7', | ACTIVE | | vnf_0.yardstick-af5ccb47-mgmt-port | fa:16:3e:fa:98:fe | ip_address='10.0.1.10', | ACTIVE | | tg_0.yardstick-af5ccb47-xe1-port | fa:16:3e:2f:f3:e2 | ip_address='10.1.1.9', | ACTIVE | | vnf_0.yardstick-af5ccb47-xe1-port | fa:16:3e:f3:1d:f5 | ip_address='10.1.1.4', | ACTIVE | | | fa:16:3e:e3:8c:65 | ip_address='10.0.1.1', | ACTIVE | | | fa:16:3e:ff:d1:b7 | ip_address='11.191.14.110', | N/A | | tg_0.yardstick-af5ccb47-xe0-port | fa:16:3e:38:c7:66 | ip_address='10.1.0.8', | ACTIVE | | | fa:16:3e:ff:53:5f | ip_address='11.191.14.101', | DOWN | | | fa:16:3e:23:5d:2c | ip_address='10.0.1.2', | ACTIVE | | tg_0.yardstick-af5ccb47-mgmt-port | fa:16:3e:7a:df:4e | ip_address='10.0.1.5', | ACTIVE | | | fa:16:3e:22:65:36 | ip_address='11.191.14.109', | N/A | +------------------------------------+-------------------+------------------------------+--------+ /sys/devices/pci0000:00/0000:00:03.0/virtio0/net/ens3/address:fa:16:3e:2f:f3:e2 /sys/devices/pci0000:00/0000:00:05.0/virtio2/net/ens5/address:fa:16:3e:38:c7:66 Change-Id: Iaef2c7d9a5af7f45bd805a8ad6ee545ce0495cb1 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com> (cherry picked from commit 7ed018cddf88ac1c5a92f71fa5e421e66d259bc0)
2017-10-19Update git submodulesAbhijit Sinha1-0/+0
* Update docs/submodules/yardstick from branch 'stable/euphrates' - BugFix: Negative dropped packets in Prox tests Removed the abs function which can potentially mask negative dropped packets. Dropped packets in Prox workload VNF = max((tx_packets - rx_packets), 0) Change-Id: I510a351e899cdf9a1f366d632b9f0528b1d9dcce Signed-off-by: Abhijit Sinha <abhijit.sinha@intel.com> (cherry picked from commit a27278dacaa54ae60cd3bdfa6e6145643f76fa02)
2017-10-19Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/armband from branch 'stable/euphrates' - u/fuel: Bump & rebase for infinite loop removal Change-Id: Ia3d12bceae483571e1b1c91e2d0150c12b55b73b Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 05b5146d1bf7b02a72598bbd41e6b4817ab64456)
2017-10-19Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'stable/euphrates' - Merge "Adding sample trex example" into stable/euphrates - Adding sample trex example Change-Id: I3b79d33dba5cc559634122a135ff469f054214fc Signed-off-by: Deepak S <deepak.s@linux.intel.com> (cherry picked from commit 255a77da00dd047ee0c5ab1e849cf7e6ce75ecf6)
2017-10-19Update git submodulesshangxdy1-0/+0
* Update docs/submodules/parser from branch 'stable/euphrates' - Update notes for release E Update userguide and release-notes JIRA:PARSER-163 Change-Id: I3b15aa40afcb86a415997fc7e2471894bf3c9f06 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2017-10-19Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'stable/euphrates' - Merge "tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml updated" into stable/euphrates - tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml updated Change-Id: Ie9cee3e0567e771cbf11a9802bd33a420cc1ee7a Signed-off-by: Ross Brattain <ross.b.brattain@intel.com> (cherry picked from commit 041aeb7d3505e98af5b167a5ee05bb72c3c87a26)