Age | Commit message (Collapse) | Author | Files | Lines |
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to 9d188efd67fe81b7e9b190afd8858eb042b813ac
- Merge "DG enhancement for El Alto"
- DG enhancement for El Alto
enhance unresolved-composite-data to include additional format
Issue-ID: SDNC-771
Signed-off-by: Cheung, Pat (kc1472) <kc1472@att.com>
Change-Id: Ie7149215489ad81183003e9323d7818e6ed33fd1
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to 4a1c826efda07f3bb20f1531ca97c7a4726f4d96
- Fix for sdnc aai relationship
Fix for sdnc aai relationship for generic vnf resource and service instance.
Issue-ID: SDNC-780
Signed-off-by: prakash.e <prakash.e@huawei.com>
Change-Id: I5db4e0a7f243a1be15e95221250e6e84e91e5509
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to b0aa3b3bcc3c269bbc62a2e9690830a959e37e59
- Merge "Fix SDNC parameters save in AAI failure"
- Fix SDNC parameters save in AAI failure
1. SDNC is fixed by passing proper UUID and version ID.
2. SDNC is fixed by removing validations for vnf
resource creation DG
3. Fixed sdwan-wan-port-static.json template by passing generated wan-portId
Issue-ID: SDNC-773
Signed-off-by: prakash.e <prakash.e@huawei.com>
Change-Id: I0021983f0721dde6592d86bef602b8b4641215a3
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to 6290f3775cdf1aa1eb2fc34f04cec10a8b1358a6
- Merge "correct vf-module-label in self-serve-vfmodule-ra-assign DG"
- correct vf-module-label in self-serve-vfmodule-ra-assign DG
Issue-ID: SDNC-777
Signed-off-by: Abdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com>
Change-Id: I9abd2ec5d49a62d7a8fd158df60cb187f14166e6
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to ce259eb94d8195d126a2faec4c9b03fdab5529fd
- Merge "Fix bug associated with DMAAP listener properties"
- Fix bug associated with DMAAP listener properties
Update to dmaap-listener and dmaap-consumer-oofpcipoc properties
files to support a single SDNR-CL consumer and configuration in
K8s cluster
Issue-ID: SDNC-772
Signed-off-by: SandeepLinux <sandeep.shah2@techmahindra.com>
Change-Id: I28cf4884fd7197ada0685e5db40a0f9284e1aee9
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to d62222b32cb04696dd11917f893397a01c3ba49f
- Bug fix to change leaf-list in yang
Yang change for DG
Change-Id: I2dd6afebfcc213fcc47992c328422ff32dd76fe2
Issue-ID: CCSDK-1344
Signed-off-by: janani <janani.b@huawei.com>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to fb2f48179f8532e52687ddf1051d1344c8d0f2df
- Merge "SDNC-766: Refactoring of installCerts.py"
- SDNC-766: Refactoring of installCerts.py
Refactoring the script based on comments made
on code in SDNC-759.
Issue-ID: SDNC-766
Change-Id: Id6d3d8b265b61b6437a029e5cf74d685a2cf8c37
Signed-off-by: DarraghEgan <darragh.egan@est.tech>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to bd8f3c044a690772dc1855a0b8f678d9b56f5142
- Bug fix to add restconf api node in DG
Restconf api node in DG
Change-Id: I5bcd79073a442cc8ca532f3c2a1560f2867803c4
Issue-ID: CCSDK-1344
Signed-off-by: janani <janani.b@huawei.com>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to e151fc707c1426e2c8563726a8b396de0e0b65c9
- Fixed SDWAN bandwidth change issue
1. update svc-action not handle in vf-module-topology-operation DG
causing bandwidth change failure.
2.sdwan-bandwidth-policy-change node link to get ESR missing so could not get controller IP
3.Update code to send request based on IPMode
Change-Id: I837f98c9199ddb34644e8c5af1679598ac123fc4
Issue-ID: SDNC-767
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to af5850291ca51e7714aecefec50783778b4fb256
- SDNR Add sdnr feature to SDNC
Add sdnr wt dependency to pom and Dockerfiles
Change-Id: Id6338b57e62e7c543ebd0b94d9cba90172caeab5
Issue-ID: SDNC-741
Signed-off-by: Herbert Eiselt <herbert.eiselt@highstreet-technologies.com>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to 6951dc59889a812cdeb7382b40ff858f0d999f01
- Add missing table
Add missing table SERVICE_MODEL_TO_VF_MODEL_MAPPING needed by
ueb-listener
Change-Id: Iefe0c16ad9f0e9c641f3fb9354464ae920e78838
Issue-ID: SDNC-756
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to 186befdfa74d04794b27cbb3d73d8beb18d17c0d
- SDNC-762: Documentation for SDNC keys installation
Creating documentation to explain the steps
needed for the installation of keys and
certificates in ODL for SDNC.
Issue-ID: SDNC-762
Change-Id: I2635027b7afbc4bcee4631989ec79e4feb1b8b51
Signed-off-by: DarraghEgan <darragh.egan@est.tech>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to 371ee58ccabb526a45ebfbd0acebb4b76ac888f4
- SDNC-759: Update installScript.py
Bug Fix:
In installScript.py public keys were restricting
the xNF cert setup.
Script updated so that public keys for each
xNF are not required.
Issue-ID: SDNC-759
Change-Id: I975be1f73a9b95d6d7620e61ff43b7f1af5b5b6c
Signed-off-by: DarraghEgan <darragh.egan@est.tech>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to 22b464b4470f0b29359672ccd79731d5acf15ed3
- Merge "Fix SDWAN restapi templates"
- Fix SDWAN restapi templates
SDWAN controller requests is updated with
correct parameters and values
Change-Id: I36f3309b93a9255a5d94ac060c50f8c3256b1f37
Issue-ID: SDNC-659
Signed-off-by: Prakash.E <prakash.e@huawei.com>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to fc05622ced5e65929ed30b82212630fb9998a9d7
- Update ip pool name to be more generic
So both vFW and vDNS use cases can re-use the same ip pool
Change-Id: I0bc2fd317774bfe8aae04df1fc021c9fc585f186
Issue-ID: SDNC-761
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to b6e11902726194faa49a08c563e4cb17058dabc6
- Merge "Add missing SDN-R jar files"
- Add missing SDN-R jar files
Add missing SDN-R jar files to ODL repository
Change-Id: I01eafa3fb5ba71b7007446045063413e58d4dcb6
Issue-ID: SDNC-760
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to 40a0901a6cd4c668a7c63effe69415b5e6b179a7
- Merge "Fix missing payload for DGs and Playbooks of SW upgrade"
- Fix missing payload for DGs and Playbooks of SW upgrade
Change-Id: I89a118ef1e05c76800d6c2fa640dc3dcf2d78fca
Issue-ID: SDNC-733
Signed-off-by: Enbo Wang <wangenbo@huawei.com>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to f316d2dd36e9a95c4520bd03498134c8654b888f
- Merge "Revert deleted payload in SW upgrade DGs"
- Revert deleted payload in SW upgrade DGs
Change-Id: Ic951cea8aa91c2c311ccab731eac1f579dccff00
Issue-ID: SDNC-746
Signed-off-by: Enbo Wang <wangenbo@huawei.com>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to b4f2903673c98cb12c99760c08a072340bfcfc08
- Fix SDWAN DG activate in SDNC startup
1. SDWAN newly add vf-module-topology-operation DGs
are added in graph.versions to activate during
SDNC startup
2. Fixed SDWAN site and wan-port delete DGs by
calling right DG to get parameters.
Change-Id: I34fa321e325d92b2a471bc9cd8ae499990ae37b8
Issue-ID: SDNC-659
Signed-off-by: Prakash.E <prakash.e@huawei.com>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to 14a144870accfaf046e2b874cd6f519ecf6a7ae9
- update AAF certs
Add new files to renew AAF certs till 4-26 -2020
Change-Id: I6b34275276a39667fe5de0d6e6fac19726f6ff7e
Issue-ID: SDNC-755
Signed-off-by: Agarwal, Ruchira (ra1926) <ra1926@att.com>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to 9f62df35ffaf2fd82238fe23bc74dae3564354a5
- SDNR OOF PCI Feature in SDNC Docker
Inclusion of SDNR OOF PCI POC feature in SDNC dockerfile
Change-Id: Icbbbcfc759c1c15f93be2b284d000777445178fb
Issue-ID: SDNC-748
Signed-off-by: SandeepLinux <sandeep.shah2@techmahindra.com>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to 5431ff62543b099c6f3495454503bba06f03dfad
- Fix set nodelist in SW upgrade DGs
Change-Id: Ia789fcb16700f7c49f187b970daa114f8ae0eaf5
Issue-ID: SDNC-746
Signed-off-by: Marco Platania <platania@research.att.com>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to 08d1ca8e484cab832ce1f54cc36539888d77b08a
- Fix SDWAN peer wise integration testing issues
SDWAN lan-port-config create,activate DGs are
fixed with valid request-action and updated
service-data with response-id returned from
SDWAN controller
Change-Id: Ib4067d4de257c64f81b4e70584bcf26c87bbaa04
Issue-ID: SDNC-659
Signed-off-by: Prakash.E <prakash.e@huawei.com>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to ee72118f757731a3bc4f674705f00dfb49502e2a
- Fix SDWAN lan-port deactivate DG with url change
SDWAN lan-portdeactivate DG is fixed with correct urls
for device-port-delete, lan-port-delete and
bride-domain-delete
Change-Id: I160f219f40e67cbc153e05084a0c851b40672dae
Issue-ID: SDNC-659
Signed-off-by: Prakash.E <prakash.e@huawei.com>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to a132dd2269b619a0ecb436969f2ecc51149dfa36
- Fix SDWAN lan-port-config request action issue
Fixed SDWAN lan-port-config-delete DG with correct
request-action DeleteSDWANLanPortInstance
Change-Id: Icb03e923e3615c130945b7872b5836fd3650e3f4
Issue-ID: SDNC-659
Signed-off-by: Prakash.E <prakash.e@huawei.com>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to 368082124703aeaa828d4d49ae7ff3321b33f6e0
- Fixed SDWAN lan-port-config resource templates
Updated lan-port-config delete templates which is
used in lan-port-config-deactivate DG to delete the
entry in controller
Change-Id: I1e8c6bc16079cd14d6861ee744b9e335aaa1efea
Issue-ID: SDNC-659
Signed-off-by: Prakash.E <prakash.e@huawei.com>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to 813277f3100e05ae7580b0cd8712ee97eec7e99c
- Fixed lan-port-deactivate by passing bridgeDomainId
Added bridgeDomainId parameter in lan-port-param DG
to pass it in bridgeDomain delete request to controller
Change-Id: Ifef40161756256ec57cde1ee1fbf8779edec81fe
Issue-ID: SDNC-659
Signed-off-by: Prakash.E <prakash.e@huawei.com>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to c4a473250721d08c9eef5170800efa2932bee15c
- Fix SDWAN lan-port-delete DG by passing valid index
SDWAN lan-port-config-delete DG, vf-module-id is passed
with correct vnf-index.
Change-Id: I23e4cb60fcf8c6db5c383fbaf63ddc9123f3210a
Issue-ID: SDNC-659
Signed-off-by: Prakash.E <prakash.e@huawei.com>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to 1b1345b80a0dfbc6ea3cf2da221816b9ea0e0d2a
- Merge "fixed WAN port deactivate issue"
- fixed WAN port deactivate issue
On delete of WAN port controller returned 500
error code, this issue fixed
Change-Id: Iebcd3b44b830bd067f6858230e339b6338964773
Issue-ID: SDNC-653
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to d902998d6dfe7f6141c7d6c6dde86e4e43a07afa
- Merge "Replace access_id with remote_id"
- Replace access_id with remote_id
Replace all the occurences of access_id with remote_id in the DGs
Issue-ID: SDNC-738
Change-Id: I13073f30b9238f566a6df22cdd0d15e7393af5e7
Signed-off-by: Salichos Michail, INI-INO-ECO-HCT <michail.salichos@gmail.com>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to 68885623b91e7e4745b53df2393c53b37b00c6bb
- Merge "Fix SDWAN lan-portId set in service-data"
- Fix SDWAN lan-portId set in service-data
SDWAN lan-portId value is copied and set it to
prop.lan.lanPortId.
Change-Id: Id01d0f1b22073d273f38b50d62817129e1bfd7ee
Issue-ID: SDNC-659
Signed-off-by: Prakash.E <prakash.e@huawei.com>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to 8e41096b20a56f91be8df5f5ff200f76e9d7d4c3
- Roll to El Alto version
Roll to El Alto version (1.6.0-SNAPSHOT) on master branch
Change-Id: I5809a3ba7bd629d16fb679235d0e8a9173fb993a
Issue-ID: SDNC-735
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to 7b30b7a2becb47823067526bd8c84af9155ac7a2
- Merge "Update to use released 1.2.2 parent"
- Update to use released 1.2.2 parent
Update to use released 1.2.2 version of parent poms.
Change-Id: If00344c371389515a7f74b8972ae60ebeb0d7253
Issue-ID: SDNC-735
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to 5377ee40ada510053ed0beeba9410de6600a6ae2
- Merge "fixed WAN port create issue"
- fixed WAN port create issue
Invalid parameter is used to set context memory
for ip address
Change-Id: I71e33d7d27526fd95a12afc08a669dbeb8768f32
Issue-ID: SDNC-653
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to 83413b8058da81bd163b1c4270f4851cbbde0161
- Fix SDWAN lan-port-config ip-subnets creation
SDWAN lan-port ip-subnets creation called after
attaching site to VPN to resolve invalid-vpn
error from controller
Change-Id: Iec9d8a1945e3ddd992aa33e5f96b1ab9ce1dfd88
Issue-ID: SDNC-659
Signed-off-by: Prakash.E <prakash.e@huawei.com>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to 570153b334e64246b2eff459d18d6eac6df70e22
- Fix SDWAN site role passed to controller
SDWAN site role dsvpn-hub and sdwan-edge is not fetched
and passed to controller. Now it is fetched in for loop
and passed to controller.
Change-Id: I85b7be5bdc802fa7144631aeaf3cf19bc3fde979
Issue-ID: SDNC-659
Signed-off-by: Prakash.E <prakash.e@huawei.com>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to 8e1a5cefb9b8892854aa11dbf48174adc259835f
- Merge "Fixed vf-module-topology DG with valid request-action"
- Fixed vf-module-topology DG with valid request-action
New request-actions added in GENERIC-RESOURCE-API.yang.
CreateSDWANSiteInstance, ActivateSDWANSiteInstance,
DeactivateSDWANSiteInstance, DeleteSDWANSiteInstance are
added and it is replaced in vf-module-topology DG
Change-Id: I0898056cb43763ff04eda0e503bc05706b283f3d
Issue-ID: SDNC-659
Signed-off-by: Prakash.E <prakash.e@huawei.com>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to 3911362969fc1d329cb9fbc07b414be70820a780
- Merge "SDWAN port templates"
- SDWAN port templates
SDWAN port templates added based on the
IPMode static or dhcp
Change-Id: Ib6d9e2dd13d92d49a1323525646c01bf795346c1
Issue-ID: SDNC-653
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to 797f2333a91eb3de6fdbc8260e02f39e6b99e802
- Merge "Fixed SDWAN lan-port-activate DG with correct AAI resource"
- Fixed SDWAN lan-port-activate DG with correct AAI resource
SDWAN lan-port-activate DG is updated with correct AAI
resource name lan-port-config. Earlier resource name
sdwan-vpn is used
Change-Id: I2ed2d4da0415a57b4cbb02f13a557f5da93ba80b
Issue-ID: SDNC-659
Signed-off-by: Prakash.E <prakash.e@huawei.com>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to 635497eccd5158a70e310f789a21c68d9150d813
- Merge "SDWAN vpn-site-res delete DG duplicate removal"
- SDWAN vpn-site-res delete DG duplicate removal
In SDWAN vip-site-resource-delete DG, Duplicat
validation of vnf-id is deleted where requiredParameters
method is called for validation and again validating
for NULL check with the same input.
Change-Id: Ic28da8a0d4f03203d0535ac7fa696b725011242f
Issue-ID: SDNC-659
Signed-off-by: Prakash.E <prakash.e@huawei.com>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to c5233c49f31447379f0a2a1f6f1033dfcf1a711e
- Merge "SDWAN vpn-site-resource DG- failure cases handled"
- SDWAN vpn-site-resource DG- failure cases handled
To activate vnf-resource, order status should be Created.
Fixed by Adding validity check with order-status is Created.
Change-Id: I489ac4bad2af05d8b34922a70c49ed970e934370
Issue-ID: SDNC-659
Signed-off-by: Prakash.E <prakash.e@huawei.com>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to 0e0b0eb721cdf7c2740120ebfb6baee6effeb97a
- Merge "SDWAN site-resource to generic-vnf relationship failed"
- SDWAN site-resource to generic-vnf relationship failed
Change-Id: I500b260710c0c869d1e2c0cd3a4d17e532250f70
Issue-ID: SDNC-653
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to 4067c21aafd96649d687c7a1dc3d0215710e61df
- SDWAN vpn-site-resource DG parameter change
1. parameter name vnf-index changed to vnf-id to set
id returned from generateUUID.
2. Deleted commented lines in service relationship in AAI
Change-Id: I5aaac2e15ff2ea2bc1c590d8c6c4818d8f84d047
Issue-ID: SDNC-659
Signed-off-by: Prakash.E <prakash.e@huawei.com>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to c1b7f1400023567a2e138282592aaebd389738bc
- Merge "SDWAN WAN port create exception issue fix"
- SDWAN WAN port create exception issue fix
1.Generated vf module id not updated in service data
2.site-resource vnf relation-ship should be with wan-port-config
and not with sdwan-vpn
Change-Id: Ie5c153eb35799d93719b277492f43a5f3723e93d
Issue-ID: SDNC-653
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to 8d490414104502047c1742c41c4d956407642bf9
- Merge "SDWAN wan port activate DG"
- SDWAN wan port activate DG
Fixed couple of issues
1.paramters update for static and dhcp scenarios
2.invalid key parameter used while updating to AAI
3.Removed unused and hardcoded nodes.
Change-Id: I08e98d09392c2094dfbe9eb7c6def14be03d76e0
Issue-ID: SDNC-653
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to f070a5bf4bfc0032476e938f5b8d8029872644ec
- Merge "Update Ansible playbook for PNF software upgrade"
- Update Ansible playbook for PNF software upgrade
Change-Id: I040cd9e18ce4487977b0715ff19b9830ca1a9eb9
Issue-ID: SDNC-677
Signed-off-by: Enbo Wang <wangenbo@huawei.com>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to 92753192dce9d0f526c0ddf79b3c5de6f05721e4
- SDWAN vpn-create DG reoptimized
Removed duplicate nodes to fetch vnf-id from
service-data where it is present in both validate
input parameter DG and vpn-create DG
Change-Id: I2188f040b199f9f986a80855f7164a015eff835d
Issue-ID: SDNC-659
Signed-off-by: Prakash.E <prakash.e@huawei.com>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to b83410a64457c04568bac634a8f85c7274980008
- SDWAN vpn vf-module-topology added null check
sdwan-vf-vpn-input-parameters DG is updated by
adding NULL check for vnf-index
Change-Id: I54ec5edb8b37a87a6015a6b4f58aa858a96bad3d
Issue-ID: SDNC-659
Signed-off-by: Prakash.E <prakash.e@huawei.com>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to 13a1121e5c5dc07a372f7f88c191ad0b9037834e
- Fixed SDWN lan-port-delete issue in AAI
modifed lan-port-delete DG by chnging AAI
resource name to lan-port-config
Change-Id: Ieceaee4c01c086b2fa6c9ef4493b71173c22b83b
Issue-ID: SDNC-659
Signed-off-by: Prakash.E <prakash.e@huawei.com>
|
|
* Update docs/submodules/sdnc/oam.git from branch 'master'
to 6060a65e5d436bd9c337cd036dfbd0254db87f0b
- updated lan-port-deactivate DG with vnf-id null check
Added NULL check for vnf-id and updated device-name
parameter by removing quote
Change-Id: Icac396301a104d948770724fcaad4f19f065ff0d
Issue-ID: SDNC-659
Signed-off-by: Prakash.E <prakash.e@huawei.com>
|