summaryrefslogtreecommitdiffstats
path: root/mso-api-handlers/mso-api-handler-infra/src/test
AgeCommit message (Collapse)AuthorFilesLines
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-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-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 Kuleshov4-36/+1119
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)53-5323/+6091
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-08Workflow Recipe LookupElena Kuleshov3-11/+33
Workflow Recipe Lookup and related Catalog Beans Change-Id: Ib1c3493106658d139861d2620dfb9cb382115744 Issue-ID: SO-1728 Signed-off-by: Kuleshov, Elena <evn@att.com>
2019-04-04Return 200 instead of 202 on WorkflowSpecs GETElena Kuleshov1-1/+1
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)11-1040/+1330
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 Kuleshov7-198/+626
Implement custom workflow execution API Change-Id: I226b83873f44629c203cb9d4a7a2c3fb75e46f87 Issue-ID: SO-1544 Signed-off-by: Kuleshov, Elena <evn@att.com>
2019-03-28Merge "Add WorkflowSpecification Beans for APIH"Steve Smokowski4-0/+239
2019-03-26Add WorkflowSpecification Beans for APIHElena Kuleshov4-0/+239
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)1-2/+2
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 Smokowski2-0/+10
2019-03-18Removed MsoLogger classr.bogacki4-47/+63
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 Kuleshov2-0/+10
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)7-20/+97
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 Smokowski2-7/+27
2019-03-13Added param requestId to query 1 rowBenjamin, Max (mb388a)1-10/+10
Added param requestId to uniquely query 1 row from model distribution status db. Change-Id: Ice8db174166e6a00d211f191dcf5537eef729127 Issue-ID: SO-1651 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-03-13Pass the revised value of usePreload to JSONBenjamin, Max (mb388a)2-7/+27
Pass the possibly revised value of usePreload to JSON going to BPMN. Change-Id: Idc46a8786bc7bbdbf860b59998785c1c885689e4 Issue-ID: SO-1652 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-03-13Merge "Set fromPreload to true for aLaCarte and to false"Steve Smokowski1-1/+65
2019-03-13Updated from 'timeStamp' to 'timestamp'Benjamin, Max (mb388a)2-7/+7
Updated from 'timeStamp' to 'timestamp' in RequestStatus Change-Id: I863c87126e4a58179d82e6fe5d524d72ef57b4f1 Issue-ID: SO-1643 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-03-13Set fromPreload to true for aLaCarte and to falseBenjamin, Max (mb388a)1-1/+65
Set fromPreload to true for aLaCarte and to false for Macro if no usePreload value is specified. Change-Id: I3ca148dc93c03040de32174566dee2bf90851ced Issue-ID: SO-1641 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-03-12add instance group support to SOBenjamin, Max (mb388a)2-7/+71
add create support add delete support added naming service support Change-Id: Iaf4f2bdae8ea55aca71d6e9b818a76e90db0b012 Issue-ID: SO-1616 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-03-07Revert Tenant Isolation /modelDistributions APIBenjamin, Max (mb388a)1-6/+28
Tenant Isolation support PATCH again per AID. Added ModelDistributionRequest class to Jersey Configuration. PATCH JUnit generating 404 - Resource Not Present. Revert Tenant Isolation /modelDistributions API to support PATCH again per AID. Change-Id: I08b4c2b0e080bb4615ebae435ecf18e5c438035d Issue-ID: SO-1603 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-03-04Removed MsoLogger from 'mso-api-handlers'r.bogacki1-11/+6
Replaced MsoLogger with plain slf4j. Refactored login output. Fixed imports. Change-Id: Id0f1e0dda34038d8dbf6894e5d4e6923dc3a8440 Issue-ID: LOG-631 Signed-off-by: Robert Bogacki <r.bogacki@samsung.com>
2019-02-28Junit Test Case Added for AAIClientCallFailed.javaSudarshan Kumar1-0/+35
Junit Test Case Added for AAIClientCallFailed.java Issue-ID: SO-1576 Change-Id: Id9ba99a8268a0c8698f4d913c999ff4a06c3be1f Signed-off-by: Sudarshan Kumar <sudars19@in.ibm.com>
2019-02-26Merge "changed to jdbcUrl and updated flyway for bpmn"Steve Smokowski1-2/+2
2019-02-26changed to jdbcUrl and updated flyway for bpmnKalkere Ramesh, Sharan (sk720x)1-2/+2
Fix startup of catalog, request, bpmn and openstack Change-Id: I5982857c610ae46aa8690764c4f6ef99240f5088 Issue-ID: SO-1558 Signed-off-by: Kalkere Ramesh, Sharan (sk720x) <sk720x@att.com>
2019-02-26check that a la carte is not nullBenjamin, Max (mb388a)2-0/+70
Handle the case of absent aLaCarte and usePreload settings Change-Id: Ic3413515218013870ddce97ec225edaa6b6e99c3 Issue-ID: SO-1571 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-02-24Prevent race conditions on same distributionId.Benjamin, Max (mb388a)2-4/+5
- Code to include optimistic lock to prevent race conditions on same distributionId. Change-Id: Ibe110b32f2472d991a4a3e03e3d15d5e4deefd65 Issue-ID: SO-1566 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-02-22Merge "assignvfmodulebb must send use-preload"Steve Smokowski4-2/+219
2019-02-21updated base yamls to properly connect to DBKalkere Ramesh, Sharan (sk720x)1-2/+2
Fix startup of catalog, request, bpmn and openstack Change-Id: I83dcd17d03c71301610ab2c8bbeb30142cc14303 Issue-ID: SO-1558 Signed-off-by: Kalkere Ramesh, Sharan (sk720x) <sk720x@att.com>
2019-02-20assignvfmodulebb must send use-preloadBenjamin, Max (mb388a)4-2/+219
Corrections to JUnit data to account for usePreload usage. Resurrect usage of usePreload value and pass fromPreload to SDNC. Change-Id: I6fb52f6abf09ec501e90335a01e37db1c10ae2b3 Issue-ID: SO-1539 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-02-19Added the conversion of decrypted valueBenjamin, Max (mb388a)1-0/+12
Added jUnit test for the conversion of decrypted value to Basic Base64Binary. Added the conversion of decrypted value as Basic Base64Binary. Change-Id: I361cbe3dac61df2728c9f58c314a21b3cc764a9f Issue-ID: SO-1531 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-02-13Merge "use encrypted auth for dmaap"Steve Smokowski2-7/+8
2019-01-31use OE from AAI with sdcBenjamin, Max (mb388a)5-19/+50
Updated the SDC API call with the ECOMP OE from AAI relationship instead of VNF OE value. Change-Id: I576ed83364f11213f36781c033f7c2d56f98f1c6 Issue-ID: SO-1451 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-01-28Merge 'origin/casablanca' into masterBenjamin, Max (mb388a)3-6/+10
Issue-ID: SO-1435 Change-Id: If065ef5c91e769452fd6701fa6c28a23b4bdf2b2 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2019-01-25Merge "Removed deprecated Matcher imports"Steve Smokowski3-19/+19
2019-01-24update all inprogress checks in apih handlerBenjamin, Max (mb388a)4-226/+215
Added second mapper for error responses Removed method level ObjectMapper instantiation Fixed formatting of resource file Added db update if responsne from history lookup is empty Fixed url and added it to yaml file Removed space added to the end of line Removed unused test resource file Changed wording of exception message name Added more JUnit tests and fixed auth lookup Added path for checking process-instance history Added ContactCamundaException for camundaHistoryCheck Began adding auth header to send on request to camunda Added unit tests for completed and terminated requests Began adding test for camundaHistoryCheck Added HistoricProcessInstance object for camunda response Test commit, added comment to camundaHistoryCheck Began adding method for checking camundaHistory Change-Id: Ia9d94613fa5e78f2b8690874c39f032d60599e5e Issue-ID: SO-1414 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-01-24Removed deprecated Matcher importsBenjamin, Max (mb388a)3-19/+19
replaced org.mockito.Matchers with ArgumentMatchers Change-Id: I2feb4d4fb314cd14aca0719c4cc29b1a0510cbf7 Issue-ID: SO-1413 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-01-24use encrypted auth for dmaapBenjamin, Max (mb388a)2-7/+8
remove deobfuscate as crypto is already used. update based on the feedback to use crypto utils to decrypt Re-Factor DMAAP Credentials to use encrypted auth credential Change-Id: I2ac5be84594d84f0f24ae554d99cef274dbb6c16 Issue-ID: SO-1425 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-01-22Fix CSAR distribution on CCVPN servicesubhash kumar singh1-4/+3
Fix db schema to allow CCVPN service witout heat artifacts. Change-Id: I4f79881a6a04f01f8984835eea88907a61c640db Issue-ID: SO-1407 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2019-01-21Merge "Bug fixes from AT&T January 20th"Steve Smokowski4-12/+192
2019-01-21Bug fixes from AT&T January 20thBenjamin, Max (mb388a)4-12/+192
sorted vfmodules by base last for negative action reqs store Response in execution as String on network delete added functionality to skip rollback based on flag # Conflicts: # bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflo w/tasks/WorkflowAction.java require XML in the header for delete network request Update APP-C LCM Client library version to 1.7.0. replaced wiremock style test with mockito test Handle AAIClient Exps in CreateCustomerV1 getServiceInstance() changed default status code to be configurable Replace vnfType by nfRole in the healthcheck request to SDNO. updated error messages in sdnc handler and flow status updated flow status message on completion of flow Send GenericVnf object for AAI VNF update for vnf-api updates Add a JUnit test file for SDNOValidatorImpl.java Set nodeType on the inner SDNO request as per update from SDNO. updated rollbackToAssigned logic to remove unassign flows updated sdnc handler error message for client error added exception handling for httpclienterror in sdnc out map workflow exception so error is reported throws sdnc error message on bad response from sdnc add catalog entries for TRANSPORT service delete flows change script number that was duplicate add find method to NorthBoundRequestRepository include serviceType in hash code use asterisk for all non-TRANSPORT flow db entries alacart true, rm not needed transport srvc model steps correct insert query syntax for orchestration_flow support serviceType (TRANSPORT) process flow fix SDNCAdapterException causing no callback to bpmn use JsonAlias for alternate case when deserializing GRM client will accept both "serviceEndPointList" and "ServiceEndPointList" root node in the JSON response. AAIRestClient now uses getSystemName in headers finishtime should not be returned in requeststatus Change-Id: I81a185252b057020f7f36f125c85c3357756da88 Issue-ID: SO-1403 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>