summaryrefslogtreecommitdiffstats
path: root/adapters/mso-catalog-db-adapter/src/main
AgeCommit message (Collapse)AuthorFilesLines
2019-05-24Persist native CM workflows in CatalogDBElena Kuleshov1-1/+7
Add native CM workflows to Workflow table to make them available to VID Issue-ID: SO-1942 Signed-off-by: Kuleshov, Elena <evn@att.com> Change-Id: Ifbf3ed8a513f4704583df8a565dba97344702ede
2019-05-22Add SO Update the repeatable Macro - northbound_request_ref_lookupBonkur, Venkat (vb8416)1-0/+1
Added dublin - Update repeatable Macro not to lose the ability to drive flows differently based on service type. UPDATE northbound_request_ref_lookup SET SERVICE_TYPE = '*' WHERE SERVICE_TYPE = NULL; Issue-ID: SO-1892 Signed-off-by: Bonkur, Venkat (vb8416) <vb8416@att.com> Change-Id: I3fa58559fe4596b3a0e184a8391ac93fb9496a26
2019-05-21Merge "Missing modifications for DistributeTraffic actions" into dublinSteve Smokowski1-0/+15
2019-05-21Missing modifications for DistributeTraffic actionsLukasz Rajewski1-0/+15
Added input parameters for DistributeTraffic and DistributeTrafficCheck action Change-Id: I423979f6e8a682bff2aaff02bba4d79d2fbe22c8 Issue-ID: SO-1553 Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
2019-05-21Add SO WFD activity BBs to building_block_detailBonkur, Venkat (vb8416)1-19/+47
Added dublin-WFD activity BBs to building_block_detaili tbl Also updated the resource_type to NO_VALIDATE where target_action is CUSTOM During the execute of the Activity building blocks for the Workflow Designer running into orchestrationStatusValidation exception as it could not find the activity's name in building_block_detail table. Updated the test/resources/data.sql to reflect the above changes Issue-ID: SO-1901 Signed-off-by: Bonkur, Venkat (vb8416) <vb8416@att.com> Change-Id: I9a5c60fc818ec4abc18005e3ef9b8c7b3313f55d
2019-05-16Fix CloudOwner Capitalization in R__MacroData.sqlMarcus G K Williams1-144/+144
Issue-ID: SO-1889 Change-Id: I2f964ba9ca7dbeb73796853d367b090cb5c26c0f Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2019-05-11Fix default Generic NeutronNet template errorYang Xu1-3/+3
Change-Id: Ifff06e6b0e37a6c0689ddca925386fdf671366f2 Issue-ID: SO-1873 Signed-off-by: Yang Xu <yang.xu3@huawei.com>
2019-04-25Add SO update config file -application.yaml fileBonkur, Venkat (vb8416)1-2/+1
Added to Dublin branch- update the catalog-db-adapter -application.yaml file Remove the below line for flyway so that repeatable scripts are run. repeatableSqlMigrationPrefix: RATT Issue-ID: SO-1804 Signed-off-by: Bonkur, Venkat (vb8416) <vb8416@att.com> Change-Id: I54bd6d178d9f4c6854421f099bf393599d46d58f
2019-04-15Conditional Macro Action SelectionSunilB1-11/+15
Update orchestration_flow_reference table and changes in WorkflowActionBBTasks to Conditionally trigger ConfigAssignVnfBB And ConfigDeployVnfBB building block. Change-Id: I1bdb8a77223aef6855e4e1c9aa80dd026892e6f6 Issue-ID: SO-1702 Signed-off-by: sunilb <sb00577584@techmahindra.com>
2019-04-12vnr vrf fk issueBenjamin, Max (mb388a)2-0/+75
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-10Add SO Populate Activity BB Data in Catalog DBBonkur, Venkat (vb8416)2-9/+169
Added SO Populate Activity BB Data in Catalog DB. Populated more data for lookup tables. Created a alter script to make the id as auto increment. Issue-ID: SO-1724 Signed-off-by: Bonkur, Venkat (vb8416) <vb8416@att.com> Change-Id: I281a2a8abe4457fa76553615efccff628c3f6623
2019-04-10Merge "Re-commit some changes which were lost"Steve Smokowski1-15/+0
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-09Add SO Populate Activity BB Data in Catalog DBBonkur, Venkat (vb8416)2-0/+41
Added SO Populate Activity BB Data in Catalog DB. Make the ID columns auto increment activity_spec_categories, activity_spec_to_activity_spec_categories Issue-ID: SO-1724 Signed-off-by: Bonkur, Venkat (vb8416) <vb8416@att.com> Change-Id: Ic59727cd8aa13133d6b5ebde98a249cda180cc9d
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-03skip post instantiation configurationeeginux1-0/+8
Update the schema to include new column Ingest the property from tosca to DB https://jira.onap.org/browse/SO-1671 Issue-ID: SO-1671 Change-Id: Ic6d8d2cfccaa24ba1f9320e4fc2f4255d532fb08 Signed-off-by: eeginux <henry.xie@est.tech>
2019-04-02fix catalogdb cvfnc customizationBenjamin, Max (mb388a)7-46/+165
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-03-22Merge "Add SO Catalog DB tables related to WFD"Steve Smokowski1-0/+175
2019-03-21Add SO Catalog DB tables related to WFDBonkur, Venkat (vb8416)1-0/+175
Added SO tables related to workflow designer workflows Change-Id: Iab90f26a392db8e64e67e751ce89857178a6d625 Issue-ID: SO-1545 Signed-off-by: Bonkur, Venkat (vb8416) <vb8416@att.com>
2019-03-21Corrected hibernate for cfvc customization tableBenjamin, Max (mb388a)1-0/+23
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-13Fix Neutron NetworkSmokowski, Steve (ss835w)1-0/+32
Correct spacing in the YAML for insertion to db Issue-ID: SO-1609 Change-Id: I00f01ab0e1e25e79336ee63fbed1e9a3448b661c Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2019-03-11DB Schema Change for SO Catalogeeginux2-0/+47
Support PNF and VNF with CDS Meta data Add new table for PNF resource/resource customization add support for blueprint name/version https://jira.onap.org/browse/SO-1606 Issue-ID: SO-1606 Change-Id: I6b8a438be1139859d1902197816dbb8cbcfc095f Signed-off-by: eeginux <henry.xie@est.tech>
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-02-27Fix start upBenjamin, Max (mb388a)2-14/+2
corrected application properties Issue-ID: SO-1558 Change-Id: Ib768d7c72a64a11dbb08eea79c4c9a4f5fb970a6 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-02-26changed to jdbcUrl and updated flyway for bpmnKalkere Ramesh, Sharan (sk720x)1-1/+1
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-25moved flyway under spring namespaceKalkere Ramesh, Sharan (sk720x)1-7/+7
Fix startup of catalog, request, bpmn and openstack Change-Id: Iaa2c3a77f28ca67df7cc9f9b6f98e8b7e1d38181 Issue-ID: SO-1558 Signed-off-by: Kalkere Ramesh, Sharan (sk720x) <sk720x@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-21updated base yamls to properly connect to DBKalkere Ramesh, Sharan (sk720x)1-1/+1
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-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-28Merge 'origin/casablanca' into masterBenjamin, Max (mb388a)18-16/+132
Issue-ID: SO-1435 Change-Id: If065ef5c91e769452fd6701fa6c28a23b4bdf2b2 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@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-22Fix CSAR distribution on CCVPN servicesubhash kumar singh1-0/+5
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-21Bug fixes from AT&T January 20thBenjamin, Max (mb388a)1-0/+7
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-17Change size for resource inputsubhash kumar singh1-0/+10
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-12Merge "Re-enable Actuator for Springboot 2.0"Steve Smokowski1-4/+4
2019-01-11Service Proxy ConsolidationBenjamin, Max (mb388a)1-0/+44
- 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/+4
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-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>
2019-01-06Merge "Remove Swagger UI"Seshu Kumar M22-808/+17
2018-12-24update request input and sequence to DBsubhash kumar singh5-1/+22
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-12-12Merge "Added check for nullpointer exception"Steve Smokowski1-2/+3
2018-12-10fix homing_instances table createEric Multanen1-1/+3
specify the catalogdb in the script to create the homing_instances table. Renamed file to begin with 'V' instead of 'v' Not sure if that matters or not. Change-Id: I35533ae5e22c23b8c1817fe8c373e40fa434f873 Issue-ID: SO-1306 Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>
2018-12-05Fix App YamlsSmokowski, Steve (ss835w)1-2/+1
Fix application yamls to use springboot 2.0 properties Issue-ID: SO-1281 Change-Id: I6a24fb3bef41477b893649f2110066ba6021141f Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2018-12-05Add Cloud OwnerSmokowski, Steve (ss835w)2-0/+782
Update ref data, turn test into integration test Fixed junit test to use cloudOwner as "my-custom-cloud-owner". Fixed junit test case for the new method. updates to the junit test case for Update WorkflowAction.queryNorthBoundRequestCatalogDb to have cloud-owner as a param Add a new method to CatalogDBClient- getNorthBoundRequestByActionAndIsALaCarteAndRequestScopeAndCloudOwner() Update Repeatable Migration to have CloudOwner Populated for all Records Add New Migration Script to Add Cloud_Owner Column to North_Bound_Request Table Add Cloud_Owner Field to Java Bean, as a String Change-Id: I9f135be8923626c6d6f6b4ae23e4cbc0200067e2 Issue-ID: SO-1276 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2018-12-04Fix auth for catalog dbsubhash kumar singh1-4/+11
Fix auth for catalog db. Change-Id: Ic787993f608b7ddf74167f7859a519ca02b794ed Issue-ID: SO-689 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-12-04Merge "Fix Cloud Version" into casablancaSeshu Kumar M1-1/+1
2018-12-03Added check for nullpointer exceptionChandan Ghosh1-2/+3
Added check for nullpointer exception Issue-ID: SO-1263 Change-Id: I6a888643e3232426773b8785b224732f51983734 Signed-off-by: Chandan Ghosh <cghosh12@in.ibm.com>
2018-11-30Fix Cloud VersionSmokowski, Steve (ss835w)1-1/+1
Issue-ID: SO-1184 Change-Id: I6dcffafa489bb96100d5f67b09cef50a56dddf14 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2018-11-30Fix alacarte homing flowsMarcus G K Williams1-0/+7
This fix adds homingInstance bean and stores homing info in the database. It then retreves that info when homing ala carte and populates homingSiteId and oofDirectives. SO-1254 Issue-ID: SO-1258 Change-Id: I6f8d5d3aff9ebeb669064a02926c779886dc59dd Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>