aboutsummaryrefslogtreecommitdiffstats
path: root/mso-api-handlers/mso-api-handler-infra/src
AgeCommit message (Collapse)AuthorFilesLines
2019-03-13Merge "Set fromPreload to true for aLaCarte and to false"Steve Smokowski2-1/+82
2019-03-13Updated from 'timeStamp' to 'timestamp'Benjamin, Max (mb388a)3-8/+8
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)2-1/+82
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)4-21/+98
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-11Cleaned up MsoLogger classr.bogacki3-6/+0
Removed setServiceName method from MsoLogger. Cleaned up unused methods from MsoLogger. Change-Id: I1fe033ed25dda32c07693a5087bf65de3ecc229c Issue-ID: LOG-631 Signed-off-by: Robert Bogacki <r.bogacki@samsung.com>
2019-03-08Merge "Cleaned up MsoLogger from 'mso-api-handlers'"Steve Smokowski1-308/+142
2019-03-07Merge "Revert Tenant Isolation /modelDistributions API"Steve Smokowski4-9/+36
2019-03-07Cleaned up MsoLogger from 'mso-api-handlers'r.bogacki1-308/+142
Replaced MsoLogger with plain slf4j. Refactored login output. Fixed imports. Change-Id: Ie94df7dbe4ce05ab7de77318401473390f822d1e Issue-ID: LOG-631 Signed-off-by: Robert Bogacki <r.bogacki@samsung.com>
2019-03-07Revert Tenant Isolation /modelDistributions APIBenjamin, Max (mb388a)4-9/+36
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-07Cleaned up MsoLogger from 'mso-api-handler-infra'r.bogacki1-1/+0
Removed unnecessary MsoLogger. Change-Id: I95f839c924fe7a2b1977f4e50632f230888790ce Issue-ID: LOG-631 Signed-off-by: Robert Bogacki <r.bogacki@samsung.com>
2019-03-06improvements to audit inventory featureBenjamin, Max (mb388a)1-0/+1
Adjust test data to add tenant mapping Remove unused unit test already renamed Update logic, to pass hostname not pservername remove unused file that has been refactored Add project to ignore, remove class Address issues in comments on pull request Remove logging that is not needed, used UPdate BPMN to use Boolean Value, change timings Adjust BPMN to not hit deadlock scenario put error message in execution before checking rollback - removed extra code for vnf resource processing found in onap environment. Fix improper use of inclusive gateway causing deadlock Fix flakey unit tests from ONAP Remove qualifier on bean, as it breaks callbacks Adjust pom version of external camunda client Fix polling timers to be more reasonable Updated Junit test for delete vf module in onap. Changed auditInventoryNeeded variable to a boolean to prevent bpmn from erroring out in the event this variable is not found on the execution. Update logic to support writing of self link Change-Id: I2f784a0a58a09f303775282c9be6019031668570 Issue-ID: SO-1597 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-03-04Removed MsoLogger from 'mso-api-handlers'r.bogacki23-156/+220
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-28Merge "Junit Test Case Added for AAIClientCallFailed.java"Steve Smokowski1-0/+35
2019-02-28CorrelationId cleanupJoanna Jeremicz1-7/+7
Remove old correlationId field and references from ServiceInstancesRequest and rename correlationId to pnfCorrelationId Change-Id: I5d8861aebe14c68574b6c54bc8d4eadf2967478b Issue-ID: SO-1274 Signed-off-by: Michal Kabaj <michal.kabaj@nokia.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 Smokowski2-5/+4
2019-02-26changed to jdbcUrl and updated flyway for bpmnKalkere Ramesh, Sharan (sk720x)2-5/+4
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)3-3/+71
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 Smokowski5-5/+232
2019-02-21updated base yamls to properly connect to DBKalkere Ramesh, Sharan (sk720x)3-194/+184
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)5-5/+232
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)2-3/+16
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-15Use APIH credentials in 'mso.db.auth'Benjamin, Max (mb388a)1-3/+12
Updated to use methods: env.getRequiredProperty() and msoLogger.error(). Added the msoKey and the CryptoUtils.decrypt() code, and used "mso.camundaAuth". Used APIH credentials in 'mso.db.auth' as source instead of 'mso.camundaAuth' (need decrypt code by CryptoUtils). Change-Id: I66c9d96db8137c1d9a5b56aa33d14587cbaa7b9e Issue-ID: SO-1517 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-02-13Merge "use encrypted auth for dmaap"Steve Smokowski4-13/+14
2019-02-05Removed duplicate classes from api handlerBenjamin, Max (mb388a)6-229/+0
removed duplicate classes Change-Id: I5158e1b8ce197cb8c204e484b87a5411161f3d93 Issue-ID: SO-1464 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-02-01compare resources from openstack to aaiBenjamin, Max (mb388a)1-0/+1
Address Review comments on pull request Update Unit test to have proper variable for testing update logic inside bpmn to reflect proper variable Update unit test to check property for audit Add flag to turn on and off audit behavior Add license headers, remove un-used files Update Building Block Tests and Activity Names Fix additional unit tests in so-bpmn-tasks layer Fix broken Junit Test, and correct Bug in if statement Add annotation to ignore class under test profile Additional bug fixes and unit tests for classes Add Additional JUNITS, add more sample data Add Openstack Audit functionality to Adapter Change-Id: I0492063271e991eefc608b56336a5cdf1d5a7778 Issue-ID: SO-1456 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-01-31use OE from AAI with sdcBenjamin, Max (mb388a)10-43/+96
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-25Merge "update all inprogress checks in apih handler"Steve Smokowski6-234/+293
2019-01-24update all inprogress checks in apih handlerBenjamin, Max (mb388a)6-234/+293
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)4-13/+14
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-24bugfixes jan 24thBenjamin, Max (mb388a)1-0/+6
Fix null pointer exception when no requestParameters are specified Add configurable timer in ActivateVfModuleBB to delay call to SDNC activate - Use raw slf4j logger - use {} formatting Add configurable timer in ActivateVfModuleBB to delay call to SDNC activate - Use raw slf4j logger Add configurable timer in ActivateVfModuleBB to delay call to SDNC activate - removed unused references in test class Add configurable timer in ActivateVfModuleBB to delay call to SDNC activate Update PortGroup objects separately from the parent VCE object - restore setVariable calls back into vce object - they might be needed later. Update PortGroup objects separately from the parent VCE object - updated test class extra call to get PortGroups Update PortGroup objects separately from the parent VCE object - use PortGroup.getInterfaceRole() getter method instead of accessing field directly. Update PortGroup objects separately from the parent VCE object Added back required headers for tenant isolation. removed workflow exception from outmapping in execute Fix possible null ptr exception, fix to add braces. Default networkTechnology in Update as done in Create Fix failing junits, mapper force upper case nwtech update exception builder to properly throw exception error message supporting assign service instance a la carte as well adding in proper exception handling in network rest v1 add the unassign action to R macro data file Change-Id: Ide420514f81b8083b4c76c762c064de199624cf7 Issue-ID: SO-1424 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 Smokowski5-16/+196
2019-01-21Bug fixes from AT&T January 20thBenjamin, Max (mb388a)5-16/+196
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>
2019-01-20ensure data for si matches on macro requestsBenjamin, Max (mb388a)30-79/+1337
Fixed failing ValidationExceptionTest Moved MacroRequest.json to test specific folder Moved resource files to test specific folder Cleaned up comments from UserParamsValidationTest Refactored modelInfoValidation method Removed unused constants from ValidationException Removed unused ValidationException ADded overrideExistingMessage boolean Added test for missing modelType in userParams service object Fixed failing JUnit tests in MsoRequestTest Started fixing failing JUnit tests Began adding validation and tests for userParams modelInfo Began adding validation for instanceName Change-Id: I442f6b660af4e716d75746f8d8155aac1e183e80 Issue-ID: SO-1405 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-01-17Change size for resource inputsubhash kumar singh1-3/+3
Change size for resource input. Change-Id: Ic6856e6baa2623867d0ae688c98ed24dbb245036 Issue-ID: SO-1400 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2019-01-15Either log or rethrow this exception.Shubhada Ramkrishna Vaze1-1/+1
Location:GlobalHealthcheckHandler.java Line No:180 Change-Id: I679e99774cee228dc239f0403a44be223fdd46cd Issue-ID: SO-1360 Signed-off-by: Shubhada Ramkrishna Vaze <SV00449682@TechMahindra.com>
2019-01-12Merge "updated logging to JaxRsFilterLogging"Steve Smokowski3-107/+163
2019-01-12Merge "Re-enable Actuator for Springboot 2.0"Steve Smokowski1-4/+3
2019-01-11Service Proxy ConsolidationBenjamin, Max (mb388a)1-38/+25
- Updated ServiceProxyResourceCustomization to remove the ID column - Removed setConfigurationResourceCustomization from serviceProxyResource since that relationship doesn't exist anymore - Updated ServiceProxy resource to remove the object dependencies between ServiceProxyCustomization and ConfigurationResourceCustomization - Removed the delete statement since this is causing the test to fail because the service table doesn't exist yet - Updated configuration_customization to drop the serviceProxyCustomization FK - Added migration script to consolidate the ServiceProxy and ServiceProxyCustomization into a single table and migrate the data. - Code changes to support consolidating the ServiceProxy and ServiceProxyCustomization table into a single table Change-Id: I1e49cb22c8b667f157dd1c349b5e36fd06236630 Issue-ID: SO-1380 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-01-11Re-enable Actuator for Springboot 2.0Benjamin, Max (mb388a)1-4/+3
Re-enable Actuator for Springboot 2.0 Change-Id: Icee67885d9bd26d6b6ff8a4fceb9add56926b0a8 Issue-ID: SO-1377 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-01-11updated logging to JaxRsFilterLoggingBenjamin, Max (mb388a)3-107/+163
Changed the MDC sourcing from LoggingInterceptor to JaxRsFilterLogging. Change-Id: Idd807f1bf6d3a5a680f547d09503a53a362cd5d1 Issue-ID: SO-1362 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-01-06Merge "Remove Swagger UI"Seshu Kumar M22-836/+0
2019-01-04Bugfixes for December 2018Benjamin, Max (mb388a)4-11/+14
Changed the way that the cidr is constructed in network utils. added in the if statement to check if selflink already exists removed execution line that was not needed in pull added service instance id to workflowResourceIds for virtualLinkKey network flows wrote test for updating request to complete in db workflow action directly updates db instead of using mso complete process Increase max timeout for SDNO Health Checks dmaap. Added execution variable and corrected type and way data is retrieved to fix defect fixed retry status message in request db for #/5 updated workflowActionBBTasks for flow status message updated flow status to failed on a workflowaction fail Removed slashes and fixed rollbackStatusMessage Updated requestStatus logic for adding status messages Added junit test to validate casue of a defect and cleaned up code and logging added end timestamp to request db on complete request fixed l3Network update of orchestation status in DoUpdateNetworkInstance groovy as well fixed update of l3network orchestration status Add explicit resetting of heatStackId in A&AI to DeleteVfModule and DeleteVolumeGroup BBs. Preserve heatStackId setting in the copiedVfModule when updating the VF Module in A&AI. added functionality to skip rollback based on flag Update snapshot version for logging, add headers fixed optional of error in retrieveErrorMessage method Set heatStackId to null if we want to remove it in A&AI. added in a warn logger statement to keep track of field map network technology from l3network instead of model info for network adapter object mapper Force heatStackId value to empty on an attempt to set it to null on update updated common pom to use aai schema version 1.4.1 removed handle sync error from SDNCHandler bpmn flow Change-Id: I1bd7aa55b06d4e439000b216165c9daafeacc9a4 Issue-ID: SO-1361 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-01-04Merge "Added timeStamp to requestStatus returned"Steve Smokowski4-11/+29
2019-01-04HttpClientFactory to create HttpClient instancesMichal Kabaj1-4/+3
-Replace constructor calls with existing factory -Add create methods to factory for each required Media Type Change-Id: Ibd03c10230c87a0413c0ec529e0ea9ac800444f9 Issue-ID: SO-1344 Signed-off-by: Michal Kabaj <michal.kabaj@nokia.com>