aboutsummaryrefslogtreecommitdiffstats
path: root/adapters/mso-catalog-db-adapter/src/main/java/org
AgeCommit message (Collapse)AuthorFilesLines
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-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-08Replaced all tabs with spaces in java and pom.xmlBenjamin, Max (mb388a)17-865/+829
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-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>
2018-08-28Converted ServiceInstances to catalog db clientBenjamin, Max (mb388a)1-19/+18
- Fixed issues related to created Date Format, enabled required Test - Fixed issues related to queryParam names, enabled required Test - Fixed issues related to queryParam names - Improving coverage for catalogDbClient by another 10% (its 78% now) - Improving coverage for catalogDbClient by another 10%. There is a failing test which will be explored shortly - Improving coverage for catalogDbClient, adding some tests and their basic asserts - merging with dev and resolving the compilation issue arising due to it - Removing some TODO introduced in code for incremental pushes - Fixing failing unit test cases with the build - Refactoring done for code change in catalogDBClient - merged changes with development branch - Modified unit tests for Catalogdb Client related code - Modified unit tests for Catalogdb Client related code - Fixed some of the repository code for retrieving single resource - Modified unit tests for Catalogdb Client related code - Modified unit tests for Catalogdb Client related code - Modified unit tests for Catalogdb Client related code - Removed @Param from repositories and added -Parameters argument in maven compile plugin ... Change-Id: Ieeb7bcc21a573465e485fedfbbe771c8b89db3f8 Issue-ID: SO-925 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-08-27Merge "fixed sonar issue in QeruServiceNetworks.java"Seshu Kumar M1-1/+2
2018-08-27fixed sonar issue in CatalogDbAdaptorRest.javaSandeep J1-2/+2
removed unsused imports Issue-ID: SO-908 Change-Id: Ib730929e8f255274bf85124ca7a8fcc31b95b051 Signed-off-by: Sandeep J <sandeejh@in.ibm.com>
2018-08-27fixed sonar issue in QeruServiceNetworks.javaSandeep J1-1/+2
removed unused import at line 31 Issue-ID: SO-907 Change-Id: If7cbb9ab074a6e7477dbf1b3eff02f372b75b59f Signed-off-by: Sandeep J <sandeejh@in.ibm.com>
2018-08-23fixed sonar issue in CatalogQueryExceptionCommonSandeep J1-1/+2
fixed sonar issue: removed unused import Issue-ID: SO-883 Change-Id: Ie9117601c7d64974067b5ab81ccb8a58d4a2fdc5 Signed-off-by: Sandeep J <sandeejh@in.ibm.com>
2018-08-23resolved sonar issue in QueryServiceMacroHolderSandeep J1-4/+6
removed the commented lines of code as per issue raised by SONAR Issue-ID: SO-881 Change-Id: Ic25a7418df06c7b7da2c60bec9dc4adbc97d902b Signed-off-by: Sandeep J <sandeejh@in.ibm.com>
2018-08-13Update CatalogDB LoggingSmokowski, Steve (ss835w)11-615/+639
Update CatalogDB Logging to remove MSO Logger, remove useless log lines, clean up minor sonar issues while working in the file Issue-ID: SO-847 Change-Id: Icab5d8cf2885d2193bb55f495b3230dde0f5af54 Change-Id: I2d2b2fa919074c439b6c9039aa7ed5e45a792781 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2018-07-31Containerization feature of SOBenjamin, Max (mb388a)18-793/+1077
Change-Id: I95381232eeefcd247a66a5cec370a8ce1c288e18 Issue-ID: SO-670 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-07-25Merge "Replace printStackTrace with usage of logger"Seshu Kumar M1-2/+1
2018-05-30Add space to 'Tunnel XConn'Arthur Martella1-2/+2
Adding space to change TunnelXConn to Tunnel XConn so that SO will match SDNC. Change-Id: I2a752fd1c6b3ed115c8a2dafbd47e3ce24f49a57 Issue-ID: SO-650 Signed-off-by: Arthur Martella <am153x@att.com>
2018-05-24Replace printStackTrace with usage of loggerMichal Korman1-2/+1
Change-Id: I648e5a25337beca1f8c483ba6e5359d245e237d3 Issue-ID: SO-642 Signed-off-by: mkorman <michal.korman@nokia.com>
2018-05-11Add junit for project mso-catalog-db-adapterLukasz Muszkieta2-86/+3
Change-Id: I7b28cc713929400b03b7e567bf9823d82631a1e9 Issue-ID: SO-617 Signed-off-by: Lukasz Muszkieta <lukasz.muszkieta@nokia.com>
2018-04-21Recipe param xsd supportc001491071-18/+22
Recipe param xsd support Change-Id: I561d98358a76f1007b979cdf6753d2f3b7754991 Issue-ID: SO-583 Signed-off-by: c00149107 <chenchuanyu@huawei.com>
2018-03-14AT&T 1712 and 1802 release codeRob Daugherty9-52/+44
This is code from AT&T's 1712 and 1802 releases. Change-Id: Ie1e85851e94bc66c4d9514a0226c221939531a04 Issue-ID: SO-425 Signed-off-by: Rob Daugherty <rd472p@att.com>
2018-03-07Make use of try with resourceMunir Ahmad1-39/+38
Change-Id: Ib3e7ac5f1febc3d7b0da3adc2eb191c41a7473a6 Issue-ID: SO-437 Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>
2018-03-07Merge "Support resource recipe query rest"Chuanyu Chen2-1/+129
2018-03-07Support resource recipe query restc001491072-1/+129
Support resource recipe query rest Change-Id: I9e22c0930ffb64a1c7dd5fdd50566647464a60bd Issue-ID: SO-456 Signed-off-by: c00149107 <chenchuanyu@huawei.com>
2018-03-06Make use of try with resourcesMunir Ahmad1-62/+62
Change-Id: If230b8249d482f7784f885fb4348943c755477cc Issue-ID: SO-437 Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>
2018-03-01Merge "Support query service csar rest"Chuanyu Chen2-11/+132
2018-02-28Support query service csar restc001491072-11/+132
Support query service csar rest Change-Id: I236d09dc96e9065b0a9d6db0a4a4024caa11a875 Issue-ID: SO-451 Signed-off-by: c00149107 <chenchuanyu@huawei.com>
2018-02-27Merge "Make use of getOrDefault"DeWayne Filppi1-7/+7
2018-02-26Make use of getOrDefaultMunir Ahmad1-7/+7
Change-Id: Ic73b58835a7964cb2fd88415f55b03ff79ad33ff Issue-ID: SO-437 Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>
2018-02-27Make use of append instead of string concatenationMunir Ahmad5-60/+60
Change-Id: I94ad658026f165ba8b5a74352095188a27ee50e5 Issue-ID: SO-437 Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>
2018-02-24Remove wrapping of primitive values in objectsMunir Ahmad1-2/+2
Change-Id: I67b1229c7c8d0d82b94857f64a6547d9f57d16b8 Issue-ID: SO-437 Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>
2018-02-21Boolean constructor callMunir Ahmad1-3/+3
Change-Id: Ic5a16598b1f1ac4f53ab651064b872316abafde0 Issue-ID: SO-437 Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>
2017-12-04Remove duplicated constantskurczews1-7/+13
Replace duplicated regex patterns with more verbose constant Change-Id: I21b5a1f8f00b8a8d059ab3998536b205ece892ce Issue-ID: SO-353 Signed-off-by: kurczews <krzysztof.kurczewski@nokia.com>
2017-10-23Iterate over the entrySet instead of keySetrama-huawei1-2/+2
Issue-id: SO-214 Change-Id: I3f417fee04ae1fe2c1d0b7361ec0272e1b098302 Signed-off-by: rama-huawei <rama.subba.reddy.s@huawei.com>
2017-10-05Moved "" string literal on the left side.rama-huawei1-22/+22
Replaced with diamond symbol Removed useless assignment to variables Issue-Id: SO-187 Change-Id: If6fac39f2f8832fe6f7a00ed8f0a221e8d8fb897 Signed-off-by: rama-huawei <rama.subba.reddy.s@huawei.com>
2017-09-30Merge "Repalced StringBuffer with StringBuilder"Seshu Kumar M1-7/+7
2017-09-30Merge "Replaced with Diamond symbol"Seshu Kumar M3-13/+13
2017-09-30Merge "Replaced with Diamond symbol"Seshu Kumar M3-8/+8
2017-09-27Repalced StringBuffer with StringBuilderrama-huawei1-7/+7
Issue-Id:SO-118 Change-Id: I7c69443dc5c17690605c4d1844823fd4307e9ccb Signed-off-by: rama-huawei <rama.subba.reddy.s@huawei.com>