Age | Commit message (Collapse) | Author | Files | Lines |
|
* Update docs/submodules/so.git from branch 'master'
to 6d200a4c428c661c0e19fd2ffb1598e8f2992143
- Merge "Generic cds payload for vnf/vf-module/service."
- Generic cds payload for vnf/vf-module/service.
Things done-
-Fixed review comments.
-Added logic to create payload using scope and action.
-Populate instance parameters from SO-request to CDS payload for VNF.
-Implementation of setting orchestration status after CDS completes its operation based on SO scope.
-Make use of ControllerRunnable interface.
-Changed actionname to actionName to action.value as per Oscar's suggestion.
-Setting orchestration status after CDS completes its operation for VF-Module.
-Populate instance paraneters from SO to CDS for VF-Module.
Issue-ID: SO-2312
Signed-off-by: prathamesh <prathamesh_morde@yahoo.ca>
Change-Id: I026d9f7909e486c68f274b7e56c8bd7c8fdcd521
Signed-off-by: prathamesh <prathamesh_morde@yahoo.ca>
Signed-off-by: tragait <rahul.tyagi@est.tech>
|
|
* Update docs/submodules/so.git from branch 'master'
to c8b62275a8cb5f10ab2050f2cee71973485fbbd7
- Merge "Adding sync mechanism"
- Adding sync mechanism
Change-Id: I81dc737c27092d32bac6457ba015f0b093cb1176
Issue-ID: SO-2418
Signed-off-by: waqas.ikram <waqas.ikram@est.tech>
|
|
* Update docs/submodules/so.git from branch 'master'
to 493477ef59ce12d082683f188e0253fe2d34bdff
- Merge "Modify requestDbClient to add methods for OrchestrationTask"
- Modify requestDbClient to add methods for OrchestrationTask
Issue-ID: SO-2368
Add methods to handle OrchestrationTask
Change-Id: I4595c5a1099977e5dba259bfbf77d666b1db699c
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
|
|
* Update docs/submodules/so.git from branch 'master'
to 662f2cdcb69c7ec2264493a8c329f946001c1020
- Add controller for OrchestrationTask
Issue-ID: SO-2368
Add custom controller for OrchestrationTask
in requestDB adapter
Change-Id: I88ee0f7ee06131400d12b2f085853823af1a035c
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
|
|
* Update docs/submodules/so.git from branch 'master'
to 3c83d49d9b70d8dd371ad5bf4dfc22a070344102
- Merge "Add test for OrchestrationTaskRepository"
- Add test for OrchestrationTaskRepository
Issue-ID: SO-2368
Add schema for create OrchestrationTask table
Change-Id: I163c9a9ff7d1ec15eb9c0061b4a0eac6f6e8fc08
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
|
|
* Update docs/submodules/so.git from branch 'master'
to 2d11a7092c292a3987ad0b105fe31ee8a0390294
- Merge "Based on Controller Actor calling CDS or APPC(Current Flow)"
- Based on Controller Actor calling CDS or APPC(Current Flow)
-Added BBNameSelectionReference table having bbName along with
action,scope,actor
-Updated CatalogDbClient to use BBNameSelectionReference Table
-Updated ControllerExecution bmpn to select flow as per Controller Actor
-Corrected Format Error
Issue-ID: SO-2316
Signed-off-by: Pooja03 <pm00501616@techmahindra.com>
Change-Id: I21fad846249f773308e34abcac134d3ee0694027
Signed-off-by: Manamohan <MS00534989@techmahindra.com>
|
|
* Update docs/submodules/so.git from branch 'master'
to a71813fd697298b9a9bddea6eacc9de5fada2de0
- Merge "SOL003 Adapter Package Management - Subscribe Fix"
- SOL003 Adapter Package Management - Subscribe Fix
Change-Id: I9580ba5cf2bd023d2c160388cd2115c710d6e95b
Issue-ID: SO-2417
Signed-off-by: rope252 <gareth.roper@est.tech>
|
|
* Update docs/submodules/so.git from branch 'master'
to 6bafbf4a7a568a9ed8f1d4d4fca830c28b575886
- Fix Sonar cloud migration coverage issue
Issue-ID: SO-2663
Signed-off-by: Priyadharshini <priyadharshini.b96@wipro.com>
Change-Id: Ia5c91ed109d5b31f86a3b903123a083bc08733b9
|
|
* Update docs/submodules/so.git from branch 'master'
to bba9db24305b78214fd9f415d2ab4d7455ee762c
- extend query parameter to support pnfModelVersionId
Issue-ID: SO-2559
Signed-off-by: Yaoguang Wang <sunshine.wang@huawei.com>
Change-Id: I51cb15f6750b378a9de3435951e3ea1644184a55
|
|
* Update docs/submodules/so.git from branch 'master'
to c3c1ffae16d32747dc380a8311d3829d0e0cbd35
- Merge "Fix too many params issue"
- Fix too many params issue
Methods should not have too many parameters
Either log or rethrow this exception
Issue-ID: SO-1841
Change-Id: Iabe32f4492560703228eb5d115b5e91ebeb17255
Signed-off-by: Parshad Patel <pars.patel@samsung.com>
|
|
* Update docs/submodules/so.git from branch 'master'
to d99c3ef191d843649545afbd9d0689aaf5947c60
- Merge "Fix so-simulator dependency in docker/pom.xml"
- Fix so-simulator dependency in docker/pom.xml
Issue-ID: SO-2622
Signed-off-by: Remigiusz Janeczek <remigiusz.janeczek@nokia.com>
Change-Id: I30b787bc697e48b4e1b21ec84b8abaeff52a5971
|
|
* Update docs/submodules/so.git from branch 'master'
to f2dabed6905bd921a9ffb635d349ef8ad8063c6d
- Merge "Added logic to prevent exceptionbuilder from"
- Added logic to prevent exceptionbuilder from
Added logic to prevent double exception creation
Issue-ID: SO-2661
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: Ib575d5914a57b0417b7c6b830cdead8451438e12
|
|
* Update docs/submodules/so.git from branch 'master'
to 46db4fc8a117f68673efd1d23b224cd1b1880d79
- Merge "Add repository for OrchestrationTask"
- Add repository for OrchestrationTask
Issue-ID: SO-2368
OrchestrationTask will be used to store the
slicing options which can be reviewed by the
maintainer. OrchestrationTask itself is designed
to be generic and parameters stored inside can
be customized based on different use cases.
Change-Id: I42c0639a62bf18f5d0c8bece746cd8e831dd88e8
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
|
|
* Update docs/submodules/so.git from branch 'master'
to 460b2c35e214b9422e9313a4bad8253669791ebf
- Merge "Fixed, simplified and tested AuthorizationHeadersProvider (+small changes in poms)"
- Fixed, simplified and tested AuthorizationHeadersProvider
(+small changes in poms)
Ve-Vnfm (SOL002) Adapter project
Issue-ID: SO-2574
Signed-off-by: Piotr Borelowski <p.borelowski@partner.samsung.com>
Change-Id: I480ac1d5b46aae5a9d4db8249d98c186b59fd12f
|
|
* Update docs/submodules/so.git from branch 'master'
to dbf7a49c67050dbd132146e4fa230bb5723dbc7d
- Merge "Fix Sonar issue - Refactor nested for if while if.."
- Fix Sonar issue - Refactor nested for if while if..
Issue-ID: SO-1841
Signed-off-by: Tomasz Wrobel <tomasz.wrobel@nokia.com>
Change-Id: I65380661dc11cd0e5d77b59a72aa5a25a955a638
|
|
* Update docs/submodules/so.git from branch 'master'
to 3098fe0ae72dda55600be53069cc336c0c281229
- Merge "Added AAF SSL certs related changes"
- Added AAF SSL certs related changes
if AAF_SSL_CERTS_ENABLED environment variable is
turned on it will try initialize other environment
variables related to AAF SSL certs. SO OOM application
overrides will be dynamically configured whether or not
to use AAF SSL certs.
Issue-ID: SO-2451
Signed-off-by: Ramesh Parthasarathy(rp6768)<ramesh.parthasarathy@att.com>
Change-Id: I46eb8fa2f8f790232635a3e1926fd2464c48d173
|
|
* Update docs/submodules/so.git from branch 'master'
to d6e85d547f5eac006b1da5d3b2ddc19daf8564da
- Merge "added in graceful shutdown to spring boot"
- added in graceful shutdown to spring boot
added in graceful shutdown to spring boot
updated the poms to include catalina and upped fabric
added in eventlistener instead of application listener
Issue-ID: SO-2655
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: I2d8674cc82a9167604b2d38a49bffba42cee32ff
|
|
* Update docs/submodules/so.git from branch 'master'
to bf8459dc1b06f4a1f7e36e30fbe32136ab9c5a25
- Merge "Migrate so docs"
- Migrate so docs
Merging this will create
https://onap-so.readthedocs.io
This build will run in parallel
to the current docs generation method
until we are ready to cut over.
Issue-ID: CIMAN-364
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
Change-Id: I447112810fed1392d928ed50e7551cf9ff48fbdb
|
|
* Update docs/submodules/so.git from branch 'master'
to 400eac6792f0c41d30bef8d118be51a801652b2c
- Merge "mso to add support for creating the cloud region"
- mso to add support for creating the cloud region
Initial check in to support cloud region create
Add additional junit tests
Add additional integration tests
Updated junit to use spy and removed setter method
Issue-ID: SO-2657
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: I6a93f3b4caf7d640ffa5842981247d284b9013ad
|
|
* Update docs/submodules/so.git from branch 'master'
to 38a44c205d122c66059525356685edd40e4f9ded
- Disable JUnits for PauseForManualHandling due to
Disable JUnits for PauseForManualHandling due to sporadic errors.
Issue-ID: SO-2659
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: I56f69a6023c3a8e9f536576acc70ba6fb76d9d09
|
|
* Update docs/submodules/so.git from branch 'master'
to e4f76347e6eac071e5a3ff4666763b68b9075183
- Merge "SOL003 Adapter Package Management - Terminate Subscription"
- SOL003 Adapter Package Management - Terminate Subscription
Change-Id: I11e73f166bdab1b69b40640394ca9abb304b5be5
Issue-ID: SO-2419
Signed-off-by: rope252 <gareth.roper@est.tech>
|
|
* Update docs/submodules/so.git from branch 'master'
to 1980195d94d2208c8f5c8951885cfe345fbc8dd1
- Merge "Fix Sonar issue - throw generic exception."
- Fix Sonar issue - throw generic exception.
Issue-ID: SO-1841
Signed-off-by: Tomasz Wrobel <tomasz.wrobel@nokia.com>
Change-Id: Ia24bdb36f03a1b96a356ef27fe1dca95e48adb7c
|
|
* Update docs/submodules/so.git from branch 'master'
to 78eb0176ae83484534789cafb60f773c8f8d3f44
- Merge "Add table for OrchestrationTask in requestDB"
- Add table for OrchestrationTask in requestDB
Issue-ID: SO-2368
OrchestrationTask will be used to store the
slicing options which can be reviewed by the
maintainer. OrchestrationTask itself is designed
to be generic and parameters stored inside can
be customized based on different use cases.
Change-Id: Iec1cb31ea93659b498b30d098879a9acb711c1ee
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
|
|
* Update docs/submodules/so.git from branch 'master'
to 00ba764f619848bcd4a384e26b0806bd5fb80749
- Merge "AssignPnfBB - store model related PNF parameters in AAI"
- AssignPnfBB - store model related PNF parameters in AAI
Issue-ID: SO-2640
Change-Id: Ie30c928e730ab858e9fe4ac5a4b14cebf6c0f806
Signed-off-by: Joanna Jeremicz <joanna.jeremicz@nokia.com>
|
|
* Update docs/submodules/so.git from branch 'master'
to 505b82d23d4340e67f619675bad4580fc3ae050a
- Fix for SO-2598
Change-Id: If2086de6cb635f39a03927be35fed9c177919211
Issue-ID: SO-2598
Signed-off-by: waqas.ikram <waqas.ikram@est.tech>
Making WebSecurityConfigurerAdapter configurable so that other
components can configure it per there requirement
Change-Id: I8f7674710ff41195946a710b86c7c8d7b52815f8
Signed-off-by: waqas.ikram <waqas.ikram@est.tech>
|
|
* Update docs/submodules/so.git from branch 'master'
to c1dacabbcf9f9f09a00458b44f5168f1273965ec
- Merge "Added communication with DMaaP"
- Added communication with DMaaP
Ve-Vnfm (SOL002) Adapter project
Issue-ID: SO-2574
Signed-off-by: Piotr Borelowski <p.borelowski@partner.samsung.com>
Change-Id: Ia6674f594bbf2112cbdaab47c203cb78f1ebbff0
|
|
* Update docs/submodules/so.git from branch 'master'
to ac1a59fc6731c6261712eac5bec76816b11d1096
- Merge "Added Basic Authorization in sending Subscription to VNFM"
- Added Basic Authorization in sending Subscription to VNFM
Ve-Vnfm (SOL002) Adapter project
Issue-ID: SO-2574
Signed-off-by: Piotr Borelowski <p.borelowski@partner.samsung.com>
Change-Id: I819e95c4e212695bc38ab5b7d221be712f87320e
|
|
* Update docs/submodules/so.git from branch 'master'
to 93c822c255db9b1f8ee9f68e6677417e38919abe
- Add SOL003 Package Management Notification Swagger file
Change-Id: Ic5c34177adc6901c020b9f554e9da94270c142c1
Issue-ID: SO-2654
Signed-off-by: rope252 <gareth.roper@est.tech>
|
|
* Update docs/submodules/so.git from branch 'master'
to 14661c9bd3569905b6b4b041be796231c45c8a93
- Merge "Fix repeatable migration of WorkflowDesignerData (CatalogDB)"
- Fix repeatable migration of WorkflowDesignerData (CatalogDB)
Issue-ID: SO-2648
Signed-off-by: Remigiusz Janeczek <remigiusz.janeczek@nokia.com>
Change-Id: I32623ed9937519bf275e3d8f715200c09c58a268
|
|
* Update docs/submodules/so.git from branch 'master'
to ab5b19282e19cbe1f7f44d58afb99e3d8b9ecae3
- Merge "Fix logging issue in so-simulator"
- Fix logging issue in so-simulator
Use a logger to log this exception
Either log or rethrow this exception
Issue-ID: SO-1841
Change-Id: I5a9802fcf11d610cd60b61c0760781add7cdc91d
Signed-off-by: Parshad Patel <pars.patel@samsung.com>
|
|
* Update docs/submodules/so.git from branch 'master'
to 32464a960c6d26fa6a3a1bb25475ac2c1b96e829
- Merge "Initial commit to check client alive"
- Initial commit to check client alive
Initial commit to check client alive
Issue-ID: SO-2653
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: Ib9f4cf7f5815bd9b8d0d42417f3e5fd83382547a
|
|
* Update docs/submodules/so.git from branch 'master'
to 5ffc3c1db37c43b559af9c6d8b14bb8d33178572
- Merge "Remove unused param"
- Remove unused param
Remove unused param from request parameters
Issue-ID: SO-2651
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: I1c9a8e05aa329ee65f9910ab25319a0a61d54675
|
|
* Update docs/submodules/so.git from branch 'master'
to 24645b6c53420b7d12a23158e39366ed37b10d86
- Merge "change variables to public"
- change variables to public
static final variables should be public not package scope
Issue-ID: SO-2635
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: I59663a2b706237136adbf375b3d47cdb6a3cc8b8
|
|
* Update docs/submodules/so.git from branch 'master'
to 980aa7b6d011d4760a82033189a0b116fedb9613
- Merge "add retry sequence levels"
- add retry sequence levels
Added retry sequence levels so that the different services can specify
their desire.
Updated to be medium and added to be long sequence in audit.
Change retry level to be final and changed default constructor to
private
Changed default constructor to public so its visible.
Updated unit test to reflect change and get verify job to pass
Added and updated the unit test for add graph
Issue-ID: SO-2649
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: I981b90a5dbb1dca5354fba37589b26dabbfc0b0e
|
|
* Update docs/submodules/so.git from branch 'master'
to 0772e8876fa155fd93b7abb5816a6d9a040aa7f6
- Merge "optimize camunda process instance history"
- optimize camunda process instance history
Set buinessKey to requestId. Added plugin to pass businessKey to
subprocesses
Updated process-instance and activity-instance lookups to filter
response
Removed duplicate tests and updated att history lookup
Updated businessKey to be set to mso-request-id
Updated snapshot version to fix build issues
Removed query param from properties. added uribuilder
Updated to use uriBuilder.build().toString()
Updated unit tests to lookup by procesInstanceId to fix build failure
Issue-ID: SO-2650
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: I357053c52a75ee5149a56392ce866dbb654b541d
|
|
* Update docs/submodules/so.git from branch 'master'
to 299cf5f3a2a49a6dec927a0fd038762a07d6c272
- Merge "modifications to create network to add lob"
- modifications to create network to add lob
Add platform and line of business to network
Update to split out network
Issue-ID: SO-2637
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: I5cbc3bc77986b6d4d420d2158df46924fcd74c0b
|
|
* Update docs/submodules/so.git from branch 'master'
to 6db24e72ecbf4f5c63085085c10dc656568b563b
- Merge "Fix dependency failure for aai-schema"
- Fix dependency failure for aai-schema
Updated solution of dependency failure after changes in AAI
Issue-ID: SO-2636
Signed-off-by: Mateusz Harazin <mateusz.harazin@nokia.com>
Change-Id: I253c73bf749fe200eda83eaa1761deeb38227c5e
|
|
* Update docs/submodules/so.git from branch 'master'
to 092c43b8a222fe987084c4a103b3e1e888ff7550
- Merge "AssignPnfBB - set orchestration status to Assigned after successful assignment"
- AssignPnfBB - set orchestration status to Assigned after successful assignment
Issue-ID: SO-2642
Signed-off-by: Mateusz Harazin <mateusz.harazin@nokia.com>
Change-Id: I4247e464b1533025638880763ea9e2fe629b10c3
|
|
* Update docs/submodules/so.git from branch 'master'
to 2110c52f8c84cd9330da668a43e00e34f645f867
- Changed Basic Authorization in receiving Notification
Ve-Vnfm (SOL002) Adapter project
Issue-ID: SO-2574
Signed-off-by: Piotr Borelowski <p.borelowski@partner.samsung.com>
Change-Id: I95dfebd0e024af91b9bac4d8a4bb97d271badc70
|
|
* Update docs/submodules/so.git from branch 'master'
to e3871f1bd6e8d8c8baa093d1307b029527603302
- Merge "Add Pnf BBs to Service-Macro-Create flow"
- Add Pnf BBs to Service-Macro-Create flow
Added building blocks:
AssignPnfBB
WaitForPnfReadyBB
ActivatePnfBB
Issue-ID: SO-2641
Signed-off-by: Remigiusz Janeczek <remigiusz.janeczek@nokia.com>
Change-Id: I6bc08e17a666a1a93d7bda1ec04aa7c181b5ec8c
|
|
* Update docs/submodules/so.git from branch 'master'
to 422c2a3615ca059b2b9e79304738106fb845bf69
- Merge "ETSI Package Management - Subscribe"
- ETSI Package Management - Subscribe
Change-Id: I6a01f97a5ec441fb72b3d506d5d7355e4d868e11
Issue-ID: SO-2417
Signed-off-by: rope252 <gareth.roper@est.tech>
|
|
* Update docs/submodules/so.git from branch 'master'
to 526148c73d077343c083484aedb5745f7a759f0c
- Merge "WaitForPnfReadyBB - set orchestration status to Register and then Registered"
- WaitForPnfReadyBB - set orchestration status to Register and then Registered
Issue-ID: SO-2644
Signed-off-by: Lukasz Muszkieta <lukasz.muszkieta@nokia.com>
Change-Id: I2796baf4afabd47536ffa0d4deb5096608fc5cce
|
|
* Update docs/submodules/so.git from branch 'master'
to 9b496eb93f2056656f9ab182de37beb88a9f75cd
- Fix dependency failure for aai-schema
Temporary solution until fix AAI-2789 bug
Issue-ID: SO-2636
Signed-off-by: Mateusz Harazin <mateusz.harazin@nokia.com>
Change-Id: Ifaee3198bba7f293530b4fed1f6267e54ceeba9d
|
|
* Update docs/submodules/so.git from branch 'master'
to 9131b47477881cf35f40d0c1c359d18dadf72130
- Merge "Fix Sonar issue with throw generic exception on apihandlerinfra"
- Fix Sonar issue with throw generic exception on apihandlerinfra
Issue-ID: SO-2645
Signed-off-by: Tomasz Wrobel <tomasz.wrobel@nokia.com>
Change-Id: I111ca7c7bef271386bd075e2b948f29d7c2b4516
|
|
* Update docs/submodules/so.git from branch 'master'
to 6706ff14fca4a1f66eb739e45654db5f42fd3c3f
- Merge "Support LCM API for sdnc adapter"
- Support LCM API for sdnc adapter
Enhance sdnc adapter to support LCM API for PNF SW Upgrade.
Issue-ID: SO-2588
Signed-off-by: Enbo Wang <wangenbo@huawei.com>
Change-Id: I193a5f61a5a63da6608692b34c221df8aeddc323
|
|
* Update docs/submodules/so.git from branch 'master'
to cc778524df33ee66a3f17416761ea4cd7b2ef952
- Refactoring tests in BBInputSetupUtilsTest
Issue-ID: SO-2613
Signed-off-by: Mateusz Harazin <mateusz.harazin@nokia.com>
Change-Id: I277277b0b5ca1c76afb9a466b20479c97d033401
|
|
* Update docs/submodules/so.git from branch 'master'
to e9c0b88ed9b0e9a538ee87f25f3ea4c99f853702
- Fix dependency failure for aai-schema
Issue-ID: SO-2636
Signed-off-by: Enbo Wang <wangenbo@huawei.com>
Change-Id: I946870c801134dc76b8c55ffd52ace5aaef60a69
|
|
* Update docs/submodules/so.git from branch 'master'
to f388c24c982a51c47d6b00c72d9252c5e430f44d
- Remove Valet from openstack adapter
Remove Valet from openstack adapter
Clean up CI, so it passes on dev branch
Fixed bad merge regarding correct method name.
Added try catch around createIfNotExists methods to avoid failing sim.
Fix broken Fabric Tests from merge
Update logging jar dependency for CI
Issue-ID: SO-2623
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: I572276f751b132ec78d7ab5763f1c76bfc8256c5
|
|
* Update docs/submodules/so.git from branch 'master'
to 98fce84d19c8aa1eb11fc24a8dddb5b0deb38d7a
- Merge "Increased lock time on add graph data task and"
- Increased lock time on add graph data task and
Increased lock time on add graph data task and fixed error handling for
inventory failure so flow doesnt proceed
Changed build workflow exception to return the exception
Issue-ID: SO-2621
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: Ib247cd7e5eb0cf17579a9d72d9e8ede8a8c35e17
|
|
* Update docs/submodules/so.git from branch 'master'
to b06b1e355c7f4d4d9c74c88227f67c61841a2b0d
- Merge "- Include stack Status Reason when rollback is"
- - Include stack Status Reason when rollback is
- Include stack Status Reason when rollback is suppressed.
- Updated to format code to pass the build.
Issue-ID: SO-2620
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: Id9789930eaf7c47666a9401f8e3c57156c931b74
|