aboutsummaryrefslogtreecommitdiffstats
path: root/mso-api-handlers/mso-api-handler-infra/src
AgeCommit message (Collapse)AuthorFilesLines
2019-06-03Cleaned up duplicated literalsrob.bog7-61/+73
Cleaned up Sonar code smells related to the duplicated literals in loggers. Issue-ID: SO-1932 Signed-off-by: Robert Bogacki <r.bogacki@samsung.com> Change-Id: I58c48cec0012c42b7b892ae76c24c6a087c60c7e
2019-05-31apih resume request handling more genericPlummer, Brittany6-152/+648
getInstanceName throws exception if requestScope doesn't match modelType Updated to combine separate return statements Replaced if statements for modelType and added tests Replace if statements for modelType in ResumeOrchestrationRequest and added tests Added coverage for setId in ModelType Updated to use ModelType setters/getters model type can now get and set generically Added modelInfo to RequestBody for resume request Added getModelType call and unit tests Moved getModelType from ServiceInstances Moved getModelType and added unit tests Added tests for getIsBaseVfModule Added more tests for isBaseVfModule Began adding tests for getIsBaseVfModule Updated currentActiveRequest creation and isBaseVfModule Updated recipe lookup and setting of aLaCarte to be more general Updated concurrency control to include other resources Change-Id: I12ad011d0a021c3ee066e16b4c8a4526d040cbe3 Issue-ID: SO-1963 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-05-31Merge "Corrected enum formatting by plugin"Steve Smokowski2-4/+32
2019-05-31Corrected enum formatting by pluginBenjamin, Max (mb388a)2-4/+32
enums are now single item per line Change-Id: I6330ea4a9093071457dd47b95b6ed3bb7f8312e7 Issue-ID: SO-1970 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-05-31apih to populate original request idPlummer, Brittany6-6/+106
Updated schema.sql to fix failing tests Added constants for request parameters Added originalRequestId to be saved on resume request Added originalRequestId to orchestrationRequests response Change-Id: If2b86d233ee3db9bbe0e1185d92874bca2b3a07a Issue-ID: SO-1960 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-05-31Improvements in AAIClientHelperr.bogacki1-5/+3
Improvements in AAIClientHelper according to the Sonar analysis. Removed unnecessary exception throwing. Fixed imports. Updated java docs. Issue-ID: SO-1958 Signed-off-by: Robert Bogacki <r.bogacki@samsung.com> Change-Id: I60835304466bb656f09ba16b487907fa529e5eab
2019-05-17Initial checkin of updates for vf module replaceSmokowski, Steven4-30/+274
fix toString method and add unit tests for new code Fix Null pointer issue in UT, extra chars Initial checkin of updates for vf module replace Change-Id: I2d62f5c2077cd022ccf796d126494e526ad48c54 Issue-ID: SO-1893 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-05-10APIH should ensure valid requestId UUIDBhatt, Prema3-7/+40
Added logic to check if the requestId sent in GET orchestrationRequest query is a valid UUID. Updated existing unit tests and added a new test for invalid UUID scenario. Change-Id: I424bef8aa75dd7e47de8145603899820dfb99725 Issue-ID: SO-1865 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-05-07Fix resourceIndex to modelsubhash kumar singh1-0/+11
Fix resourceIndex to model in json mapping. Change-Id: Ia609d3eb381b14fc5654774e83f8417a4d876e91 Issue-ID: SO-1393 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2019-05-05Resume APIH FunctionalityPlummer, Brittany11-77/+776
Updated license for 2019 and added null check test Moved record creation to RequestHandlerUtils Updated uri retrieval to obtain full uri Updated verify based on actual objects Renamed tests for better description Removed use of Spring in unit tests Moved constant to other logger files Added new class to JerseyConfiguration Separated resume request work to separate file Updated value that progress is saved as in db Added new original_partner_name key for partnername retrieval Added column for progress to be saved to db Added additional columns to be saved to requestDb Added inProgress request check to resume Change-Id: I9ef1e61829be49da348b29bc255beb073b48639d Issue-ID: SO-1831 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-04-30Add Model Version QuerySmokowski, Steven1-3/+4
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-29Merge "Store Cloud Request in Database"Steve Smokowski4-84/+127
2019-04-28Store Cloud Request in DatabaseSmokowski, Steven4-84/+127
Store Cloud Request in Database, add to request service Add query Param to Plural to include cloud data Change-Id: If906d28d0dc9c0c804e550e2074af3d75ba46d32 Issue-ID: SO-1807 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-04-27Sonar comments fixedSubhosree Pan1-2/+1
Removed commented lines/ Change static string litrals name according to the guidelines. Issue-ID: SO-1490 Change-Id: I77a0b2a5067d71ede2de8e090ed4d0b1fb61e219 Signed-off-by: Subhosree Pan <subhosree.pan1@huawei.com>
2019-04-27Sonar comments fixedSubhosree Pan3-32/+34
Removed commented lines/ Change static string litrals name according to the guidelines. Issue-ID: SO-1490 Change-Id: I4ffee97269f0f0bdcb23f5b297df8fddb0c133f1 Signed-off-by: Subhosree Pan <subhosree.pan1@huawei.com>
2019-04-27comments updatedSubhosree Pan2-2/+2
String constant added as per the guidance, commented out codes has been removed Issue-ID: SO-1490 Change-Id: Ia7a531580eaafd80900200b1cf5122c1a8b9f511 Signed-off-by: Subhosree Pan <subhosree.pan1@huawei.com>
2019-04-26Enhancement for querysubhash kumar singh1-0/+1
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-25Merge "add resourceInput in vnfc Issue-ID: SO-1393"Yan Yang1-0/+1
2019-04-24Merge "removal of unused file imports. removal of unused file imports. ↵Seshu Kumar M1-1/+1
Issue-ID: SO-1490"
2019-04-24removal of unused file imports.Subhosree Pan1-1/+1
removal of unused file imports. Issue-ID: SO-1490 Change-Id: I35c09f25f363c7da276beece4fff854f8f42a2f8 Signed-off-by: Subhosree Pan <subhosree.pan1@huawei.com>
2019-04-24add resourceInput in vnfczm3301-0/+1
Issue-ID: SO-1393 Change-Id: I643f49df545bef92f0f0e931f7b7ce1a5dbc21c0 Signed-off-by: zm330 <zhangminyj@chinamobile.com>
2019-04-23add vnfcInstanceGroup sequencezm3301-0/+1
Issue-ID: SO-1393 Change-Id: Ife3b71dcfa543a693564779da44800f1dd8486e9 Signed-off-by: zm330 <zhangminyj@chinamobile.com>
2019-04-19Merge "Remove unused code and members."Seshu Kumar M1-9/+2
2019-04-19remove unused code and added loggingIsaac Manuel Raj1-2/+3
remove unused code and added logging Issue-ID: SO-1490 Change-Id: Ie9b0fd66d83e355617bf07c1c544daa1843a534e Signed-off-by: Isaac Manuel Raj <isaac.manuelraj@huawei.com>
2019-04-19Remove unused code and members.Isaac Manuel Raj1-9/+2
Remove unused code and members. Issue-ID: SO-1490 Change-Id: I5e2518401c51ac646f0b78b7236b9c88387f20ff Signed-off-by: Isaac Manuel Raj <isaac.manuelraj@huawei.com>
2019-04-15Merge "vnr vrf fk issue"Steve Smokowski1-22/+14
2019-04-12vnr vrf fk issueBenjamin, Max (mb388a)1-22/+14
Updated flyway migration script to rename object as per review comments. Used Tosca node type for determining VRF and VNF nodes updated code based on review comments for schema.sql Altered ConfigurationCustomizationResource for VRF-VNF to have bidirectional relationship ToscaResourceInstaller ConfigurationResourceCustomization was made bidrectional Change-Id: Ib45151ff7a40edca38d512ae76f8889b1cc4d0c4 Issue-ID: SO-1777 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-04-12Updated ServicesInstancesTest with mocksBenjamin, Max (mb388a)2-0/+7
- Updated ServicesInstancesTest with mocks for RequestDb.InfraActiveRequests query. Tests in ServicesInstancesTest were not failing, but seeing 'HTTP method does not match' messages on the console for most of the tests. Change-Id: Ic029cc50da1f414d3228f80b02721e132a15c264 Issue-ID: SO-1783 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-04-09Query CatalogDB for WorkflowSpecificationsElena Kuleshov5-43/+1260
Query CatalogDB for WorkflowSpecifications fron APIH Change-Id: I5eef5ba9b49c0a7420ef93a5425121bfe7225b1b Issue-ID: SO-1727 Signed-off-by: Kuleshov, Elena <evn@att.com>
2019-04-08Replaced all tabs with spaces in java and pom.xmlBenjamin, Max (mb388a)193-15022/+15727
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-08Merge "Workflow Recipe Lookup"Steve Smokowski4-16/+77
2019-04-08Do not overwrite requestIdBenjamin, Max (mb388a)1-0/+2
Added filter to reject requests that reuse request ids for requests db Change-Id: Iced020a9e1bc98c93911966f62ac0049e43e314b Issue-ID: SO-1762 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-04-08Workflow Recipe LookupElena Kuleshov4-16/+77
Workflow Recipe Lookup and related Catalog Beans Change-Id: Ib1c3493106658d139861d2620dfb9cb382115744 Issue-ID: SO-1728 Signed-off-by: Kuleshov, Elena <evn@att.com>
2019-04-05Merge "Fixed Sonar blocker issues"Steve Smokowski1-32/+20
2019-04-05Fixed Sonar blocker issuesr.bogacki1-32/+20
Fixed blockers according to Sonar analysis. Added tests for fixed issues. Change-Id: I8e259147082d722961048454fae9484cc0d8b0a8 Issue-ID: SO-1734 Signed-off-by: Robert Bogacki <r.bogacki@samsung.com>
2019-04-04Return 200 instead of 202 on WorkflowSpecs GETElena Kuleshov2-2/+2
Return 200 instead of 202 on WorkflowSpecs GET Change-Id: I861801f86416b98beea98913b3788da8180dbdf9 Issue-ID: SO-1745 Signed-off-by: Kuleshov, Elena <evn@att.com>
2019-04-02fix catalogdb cvfnc customizationBenjamin, Max (mb388a)12-1041/+1336
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-04-01replace all fixed wiremock portsBenjamin, Max (mb388a)18-434/+457
trying to get the tests that can be threaded to pass started to remove fixed port references Change-Id: I7bfe067a8f36c908039700646571681321e9a6f5 Issue-ID: SO-1676 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-03-29Implement custom workflow APIElena Kuleshov13-791/+1597
Implement custom workflow execution API Change-Id: I226b83873f44629c203cb9d4a7a2c3fb75e46f87 Issue-ID: SO-1544 Signed-off-by: Kuleshov, Elena <evn@att.com>
2019-03-29fix jenkins buildLukasz Muszkieta1-2/+2
Change-Id: If3343b343993476731ab4cd1eb6c5e41d1033c4d Issue-ID: SO-1714 Signed-off-by: Lukasz Muszkieta <lukasz.muszkieta@nokia.com>
2019-03-28Merge "Add WorkflowSpecification Beans for APIH"Steve Smokowski13-0/+1135
2019-03-26Add WorkflowSpecification Beans for APIHElena Kuleshov13-0/+1135
Add WorkflorSpecification beans and handling mechanism Change-Id: Iaabd5696f9ddc4cca87c6fb77da42042b758932d Issue-ID: SO-1543 Signed-off-by: Kuleshov, Elena <evn@att.com>
2019-03-21Merge "Corrected hibernate for cfvc customization table"Steve Smokowski2-53/+97
2019-03-21Corrected hibernate for cfvc customization tableBenjamin, Max (mb388a)2-53/+97
fix two tests that did not ignore some properties fix schema sql file that was missing fields Properly wire hibernate entities, clean up db tables Update schema.sql files to be consistent add junit for customization linked to same cvnfc Change-Id: I4bc0a83cb3908f5b34224416e75446b6cd166b9e Issue-ID: SO-1689 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-03-20Updated to use vnfOperationalEnvironmentIdBenjamin, Max (mb388a)2-4/+5
Updated to use vnfOperationalEnvironmentId to call AAI for PATCH status to ACTIVE. Change-Id: Ic2057b39a737b9636d0a053e097d762430fe991b Issue-ID: SO-1685 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-03-19Merge "Update Tasks API with additional fields"Steve Smokowski5-3/+66
2019-03-18Removed MsoLogger classr.bogacki23-191/+207
Bye bye MsoLogger class. Extracted constants to separated classes. Fixed imports. Change-Id: I7c8e0527e7dbd097d3ea93b9dab279354652da47 Issue-ID: LOG-631 Signed-off-by: Robert Bogacki <r.bogacki@samsung.com>
2019-03-15Update Tasks API with additional fieldsElena Kuleshov5-3/+66
Update Tasks API with additional fields and new valid response Change-Id: I39d85ae599f9274373bbcf66dce4752ee75f16ed Issue-ID: SO-1594 Signed-off-by: Kuleshov, Elena <evn@att.com>
2019-03-14Saved vnfOperationalEnvironmentId to be used laterBenjamin, Max (mb388a)10-26/+136
Removed unnecessary lines in junit test class. Saved vnfOperationalEnvironmentId to the model table to be used for AAI status update call later. Change-Id: I812d21d483d716bb5135c408369a160e4600efc2 Issue-ID: SO-1662 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-03-14Merge "Pass the revised value of usePreload to JSON"Steve Smokowski3-10/+34