summaryrefslogtreecommitdiffstats
path: root/mso-catalog-db/src
AgeCommit message (Collapse)AuthorFilesLines
2019-06-06Accommodate WAN NetworkingGamboa, Gilbert4-12/+37
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 Smokowski22-457/+180
Change-Id: I551ea3f29a76dc99532455ea4d7e84a316f9bf38 Issue-ID: SO-1980 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2019-05-31issue encoding openstack errorsSmokowski, Steven1-2/+11
Fix setting of port to fix unit test issues Fix formatting error on the file causing build issue Properly revert change that was made previously Fix issue where base java library not encoding properly Change-Id: I2bfa46825d9a99998195dbd7bd422f88fa76ef09 Issue-ID: SO-1965 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-05-31Corrected enum formatting by pluginBenjamin, Max (mb388a)3-12/+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-25Use lowercase for table names in beansElena Kuleshov3-3/+3
Uppercase table names cause issues on db queries Issue-ID: SO-1969 Signed-off-by: Kuleshov, Elena <evn@att.com> Change-Id: I468cfc6635c68771caf04a1f75d336559877d288
2019-05-23Renamed NF fields in catalog db pojoMerkel, Jeff1-17/+17
- Renamed Nf properties to just Function, Role, Type. Change-Id: I0cec751e783c1fb7abdcf9f9565eadf89e0ac32c Issue-ID: SO-1914 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-05-21Add SO WFD activity BBs to building_block_detailBonkur, Venkat (vb8416)1-21/+46
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-17Fix bad query, adjust sql to use non-att bbSmokowski, Steven1-1/+1
Fix bad query, adjust sql to use non-att bb Change-Id: Ifb231dee77242b37b1d8145f5a33fb3a87974b63 Issue-ID: SO-1895 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-05-10Update Rainy day handling to be more robustSmokowski, Steven3-23/+38
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-09Add missing UserParametersRepositoryElena Kuleshov1-0/+30
Add missing UserParametersRepository Change-Id: Iba30896cab00687fcfb6cd5ba703d3579efcac30 Issue-ID: SO-1888 Signed-off-by: Kuleshov, Elena <evn@att.com>
2019-05-15Use workflow's name for invocationElena Kuleshov2-4/+4
Use workflow's name for invocation Change-Id: Ie527788f029bdccc91f7f406df0a478e55375c01 Issue-ID: SO-1876 Signed-off-by: Kuleshov, Elena <evn@att.com>
2019-05-05Fix deployment of workflows on startElena Kuleshov3-0/+20
Fix deployment of workflows on start Change-Id: Iaa5cb96020da20c96bedb81e0829f73c7461b67f Issue-ID: SO-1837 Signed-off-by: Kuleshov, Elena <evn@att.com>
2019-05-03Merge "Merge remote-tracking branch 'origin/dublin'"Marcus Williams1-0/+30
2019-05-03Merge remote-tracking branch 'origin/dublin'Benjamin, Max (mb388a)1-0/+30
merged dublin into master branch Change-Id: Ifb78d405611b65764fd4f01558b0e703551ed663 Issue-ID: SO-1830 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com> Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2019-05-01Merge "Correct Catalog DB beans" into dublinSteve Smokowski18-448/+75
2019-04-30Add Model Version QuerySmokowski, Steven12-22/+1093
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-29Check to make sure Heat records do not exist.Merkel, Jeff1-0/+30
- Replaced index assert statements with stream(). - Updated the UT to retrieve from the service object for the assert statements. - Added check to make sure Heat records don't already exist. Change-Id: Ife02303e7b3f5c7d132fb9c1baebaa3787a18494 Issue-ID: SO-1818 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-04-27Correct Catalog DB beansElena Kuleshov18-448/+75
Correct Catalog DB beans Change-Id: Ie9bb4aef606da8c87e5960c95b564fb2fc299869 Issue-ID: SO-1828 Signed-off-by: Kuleshov, Elena <evn@att.com>
2019-04-26Enhancement for querysubhash kumar singh3-8/+38
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 Yang2-0/+12
2019-04-24add resourceInput in vnfczm3302-0/+12
Issue-ID: SO-1393 Change-Id: I643f49df545bef92f0f0e931f7b7ce1a5dbc21c0 Signed-off-by: zm330 <zhangminyj@chinamobile.com>
2019-04-23Merge "Remove unused imports"Seshu Kumar M7-39/+0
2019-04-23Merge "Move variable,constructor to comply with standard"Seshu Kumar M1-27/+27
2019-04-23Merge "Move String literal to left-hand side of equals"Seshu Kumar M1-2/+2
2019-04-23Move String literal to left-hand side of equalsSindhuri.A1-2/+2
Move String literal to left-hand side of equals MavenLikeVersioning class Issue-ID: SO-1490 Change-Id: Ib19caaf367fbf5b85488cd63270186020d46d3ef Signed-off-by: Sindhuri.A <arcot.sindhuri@huawei.com>
2019-04-23Move variable,constructor to comply with standardSindhuri.A1-27/+27
Move variable,constructor to comply with coding standards Issue-ID: SO-1490 Change-Id: Id34939ad5b0be094a1b0301bee62f421b1298096 Signed-off-by: Sindhuri.A <arcot.sindhuri@huawei.com>
2019-04-23Remove unused importsSindhuri.A7-39/+0
Remove unused imports catalog beans classes Issue-ID: SO-1490 Change-Id: I2061c2b293f85d4308c188beccfdb34cb17c3aed Signed-off-by: Sindhuri.A <arcot.sindhuri@huawei.com>
2019-04-23add vnfcInstanceGroup sequencezm3302-0/+13
Issue-ID: SO-1393 Change-Id: Ife3b71dcfa543a693564779da44800f1dd8486e9 Signed-off-by: zm330 <zhangminyj@chinamobile.com>
2019-04-15Conditional Macro Action SelectionSunilB2-1/+24
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-15Merge "Deploy activities to SDC from Catalog"Steve Smokowski2-0/+67
2019-04-15Merge "vnr vrf fk issue"Steve Smokowski3-30/+47
2019-04-12vnr vrf fk issueBenjamin, Max (mb388a)3-30/+47
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-12PNFs are not picked from SNIRO responseBenjamin, Max (mb388a)1-1/+1
vnfHostName with empty value is present. PNFName should be use a key to pnf AAI object (not pnfId). FIxed bug recently introduced in ConfigurationResourceCustomizationRepository. Change-Id: I968ad84d282d9c16ead16d1559a5e790057e6e1e Issue-ID: SO-1785 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-04-12Deploy activities to SDC from CatalogElena Kuleshov2-0/+67
Deploy activities to SDC from Catalog Change-Id: I1c91b79a060889f14cf0b653b3ed1a60e934c8bf Issue-ID: SO-1725 Signed-off-by: Kuleshov, Elena <evn@att.com>
2019-04-11Fix VnfcInstanceGroupCustomization id typeBenjamin, Max (mb388a)3-3/+51
Fix VnfcInstanceGroupCustomization id type Change-Id: I0282d7ead13228fe69e9641a9c356fd5b363a263 Issue-ID: SO-1776 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-04-10Add SO Populate Activity BB Data in Catalog DBBonkur, Venkat (vb8416)2-3/+178
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-09Query CatalogDB for WorkflowSpecificationsElena Kuleshov5-3/+176
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)157-9185/+9043
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 Smokowski22-1/+2108
2019-04-08Workflow Recipe LookupElena Kuleshov22-1/+2108
Workflow Recipe Lookup and related Catalog Beans Change-Id: Ib1c3493106658d139861d2620dfb9cb382115744 Issue-ID: SO-1728 Signed-off-by: Kuleshov, Elena <evn@att.com>
2019-04-08fix delete vfmoduleBenjamin, Max (mb388a)1-1/+1
corrected the vnfc customization id that is passed down add junit for getRelatedResourcesInVnfc method Change-Id: I943952a260191a49c8fc1c0813b1e111448f637b Issue-ID: SO-1759 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-04-04PNF WF post instantiation configurationeeginux4-2/+33
Add PNF ipv4/v6 address for config Deploy Add Integration test for CreateVcpeResCustService_simplified.bpmn Modify the PnfEventReadyDmaapClient to avoid one more running thread Refactor the so-bpmn-infrastructure-flows test resources Modify the CreateVcpeResCustService_simplified.bpmn Add ConfigurePnfResource.bpmn Add Delegates Issue-ID: SO-1506 Change-Id: Iffb69d1441ef0b485ee8cd3fb5da5f1a35279a95 Signed-off-by: eeginux <henry.xie@est.tech>
2019-04-03skip post instantiation configurationeeginux4-0/+25
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)25-1888/+1656
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-28Merge "Config Deploy"Steve Smokowski1-1/+3
2019-03-26Config DeployManamohan Satapathy1-1/+3
SO Generic Building Block to support config deploy action. Change-Id: Ica02a1dae7ba542fad67a5258bc9b4e046d3468a Issue-ID: SO-1482 Signed-off-by: Manamohan Satapathy <MS00534989@techmahindra.com>
2019-03-25PNF ingestion in SO catalogdbeeginux5-17/+10
Support PNF csar ingestion in SO catalogdb Add integation test for TOSCA installer Fix the VNF resource/resource customization insert https://jira.onap.org/browse/SO-1604 subtask so-1607 and SO-1608 are included The catalogdb table contents are attached in the jira Issue-ID: SO-1604 Change-Id: Ie08c4a1219a6cce96ba081b0dd9d3e5fd997da8f Signed-off-by: eeginux <henry.xie@est.tech>
2019-03-23Fix a NullPointerException on getting no data fromBenjamin, Max (mb388a)1-2/+4
Fix a NullPointerException on getting no data from the Catalog DB. Change-Id: Ibeb7206f2427104623943f964afff377ca666d28 Issue-ID: SO-1695 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-03-22Merge "Config Assign"Steve Smokowski1-1/+2
2019-03-21Corrected hibernate for cfvc customization tableBenjamin, Max (mb388a)9-219/+100
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>