Age | Commit message (Collapse) | Author | Files | Lines |
|
* Update docs/submodules/apex from branch 'master'
- Fixes relative import for utils
opnfv-pyutil was not working due to this relative import. The script
would only work out of the pwd.
Change-Id: I1ed5db779dd031d019012a814b2dfe27944a2e2f
Signed-off-by: Tim Rozet <trozet@redhat.com>
|
|
* Update docs/submodules/releng from branch 'master'
- Merge "Fix RabbitMQ service installation in Yardstick jobs"
- Fix RabbitMQ service installation in Yardstick jobs
RabbitMQ commands need to be executed as root user.
JIRA: YARDSTICK-1104
Change-Id: Ia6667cc3f7572f67a38fd4fd4bcf9fbb4309d36c
Signed-off-by: Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
|
|
* Update docs/submodules/releng-xci from branch 'master'
- xci: bifrost: Fix unbound variable error
If we are not in a virtual environment, then VIRTUAL_ENV is going
to be unset and we will fail with the following error:
./scripts/bifrost-provision.sh: line 105: VIRTUAL_ENV: unbound variable
As such, we need to provide a default value if that variable is unset.
We also fix a typo in the _sudo variable.
Change-Id: Ic018716c03ffba6e8e742e34720ea462b85341be
Signed-off-by: Markos Chandras <mchandras@suse.de>
|
|
* Update docs/submodules/releng from branch 'master'
- Merge "Apex: fix log uploading"
- Apex: fix log uploading
Logs were owned by root, so jenkins-ci could not upload them. Also
prints exact links for each file so it is easier to directly view logs
from jenkins output.
Change-Id: I919bf38c87561a696ae96683c56ad5f96c8d795e
Signed-off-by: Tim Rozet <trozet@redhat.com>
|
|
* Update docs/submodules/releng from branch 'master'
- jjb: xci: Fix functest exit code
There is not reason to grep the logs for failures because we can simply
preserve the functest exit code and use that to determine whether the
job passed or not.
Change-Id: I9f027960fd3d9d452d417b95e9dac66bbb314a47
Signed-off-by: Markos Chandras <mchandras@suse.de>
|
|
* Update docs/submodules/yardstick from branch 'master'
- Merge "Bugfix: k8 scenario fix"
- Bugfix: k8 scenario fix
JIRA: YARDSTICK-1109
Change-Id: Ic61a63099c3d2d4af5fa5634299e4b2946d53eaf
Signed-off-by: rexlee8776 <limingjiang@huawei.com>
|
|
* Update docs/submodules/releng from branch 'master'
- Merge "jjb: xci: xci-set-scenario: Allow automatic detection of generic scenarios"
- jjb: xci: xci-set-scenario: Allow automatic detection of generic scenarios
The list of supported scenarios is hardcoded and this makes it difficult
to test new scenarios. As such, lets determine the scenario and the
installer based on the actual files that have been changed on every
patchset.
Change-Id: I4868a1da08d58cd6ff37347a0c0bc5c5e28b15bb
Signed-off-by: Markos Chandras <mchandras@suse.de>
|
|
* Update docs/submodules/releng-xci from branch 'master'
- Merge "xci: kubespray: Fix failures to due task checks"
- xci: kubespray: Fix failures to due task checks
(this commit fixes many things because they all need to be submitted
together to unblock the jobs)
Commit 9e1d3d6e62abf5d0da26a296bcd235f37a54d9c6 ("xci: playbooks: Fixes
various ansible-lint warnings") broke public key authentication from
localhost to the OPNFV host because the localhost pubkey was not
appended in the authorized_keys file. The reason for that was that the
task was skipped due to the 'creates' parameter. This is now fixed, by
dropping the check since we always need to append the localhost pubkey.
This is only a temporary solution until we modify kubespray to use the
common file for managing the SSH keys.
This also makes the final 'kubectl' move to /usr/local/bin non-fatal
since future kubespray releases put it there already.
The same commit also broke the k8s-cluster.yml overrides. This is
because the file was never copied across due to the task conditional
being wrong. As such, we fix the conditional to check for the correct
file.
Change-Id: I9cfb29eba50c7fea9df29581ebb015163b8a9754
Signed-off-by: Markos Chandras <mchandras@suse.de>
|
|
* Update docs/submodules/releng-xci from branch 'master'
- Merge "xci: osa: Fix task status when bootstrapping OpenStack-Ansible"
- xci: osa: Fix task status when bootstrapping OpenStack-Ansible
The bootstrap script from the OpenStack-Ansible repository creates
several things in /opt/ansible-runtime and /usr/local/bin so we can
check if the final 'openstack-ansible' symlink exists in order to
report a proper status for that task and even skip if everything
is prepared already.
Change-Id: I4ca3a733746f8d757aa1156b533e4b4de90188e6
Signed-off-by: Markos Chandras <mchandras@suse.de>
|
|
* Update docs/submodules/releng-xci from branch 'master'
- Merge "xci: bifrost: Use 'sudo' to install dependencies for bifrost jobs"
- xci: bifrost: Use 'sudo' to install dependencies for bifrost jobs
When bifrost jobs are being executed, the virtual environment hasn't
been prepared yet because that's something that bifrost does later on.
As such, we need to use sudo to install the required dependencies to
avoid the following issue:
Exception:
Traceback (most recent call last):
File "/usr/lib/python2.7/site-packages/pip/basecommand.py", line 215, in main
status = self.run(options, args)
File "/usr/lib/python2.7/site-packages/pip/commands/install.py", line 342, in run
prefix=options.prefix_path,
File "/usr/lib/python2.7/site-packages/pip/req/req_set.py", line 784, in install
**kwargs
File "/usr/lib/python2.7/site-packages/pip/req/req_install.py", line 851, in install
self.move_wheel_files(self.source_dir, root=root, prefix=prefix)
File "/usr/lib/python2.7/site-packages/pip/req/req_install.py", line 1064, in move_wheel_files
isolated=self.isolated,
File "/usr/lib/python2.7/site-packages/pip/wheel.py", line 345, in move_wheel_files
clobber(source, lib_dir, True)
File "/usr/lib/python2.7/site-packages/pip/wheel.py", line 316, in clobber
ensure_dir(destdir)
File "/usr/lib/python2.7/site-packages/pip/utils/__init__.py", line 83, in ensure_dir
os.makedirs(path)
File "/usr/lib64/python2.7/os.py", line 157, in makedirs
mkdir(name, mode)
OSError: [Errno 13] Permission denied: '/usr/lib/python2.7/site-packages/pbr'
Change-Id: I081884ec18d27af19a053bf5b734f6f3846c60f1
Signed-off-by: Markos Chandras <mchandras@suse.de>
|
|
* Update docs/submodules/releng-xci from branch 'master'
- Merge changes from topic 'common-ssh-manage-tasks'
* changes:
xci: osa: Use Ansible modules to create ssl certificates
xci: osa: Move tasks for managing SSH keys to a new file
- xci: osa: Use Ansible modules to create ssl certificates
Ansible already provides modules to create ssl certificates so we can
use these instead of running the openssl commands directly. Moreover, we
can drop all the tasks which create the ssl directories since there are
being created by the openssl package which also creates the appropriate
symlinks. Finally, there is no need to generate the certificate on
localhost if only the OPNFV host consumes it, so move these steps to
the appropriate playbook.
Change-Id: I0045945c502013be3d76440876e894a44a092690
Signed-off-by: Markos Chandras <mchandras@suse.de>
- xci: osa: Move tasks for managing SSH keys to a new file
The tasks that manage the SSH keys are common across hosts and
also common across different installers. As such, lets move them
to a new file so we can share them more easily.
Change-Id: If235877394f224a47a2f2b8de748a2330eabcec1
Signed-off-by: Markos Chandras <mchandras@suse.de>
|
|
* Update docs/submodules/sdnvpn from branch 'master'
- Document updates for Fraser
Change-Id: I002848374caf28c0e6f4184bc9bd9e87b1918255
Signed-off-by: nikoskarandreas <nick@intracom-telecom.com>
Document updates for Fraser
Fixed wrong release date.
Removed a closed issue and a reference to it.
Change-Id: I002848374caf28c0e6f4184bc9bd9e87b1918255
Signed-off-by: nikoskarandreas <nick@intracom-telecom.com>
|
|
* Update docs/submodules/vswitchperf from branch 'master'
- Update Java to version 10 for SLE15
Newwer builds contain version 10 already.
For version 9, additional tweaks are needed.
Change-Id: Ic7d55a80ab48fb45113ee0f1ab9aaa797298b87f
Signed-off-by: Jose Lausuch <jalausuch@suse.com>
|
|
* Update docs/submodules/samplevnf from branch 'master'
- Merge "Added missing file: rapidVMs.vms"
- Added missing file: rapidVMs.vms
This file describes flavors, flavor meta data and boot info.
All this info can be defined in the [Default] section and will then be
used by to create all VMs. This data can also be specified in individual
VM sections to overule the deault values per VM.
Change-Id: I9d59208360eacec2790e5c467d7afcbeba301251
Signed-off-by: Luc Provoost <luc.provoost@intel.com>
|
|
* Update docs/submodules/samplevnf from branch 'master'
- Merge "Add support for multiple GEN tasks running on the same core"
- Add support for multiple GEN tasks running on the same core
resolve memory allocation issue
Change-Id: I90bbf711a6a7a4869e5024c061470d9779839a60
Signed-off-by: Igor Shaula <igor.shaula@intel.com>
|
|
* Update docs/submodules/samplevnf from branch 'master'
- Merge "Add support for crypto on multiple cores"
- Add support for crypto on multiple cores
* Experimental, for dpdk-stable-17.05.2
* New improved ESP decapsulation function
Change-Id: If4862dacb3fcf53e21eb5932a195664f80c7c192
Signed-off-by: Igor Shaula <igor.shaula@intel.com>
|
|
* Update docs/submodules/releng from branch 'master'
- Merge "Fraser jobs for securedlab verification"
- Fraser jobs for securedlab verification
Change-Id: I99c3b9413fcdc103fec246ff6c8c4f2951878000
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
|
|
* Update docs/submodules/clover from branch 'master'
- Add existing public redis pod/service
- Use a community yaml for redis in k8s as simple data store
- Redis can be used for tracing and also by the snort-ids
to store alerts that can be processed by other services
- If flannel is used, the redis CLI can be accessed on the
host OS with redis-cli -h <flannel ip>
- Within the k8s cluster, the redis service can be accessed with
DNS using name 'redis'
- The same yaml for redis is also included in toplevel manifest for SDC
scenario. Included here if intention is to use separately (tracing
only)
Change-Id: Ibad283a4cc8938fe01f5de6b7743bdb5511be3af
Signed-off-by: Eddie Arrage <eddie.arrage@huawei.com>
|
|
* Update docs/submodules/clover from branch 'master'
- Merge "Fix Nginx lb in k8s/istio"
- Fix Nginx lb in k8s/istio
- Provide workaround to make nginx lb work properly
- nginx_client sample can modify default load balancing
from three to two servers at runtime
- Ensure port 9180 is used for default deploy for lb and
servers
- Modify render_yaml to specify deploy_name so that
clover-server1, 2, 3 can be used for default lb config
- Ensure proxy template is aligned to lb to allow the
source IP from originating host to be propagated to final
destination
- Fix default nginx proxy server_name to 'proxy-access-control'
and change default proxy destination to 'http-lb'
- Split lb service_type to 'lbv1' and 'lbv2' to provide an example
of how to modify the run-time configuration of the load balancer
after deployment - modify http-lb-v2 to use clover-server4/5 instead
of the defualt clover-server1/2/3 - modify http-lb-v1 to use
clover-server1/2 instead of 1/2/3
- Aligned pod IP retrival method with nginx_client.py
Change-Id: I73fa60a69c93ae1e82a477ef6283c00f67a21360
Signed-off-by: Eddie Arrage <eddie.arrage@huawei.com>
|
|
* Update docs/submodules/daisy from branch 'master'
- Merge "re-point to upstream stable/queens"
- re-point to upstream stable/queens
Change-Id: Iee938b95b15a2780f04c118f0bf42e1aeb5cc9ec
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
|
|
* Update docs/submodules/releng from branch 'master'
- Merge "Create daily Fraser jobs"
- Create daily Fraser jobs
It doesn't assign any Fraser job to (virtual) pods.
It also stops checking deployement what is duplicating healthcheck.
Change-Id: Ia370380e20b833d03f09b2098478a8930e4f8dc0
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
|
|
* Update docs/submodules/releng from branch 'master'
- Merge changes from topics 'storperf-docker-fraser-jobs', 'docker-arm-fraser'
* changes:
Create Fraser Docker Jobs for Storperf
Add Fraser stream to Docker Arm Builds
- Create Fraser Docker Jobs for Storperf
Change-Id: I5de7df11919f725264aa6b07d0f8d5e917f8a28c
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
- Add Fraser stream to Docker Arm Builds
This will allow changes to docker in stable/fraser branches to be built,
when added to the associated project repository.
Change-Id: Ib5d295f2845e519f4a5a65738e8af1a357f77c5e
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
|
|
* Update docs/submodules/releng from branch 'master'
- Apex: Fix conditions for multijob
condition actually affects *next* phase execution and not conditional on
previous phase. This change fixes the condition so that fetch logs
always runs.
Change-Id: I50c3f9f9412682ea591c47116d406b5ed81ee2b5
Signed-off-by: Tim Rozet <trozet@redhat.com>
|
|
* Update docs/submodules/armband from branch 'master'
- Merge "Revert "[p/openstack.nova] Allow creation of pty on aarch64""
- Revert "[p/openstack.nova] Allow creation of pty on aarch64"
This reverts commit 075143e95d5b42d615ab7c81446095746e1f0064.
Change-Id: I720d47dd5c69077363501e642730df9db1dcef81
|
|
* Update docs/submodules/releng from branch 'master'
- Merge "[storperf] Fix stable/fraser branch name"
- [storperf] Fix stable/fraser branch name
Missed changing the branch name when copying over the release file.
Change-Id: I25105253911f19dbfa621b29c2a812df4a8af01d
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
|
|
* Update docs/submodules/releng from branch 'master'
- Merge "Switch Functest k8s docker builds to multijobs"
- Switch Functest k8s docker builds to multijobs
The former Functest kubernetes container will be split due to new
OPNFV features (clover, stor4vnf).
{image} is bypassed to first check vs the current docker repository.
Change-Id: I29998b21ec6992463b9ca77b38e51b928a9da69a
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
|
|
* Update docs/submodules/storperf from branch 'master'
- Fixing daily job
Use Ubuntu 16.04 instead as it is LTS and not subject to change
Enhance error reporting on stack creation failure
Change-Id: Ie187ae44ce66564da9779733a418fc8bb4e1c320
JIRA: STORPERF-240
Signed-off-by: mbeierl <mark.beierl@dell.com>
|
|
* Update docs/submodules/releng from branch 'master'
- Merge "Install RabbitMQ service in Yardstick functional tests"
- Install RabbitMQ service in Yardstick functional tests
Install and configure RabbitMQ service for Yardstick functional
(Python 2.7 and Python 3) tests.
JIRA: YARDSTICK-1104
Change-Id: I6b287def05c75dc67ab21727f72d4c384f8e2837
Signed-off-by: Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
|
|
* Update docs/submodules/releng from branch 'master'
- Apex: add missing fetch-logs to jobs list
Change-Id: I28e4b613d92c43d32e95f8e1b4f4a4e2db102bc5
Signed-off-by: Tim Rozet <trozet@redhat.com>
|
|
* Update docs/submodules/releng from branch 'master'
- Merge "Update Tox JJB Command"
- Update Tox JJB Command
This allows using the command to only test one project's changes. For
example:
tox -e jjb -- jjb/releng
Will only test jobs under 'jjb/releng'. If jobs have dependencies, of
multiple project jobs need to be tested, they can be included using the
jjb ':' syntax, as anything after '--' is passed directly to jjb:
tox -e jjb -- jjb/doctor:jjb/functest
Change-Id: I4b71803a1d6ed4f62d50cdca87183a68b20fae5a
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
|
|
* Update docs/submodules/releng from branch 'master'
- Merge "Create Stable Branch Jobs for snaps"
- Create Stable Branch Jobs for snaps
Change-Id: Id06a66a53d2db7f76e87634adfa2b71ce517a0eb
Signed-off-by: jenkins-ci <jenkins-opnfv-ci@opnfv.org>
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
|
|
* Update docs/submodules/releng from branch 'master'
- Merge "Create Stable Branch Jobs for clover"
- Create Stable Branch Jobs for clover
Change-Id: I415fa86566686089069eaf6b4b946b9736ab7690
Signed-off-by: jenkins-ci <jenkins-opnfv-ci@opnfv.org>
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
|
|
* Update docs/submodules/armband from branch 'master'
- Merge "[p/openstack.nova] Allow creation of pty on aarch64"
- [p/openstack.nova] Allow creation of pty on aarch64
Armband uses openstack packages from Ubuntu. Those packages
are configured to work with other packages from UCA repos. Since
ARMband uses newer versions of certain packages than those in UCA
(libvirt) we can allow different config without breaking anything.
JIRA: ARMBAND-352
Change-Id: I8f8947c3fca3b5239edb5089d3b54d0d159b4dc8
Signed-off-by: Charalampos Kominos <charalampos.kominos@enea.com>
|
|
* Update docs/submodules/functest from branch 'master'
- Remove domino and promise from upper-constraints
This projects have been inactive and should not be part of the next
releases.
Change-Id: I653c328aed0a4d3fe0bdb47be034bbccb9a16dcd
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
|
|
* Update docs/submodules/releng from branch 'master'
- Merge "Create Stable Branch Jobs for ovn4nfv"
- Create Stable Branch Jobs for ovn4nfv
Change-Id: I10757e5e8ea26e9d9ae98dd8b0d3be5923b8472b
Signed-off-by: jenkins-ci <jenkins-opnfv-ci@opnfv.org>
|
|
* Update docs/submodules/releng from branch 'master'
- Merge "Create Stable Branch Jobs for doctor"
- Create Stable Branch Jobs for doctor
Change-Id: I5705b961d4b6871325a071c6287650cc195f5fe6
Signed-off-by: jenkins-ci <jenkins-opnfv-ci@opnfv.org>
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
|
|
* Update docs/submodules/releng from branch 'master'
- Merge "Create Stable Branch Jobs for sfc"
- Create Stable Branch Jobs for sfc
Change-Id: I52fbde3ba6b354435ce437103f378fc21d96b350
Signed-off-by: jenkins-ci <jenkins-opnfv-ci@opnfv.org>
|
|
* Update docs/submodules/releng from branch 'master'
- Merge "[ovno] Create stable/fraser branch"
- [ovno] Create stable/fraser branch
Creating the stable branch for ovno at the request of the release
manager.
Change-Id: Ie9d4b0911d44ba72bcff61bac4cb5356eeab625a
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
|
|
* Update docs/submodules/releng from branch 'master'
- Merge "Apex: Enable overcloud log collection"
- Apex: Enable overcloud log collection
With this commit:
https://gerrit.opnfv.org/gerrit/#/c/47875/
We can now gather logs from after at the end of a deploy/test job and
upload them to artifacts. This patch enables that behavior on verify
and daily jobs.
Change-Id: If7af4cf1363e4bbcee78d98850af7c0e20250f3f
Signed-off-by: Tim Rozet <trozet@redhat.com>
|
|
* Update docs/submodules/apex from branch 'master'
- Fixes log location for pyutils
Change-Id: I03cda65f58753fc5d55ea4ede78f7d5bd8b7bdce
Signed-off-by: Tim Rozet <trozet@redhat.com>
|
|
* Update docs/submodules/releng from branch 'master'
- Apex: Fix slave used by unit test
We were using 'stream' as part of the slave label to run unit tests on.
However, we typically just use master label for everything to avoid
having to update labels on slaves. Changing the unit test to follow the
same method.
Change-Id: I6a182c3f28d541109c8a9d94ea1dae2a80f2b835
Signed-off-by: Tim Rozet <trozet@redhat.com>
|
|
* Update docs/submodules/releng from branch 'master'
- Merge "Create Stable Branch Jobs for pharos"
- Create Stable Branch Jobs for pharos
Change-Id: I4d768151505cf5310564fb51c250b87abb2519c8
Signed-off-by: jenkins-ci <jenkins-opnfv-ci@opnfv.org>
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
|
|
* Update docs/submodules/apex from branch 'master'
- Adds the ability to fetch logs from deployment
Usage:
opnfv-pyutil --fetch-logs
python3 utils.py --fetch-logs --lib-dir ../lib
Eventually all utils.sh functions will be migrated here.
Note there is no support here for containers. Will be
added later.
Change-Id: I223b8592ad09e0370e287ee2801072db31f9aa12
Signed-off-by: Tim Rozet <trozet@redhat.com>
|
|
* Update docs/submodules/releng-xci from branch 'master'
- Merge "Correct mail address of Manuel Buil"
- Correct mail address of Manuel Buil
Change-Id: Id448a38567975185b399ab54a34b39edf148a0ac
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
|
|
* Update docs/submodules/clover from branch 'master'
- Merge "Added toplevel manifests for SDC sample scenario"
- Added toplevel manifests for SDC sample scenario
- Added missing k8s manifest yaml files for overall service delivery
controller scenario - cannot be deployed coherently without this manifest
- One file for private docker registry and one for opnfv
public registry
- Outlined in JIRA ticket CLOVER-16 and validated per
description
- Includes ingress rule, community redis pod/service and deployments
for http-lb (v1/v2), snort-ids, proxy-access-controller,
and clover-server1-5
- All above pod/deployment naming matches default container
configuration
- Tested with istio manual injection
Change-Id: Ia03782b38020d744ab00c99adbf4832d15bbd9f3
Signed-off-by: Eddie Arrage <eddie.arrage@huawei.com>
|
|
* Update docs/submodules/clover from branch 'master'
- Merge "Aligned snort-ids default config for SDC scenario"
- Aligned snort-ids default config for SDC scenario
- Modified snort-ids alert process to use k8s DNS name
'proxy-access-control' to align with SDC scenario naming
- Added default port 50054 to the manifest yaml template and
rendering script for communication with proxy-access-control
Change-Id: Ib04ee75e5d8ea9921b16b3b4469bed87b1cd2018
Signed-off-by: Eddie Arrage <eddie.arrage@huawei.com>
|
|
* Update docs/submodules/clover from branch 'master'
- Merge "Move design document to dedicated folder"
- Move design document to dedicated folder
Change-Id: I20c85b7116cd2b29d0efcaae5ee0b0381a685bbb
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
|
|
* Update docs/submodules/armband from branch 'master'
- u/fuel: Bump for Armband Pharos IDF changes
Bring in arm-pod5 hugepage configuration et al.
Change-Id: I98843c080ba2da7dc66ad3b22a8035d80e1975e2
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
* Update docs/submodules/fuel from branch 'master'
- [submodule] Bump Pharos for Armband IDF changes
Bring in arm-pod5 hugepage configuration et al.
Change-Id: If8a2f9cd84b400c5a8a58fe477f8ef7a12c42bf8
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
* Update docs/submodules/nfvbench from branch 'master'
- Move Docker build to tag 1.3.1
Change-Id: Ida8e9223300add358cfb5ed085274131da16934e
Signed-off-by: ahothan <ahothan@cisco.com>
|