summaryrefslogtreecommitdiffstats
path: root/adapters/mso-catalog-db-adapter/src/main/java
AgeCommit message (Collapse)AuthorFilesLines
2020-03-24Update Asdc DB tablezm3303-8/+8
Issue-ID: SO-2758 Signed-off-by: zm330 <zhangminyj@chinamobile.com> Change-Id: Ic916e55effe0e3688b8d014fb70ea0e2ad23c16a
2020-03-19Query serviceResources add serviceInfozm3301-26/+7
Issue-ID: SO-2748 Signed-off-by: zm330 <zhangminyj@chinamobile.com> Change-Id: I8db48228edeeb473cb031ac854158e6a72cd1ae8
2020-03-02Add Query ServiceProxyCustomizationzm3303-3/+136
Issue-ID: SO-2368 Signed-off-by: zm330 <zhangminyj@chinamobile.com> Change-Id: I12fc81ea5f0fc3975b5913b56b48ecb4cb3ebff5
2020-02-28Add Catalog DB query methodszm3302-0/+200
Issue-ID: SO-2368 Signed-off-by: zm330 <zhangminyj@chinamobile.com> Change-Id: I99f3241d4726d3d334b1eeccf30022c939b71b6f
2020-01-08Merge "consolidated security configuration"Steve Smokowski4-239/+2
2020-01-07Drop Resource Input Field if not valid JSONSmokowski, Steven5-6/+33
Drop Resource Input Field if not valid JSON Drop Resource Input Field if not valid JSON Issue-ID: SO-2587 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com> Change-Id: I704981c6b3413872975b9e94a4b79cc0a1790795
2020-01-07consolidated security configurationBenjamin, Max4-239/+2
consolidated security configuration into common package Issue-ID: SO-2584 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com> Change-Id: I1e78259ffbf88e792f1f7a5a10cd1fdad8eaea36
2019-11-21Added AAF Integration related changesRamesh Parthasarathy3-10/+198
Created two profiles for the application to run. Basic profile will allow the application to run in the current spring security authentication. AAF profile will authenticate and authorize requests with AAF. if no profile is given, it will fallback to basic. Change-Id: I2576f02e7afca3c10e02aaffef66a60fa1c4dd1a Issue-ID: SO-2451 Signed-off-by: Ramesh Parthasarathy(rp6768)<ramesh.parthasarathy@att.com>
2019-10-24Fix for setting attributes in cloud sites on startupAndrewLamb1-2/+4
Change-Id: Id766ffd28e75d9d8465a3c04b74b540d08a17b4f Issue-ID: SO-2474 Signed-off-by: AndrewLamb <andrew.a.lamb@est.tech>
2019-10-16Merge "update scheduled tasks to have mdc setup"Steve Smokowski1-1/+1
2019-10-14update scheduled tasks to have mdc setupPlummer, Brittany1-1/+1
Added MDCSetup for Scheduled Tasks Added tests for ScheduledTasksMDCSetup Added required fields for audit log and markers Issue-ID: SO-2444 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com> Change-Id: I05e8032ed934abd76d898559c51230761d36b78c
2019-10-10Added throw statement for created exception objectOleksandr Moliavko1-2/+2
to prevent static analyzer warning about exception ending up never thrown; removed redundant initializer for serviceFromDB variable Issue-ID: SO-1841 Signed-off-by: Oleksandr Moliavko <o.moliavko@samsung.com> Change-Id: Ic82acabfc213be3f1132e8525fdac188e6599338
2019-09-25Merge "Upgrade swagger in mso-catalog-db-adapter"Steve Smokowski3-25/+53
2019-09-19update logging to match onap logging libraryPlummer, Brittany1-1/+9
Updated to use changes added to logging library in ONAP Updated RestClient to set mdc rather than extend filter Updated filter removal to include new spring filter Updated to exclude filter causing failure in catdb Excluded filter causing failures in requestdb Updated requestdbatt to exclude filter Updated check for spring filters to fix failing tests Issue-ID: SO-2353 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com> Change-Id: Idb081a0f5527690f9dc41c7914a2d721f9022aea
2019-09-16Upgrade swagger in mso-catalog-db-adapterArindam Mondal3-25/+53
Issue-ID: SO-2305 Change-Id: I25ac20a96cf44a7c8abaa3b78f3b256cb2002d3f Signed-off-by: arindamm <arind.mondal@samsung.com>
2019-09-11Merge "Removed redundant null checks (at these points vnfCustom can be ↵Lukasz Muszkieta1-2/+2
empty, but not null)"
2019-09-11Removed redundant null checks (at these pointsOleksandr Moliavko1-2/+2
vnfCustom can be empty, but not null) Issue-ID: SO-1841 Signed-off-by: Oleksandr Moliavko <o.moliavko@samsung.com> Change-Id: I174635fd0df71811c05ea3ad52f8ec5e5b56c58c
2019-09-10Integrate Logging LibraryPlummer, Brittany3-4/+9
Updated SO to use ONAP provided filters and constants to meet logging standards. Removed redundant classes Updated constant references Issue-ID: SO-2301 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com> Change-Id: Ia4e3c2b1a4dcb3881aa34d39885c8b2782880d64
2019-08-15Initial commit of validation framework to APIHSmokowski, Steven7-9/+249
Move ListenerRunner to common location Adjust request params name, update junit tests Update validations to work properly Properly escape period for the string split Issue-ID: SO-2232 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com> Change-Id: Ia468cf7062cccf30e28afeb7a5cddc37ceb2e002
2019-08-08Avoid local variables shadow class fieldssindhu36721-15/+15
Avoid local variables shadow class fields mso catalog db adapter Issue-ID: SO-2187 Signed-off-by: sindhu3672 <arcot.sindhuri@huawei.com> Change-Id: Ie2a62a76ca43a5c7f2e0cdee00263230a2ae154d
2019-07-26Merge "Fixed sonar issue in QueryServiceVnfs.java"Seshu Kumar M1-3/+2
2019-07-05Fixed sonar issue in QueryGroups.javaArundathi Patil1-1/+2
Fixed sonar issues across this file Issue-ID: SO-2096 Change-Id: Ib2b9fb5d12da2eb1f99562466c5a5d9039b0e50f Signed-off-by: Arundathi Patil <arundpil@in.ibm.com>
2019-07-05Fixed sonar issue in QueryServiceVnfs.javaArundathi Patil1-3/+2
Fixed sonar issues across this file Issue-ID: SO-2094 Change-Id: I51cb4711814c83786dafba22c735244bd1898331 Signed-off-by: Arundathi Patil <arundpil@in.ibm.com>
2019-06-17Changes related to eviction of connectionsBenjamin, Max (mb388a)2-1/+87
These are changes related to ASDC controller for evicting database connection pool when ip address changes Included other appllications such as requestDB, CatalogDB, API Handler, BPMN, OpenstackAdapter etc Change-Id: I9a96ea12fb0c10643a204a58d55360bebba326fe Issue-ID: SO-2018 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-05-19Recipe retrieval for groupssubhash kumar singh2-2/+18
Recipe retrieval for groups. Change-Id: I2ba68777f3655ebc7794b75d357253022fe7739b Issue-ID: SO-1393 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2019-05-15store openstack request status in requestdbSmokowski, Steven2-10/+14
Openstack request status now stored in request db Change-Id: Ida8f4f613d406c2b834ab190e01d5aaf2f16dd3d Issue-ID: SO-1867 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-05-07Update the format of resourceInputzm3301-1/+3
Save format when resource is list type e.g. {key2:[vf_prop_list,INDEX,key]|default} Issue-ID: SO-1393 Change-Id: Ibb5e7bb31114fa3bbd7a3e1af5f2152a98941a4b Signed-off-by: zm330 <zhangminyj@chinamobile.com>
2019-05-03Merge "add resource input Save format when resource is list type e.g. ↵Seshu Kumar M1-0/+2
{key2:vf_prop_list,INDEX,key|default}"
2019-04-30Add Model Version QuerySmokowski, Steven4-0/+207
Fix the sql migration version numbering to be proper Fix marking test as private, mark public Clean up public declarations to private Fix schema.sql to have new column for unit test Revert POM Change, add License, clean up comments Fix bad spelling of method name issue Update catalog db to support new rest endpoint Update local query service and mappers Localstaging of potential catalog db changes Update logic to write overall distro status Change-Id: I84d53b972ede3176c5af32d13444583a36606efa Issue-ID: SO-1820 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-04-30add resource inputzm3301-0/+2
Save format when resource is list type e.g. {key2:vf_prop_list,INDEX,key|default} Change-Id: I1cde294eb790df0be6df13cfae9959310b93f366 Issue-ID: SO-1393 Signed-off-by: zm330 <zhangminyj@chinamobile.com>
2019-04-26Enhancement for querysubhash kumar singh3-1/+228
Enhancemenv for query to include group and vnfccustomization. { "serviceResources": { "modelInfo": { "modelName": "NSService", "modelUuid": "0bad8c92-7d22-49f0-b092-b64e6ca564a7", "modelInvariantUuid": "69161960-515b-4bf3-91f1-313b813f5e1d", "modelVersion": "1.0" }, "serviceType": "", "serviceRole": "", "environmentContext": "General_Revenue-Bearing", "resourceOrder": "NF", "workloadContext": "Production", "serviceVnfs": [ { "modelInfo": { "modelName": "", "modelUuid": "123", "modelInvariantUuid": "", "modelVersion": "", "modelCustomizationUuid": "1234", "modelInstanceName": "test" }, "toscaNodeType": "", "nfFunction": "", "nfType": "", "nfRole": "", "nfNamingCode": "", "multiStageDesign": "", "resourceInput": "", "vfModules": [], "groups": [ { "modelInfo": { "modelName": "test", "modelUuid": "11", "modelInvariantUuid": "11", "modelVersion": "2" }, "vnfcs": [ { "modelInfo": { "modelName": "xfs", "modelUuid": "22", "modelInvariantUuid": "2222", "modelVersion": "22222", "modelCustomizationUuid": "2222" } } ] } ] } ], "serviceNetworks": [], "serviceAllottedResources": [] } } Issue-ID: SO-1393 Change-Id: Iee7f79337f73276f857d6d42b5b2416e4e8f4536 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2019-04-24Remove the literal boolean values.Driptaroop Das4-6/+6
Remove the literal boolean values. Issue-ID: SO-1811 Change-Id: Iaa565b92cce2b6c8eddb77aff93491014cb7d7a3 Signed-off-by: Driptaroop Das <driptaroop.das@in.ibm.com>
2019-04-10Re-commit some changes which were lostBenjamin, Max (mb388a)1-15/+0
remove unused code Issue-ID: SO-1767 Change-Id: I12b8295ae4a5bc9e9154c8ccd1bb53f70886f929 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-04-08Replaced all tabs with spaces in java and pom.xmlBenjamin, Max (mb388a)19-916/+895
Added in maven plugins to enforce coding style rules Added in eclipse java formatting xml Change-Id: I3727bbf4ce8dc66abfd8ad21b6cfd0890c5d3ff0 Issue-ID: SO-1765 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-04-02fix catalogdb cvfnc customizationBenjamin, Max (mb388a)2-46/+12
Hibernate entities were all wrong and needed a complete rewrite. The scope kept growing and ended up touching a lot more of the code than originally planned. These changes make the db interactions much easier and more straightforward from java. The flyway script order had to change to make this migration possible. Change-Id: I6ce363a385661300eddb11923ac6a80538edaddc Issue-ID: SO-1710 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-02-25Removed MsoLogger in 'mso-catalog-db-adapter'r.bogacki1-8/+11
Removed MsoLogger from adapters ('mso-catalog-db-adapter') Replaced MsoLogger with plain slf4j. Refactored login output. Fixed imports. Change-Id: Ic61119892e9d4cb41498f2be2a65990f4d51bf0a Issue-ID: LOG-631 Signed-off-by: Robert Bogacki <r.bogacki@samsung.com>
2019-02-04cloud config migration from openstack to catdbBenjamin, Max (mb388a)2-0/+323
remove the wait and sleep code in migration move cloud config migration from openstack to catdb Change-Id: Id887a37ce12665e5d8a604308ea251744529491c Issue-ID: SO-1461 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-01-24Fix AR receipe retrivalsubhash kumar singh1-5/+10
Fix AR receipe retrival. Change-Id: I5675fef17c1ee6375dd6c68a311d5f0568438879 Issue-ID: SO-1422 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2019-01-23Fix get of operationTypesubhash kumar singh1-6/+13
OperationType should return empty from db request instead of "null". Change-Id: I5df3df5aead6008c4e14961ee385cafe64c37959 Issue-ID: SO-1417 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2019-01-08Fix json parsing of resource inputsubhash kumar singh1-1/+1
Fix json parsing of resource input by adding escape character. Change-Id: Ic19bd5dae5eea25faaeae2df3eb0bcc29482ea7c Issue-ID: SO-1358 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-12-24update request input and sequence to DBsubhash kumar singh4-1/+9
Update request input and sequence to DB. Resource sequence has been added as new column in service table. Resource input has been added as new column in resp resource. Change-Id: I97c8227636f06692190a843a87178517db038bbd Issue-ID: SO-1248 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-11-24Fix version string in querysubhash kumar singh1-1/+1
Fix version string in query. Change-Id: Idf990d7f58cc93302670fb270735d71f0a834912 Issue-ID: SO-689 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-11-15Fix auth for catalog dbsubhash kumar singh1-4/+12
Fix auth for catalog db. Change-Id: Ic787993f608b7ddf74167f7859a519ca02b794ed Issue-ID: SO-689 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-11-15vCPE BRG allottedResourceRole is nullRob Daugherty1-1/+1
In Beijing we used: o.getNfRole() In Casablanca, it was: o.getTargetNetworkRole() I'm changing it to: o.getTargetNetworkRole() != null ? o.getTargetNetworkRole() : o.getNfRole() Change-Id: I874b2f01fd651bb38a361fa9c36f9937b1f02b2f Issue-ID: SO-1200 Signed-off-by: Rob Daugherty <rd472p@att.com>
2018-11-13Fix the retrival of resource recipesubhash kumar singh1-3/+22
Fix the retrival of resource recipe. Change-Id: Iaec1046f487ce61b995d61414dbe4229e8a51115 Issue-ID: SO-1197 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com> (cherry picked from commit 1c831520f085527c9525d8a757e9c0ccddae0219)
2018-10-16Prepare resources for service uuid reqsubhash kumar singh1-2/+9
Retrieve all the resource for queried service uuid. Change-Id: If2beaa27570821c9897387d3b7098a939d99c895 Issue-ID: SO-689 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-09-08added generic fabric support to SOBenjamin, Max (mb388a)1-1/+21
Fix Autoincrement of ID field in table Fix accidental removal of method Update usage of requestdb client removed unused imports in common tasks and test Fix broken branch, have unit tests pass references the Epic branch Fix broken branch from compiling committing classpath for vfc adapter cause its not going away added in the fail case for when there are no profiles removed second set of adapters in application test yml removed double adapters in request db application test added jpa repo dependency to the so bpmn folder pom add creation timestamp column to the table added in null checks for Config returned from policy switched to string in requestprocess with jenerate switched to string in requestprocess with jenerate updated aai version in common pom to 605 from 591 renamed the db scripts for flyway sync to register added endpoint to application test yml for failing test ... Change-Id: I800f837ea75d7cdff740dc3a387e4d7654cfd085 Issue-ID: SO-972 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-09-03fixed sonar issue in WebSecurityConfigImpl.javaSandeep J1-1/+3
fixed sonar issue detailed in SO-874 Issue-ID: SO-874 Change-Id: Ie14f5376566642d75123e23764bf6f7869861393 Signed-off-by: Sandeep J <sandeejh@in.ibm.com>
2018-09-01Logging ImprovementSmokowski, Steve (ss835w)2-1/+23
Add Spring interceptor to log all the SpringDataRest calls Issue-ID: SO-947 Change-Id: Ia1a574cedd90e79bb2fd30a094831dc5cd269ff0 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2018-08-31Update LoggingSmokowski, Steve (ss835w)2-2/+2
Add CXF interceptor for SOAP based logging Clean up extra logging statements Add UT to ensure MDC properly populated Change package name on Jax-RS Filter to be more accurate Issue-ID: SO-947 Change-Id: I3a2afc58de3bf370675658ce3d19cf899b90def7 Change-Id: I3a2afc58de3bf370675658ce3d19cf899b90def7 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>