aboutsummaryrefslogtreecommitdiffstats
path: root/adapters/mso-catalog-db-adapter/src/main
AgeCommit message (Collapse)AuthorFilesLines
2019-06-25Merge remote-tracking branch 'origin/dublin' into 'origin/master'Benjamin, Max (mb388a)1-144/+144
Change-Id: I2b91332563d9c7b0f469c9e45a35cc1376465c5e Issue-ID: SO-2058 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-06-18Merge "Changes related to eviction of connections"Steve Smokowski3-6/+95
2019-06-18Added Retry in rainy day macro for ConfigDelpoyVnfBB for vDNS CDS use caseAbdelmuhaimen Seaudi1-2/+2
Issue-ID: SO-2026 Signed-off-by: Abdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com> Change-Id: I43689eb6a63843be3a181080173265ed1eda6e9a
2019-06-17Changes related to eviction of connectionsBenjamin, Max (mb388a)3-6/+95
These are changes related to ASDC controller for evicting database connection pool when ip address changes Included other appllications such as requestDB, CatalogDB, API Handler, BPMN, OpenstackAdapter etc Change-Id: I9a96ea12fb0c10643a204a58d55360bebba326fe Issue-ID: SO-2018 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-06-10Fix handling of NULL WorkflowAction northboundRequestMarcus G K Williams1-144/+144
Issue-ID: SO-1995 Change-Id: I16fd6067d4fe31ce66b399e292a7e0706fe05c0c Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2019-06-06Accommodate WAN NetworkingGamboa, Gilbert1-0/+8
checked and evaluated naming policy only if infra bonding. Updated workflowAction to include vrf configuration for vpn-binding in resourceIds list. added in linked resource to service proxy cust committing the asdc controller classpath change added some unit tests for vrf validation and updated bbinput setup test update config resource cust foreign key mapping Moved mockbean for AssignVrfConfiguration task class into BaseBpmnTest. added in a check to see if list is empty before access added unit tests for bbinput setup for vrf config Update AssignFlows enum with correct AssignVrfConfiguration flow name Change-Id: Ibf14e36505638b19c1366ecebfce560c02e69e44 Issue-ID: SO-1975 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-06-06Merge remote-tracking branch 'origin/dublin' into 'origin/master'Steve Smokowski3-176/+225
Change-Id: I551ea3f29a76dc99532455ea4d7e84a316f9bf38 Issue-ID: SO-1980 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2019-06-04Fix northbound_request_ref_lookup SERVICE_TYPE = '*'Marcus G K Williams1-28/+28
Make sure SERVICE_TYPE is not NULL so that GR_API alacarte requests work. Issue-ID: SO-1904 SO-1892 Change-Id: Ib4c617311b17f6d521a3eee0a71a6247d7770d54 Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2019-06-03Fix ConfigAssignVnfBB and ConfigDeployVnfBBAlexis de Talhouët1-1/+6
Change-Id: If5a175ee26e279cf71e38c996a75fa627e5e2c00 Issue-ID: SO-1981 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2019-06-03Fix ConfigAssignVnfBB and ConfigDeployVnfBBAlexis de Talhouët1-0/+5
Change-Id: If5a175ee26e279cf71e38c996a75fa627e5e2c00 Issue-ID: SO-1981 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2019-05-26Modify scaleOut-related settingsElena Kuleshov1-3/+3
Corrections for execution of VfModule-ScaleOut Issue-ID: SO-1972 Signed-off-by: Kuleshov, Elena <evn@att.com> Change-Id: Ia654a223f1e86749d34d78b5918eda38a0a630c7
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-19Recipe retrieval for groupssubhash kumar singh2-2/+18
Recipe retrieval for groups. Change-Id: I2ba68777f3655ebc7794b75d357253022fe7739b Issue-ID: SO-1393 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
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-15store openstack request status in requestdbSmokowski, Steven3-11/+18
Openstack request status now stored in request db Change-Id: Ida8f4f613d406c2b834ab190e01d5aaf2f16dd3d Issue-ID: SO-1867 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-05-10Update Rainy day handling to be more robustSmokowski, Steven1-0/+2
Clean up unused tests and code, update UT Fix issue with junits and conflicts on id field Update Rainy day handling to be more robust Change-Id: I2ce9a1288457017613dece19357e44b8566867c5 Issue-ID: SO-1866 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.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-05-07Update the format of resourceInputzm3301-1/+3
Save format when resource is list type e.g. {key2:[vf_prop_list,INDEX,key]|default} Issue-ID: SO-1393 Change-Id: Ibb5e7bb31114fa3bbd7a3e1af5f2152a98941a4b Signed-off-by: zm330 <zhangminyj@chinamobile.com>
2019-05-03Merge "add resource input Save format when resource is list type e.g. ↵Seshu Kumar M1-0/+2
{key2:vf_prop_list,INDEX,key|default}"
2019-04-30Add Model Version QuerySmokowski, Steven6-0/+219
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-30add resource inputzm3301-0/+2
Save format when resource is list type e.g. {key2:vf_prop_list,INDEX,key|default} Change-Id: I1cde294eb790df0be6df13cfae9959310b93f366 Issue-ID: SO-1393 Signed-off-by: zm330 <zhangminyj@chinamobile.com>
2019-04-26Enhancement for querysubhash kumar singh4-1/+230
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-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-25Merge "Add SO update config file -application.yaml file"Steve Smokowski1-1/+1
2019-04-25Merge "add resourceInput in vnfc Issue-ID: SO-1393"Yan Yang1-1/+5
2019-04-24Add 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-24add resourceInput in vnfczm3301-1/+5
Issue-ID: SO-1393 Change-Id: I643f49df545bef92f0f0e931f7b7ce1a5dbc21c0 Signed-off-by: zm330 <zhangminyj@chinamobile.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-23add vnfcInstanceGroup sequencezm3301-0/+3
Issue-ID: SO-1393 Change-Id: Ife3b71dcfa543a693564779da44800f1dd8486e9 Signed-off-by: zm330 <zhangminyj@chinamobile.com>
2019-04-19Add SO update config file -application.yaml fileBonkur, Venkat (vb8416)1-1/+0
Added Dublin - 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: I2329289e863f32e0e048b8bcc5cfa71d38f407a6
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>