aboutsummaryrefslogtreecommitdiffstats
path: root/adapters/mso-catalog-db-adapter/src
AgeCommit message (Collapse)AuthorFilesLines
2019-04-26Enhancement for querysubhash kumar singh6-1/+369
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 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-10Merge "Query CatalogDB for WorkflowSpecifications"Steve Smokowski2-0/+18
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-09Query CatalogDB for WorkflowSpecificationsElena Kuleshov2-0/+18
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)32-1977/+1906
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 Kuleshov2-0/+18
Workflow Recipe Lookup and related Catalog Beans Change-Id: Ib1c3493106658d139861d2620dfb9cb382115744 Issue-ID: SO-1728 Signed-off-by: Kuleshov, Elena <evn@att.com>
2019-04-04PNF WF post instantiation configurationeeginux1-0/+27
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 configurationeeginux2-1/+11
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)10-304/+187
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)7-39/+66
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-25PNF ingestion in SO catalogdbeeginux1-12/+1
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-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)2-77/+37
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-18Removed MsoLogger classr.bogacki1-12/+18
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-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-12add instance group support to SOBenjamin, Max (mb388a)1-1/+9
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-11DB Schema Change for SO Catalogeeginux4-108/+258
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-26removed flyway from bpmn base yamlKalkere Ramesh, Sharan (sk720x)1-1/+1
Fix startup of catalog, request, bpmn and openstack Change-Id: I8e8222e410da58a62beed8cb184c90ebe73aea6c Issue-ID: SO-1558 Signed-off-by: Kalkere Ramesh, Sharan (sk720x) <sk720x@att.com>
2019-02-26changed to jdbcUrl and updated flyway for bpmnKalkere Ramesh, Sharan (sk720x)2-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-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.bogacki3-26/+35
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-14Merge "cloud config migration from openstack to catdb"Steve Smokowski3-6/+358
2019-02-08fix cvnfc bean and repository accessBenjamin, Max (mb388a)2-4/+104
update repository id field type for fix cvnfc bean and repository access Change-Id: Ic4785387ffdbb544e649d9e7be40aed5e0ab9502 Issue-ID: SO-1489 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-02-05provide correct custIdsBenjamin, Max (mb388a)2-0/+150
correct variable name and use bean comparison included object assertion in junit on catalog client update test name to reflect return value fix cvnfc query by 2 customization uuid relationships provide customization ids to module query input Change-Id: I99df11c417230e398f86554d889a40e9d157544c Issue-ID: SO-1466 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-02-04cloud config migration from openstack to catdbBenjamin, Max (mb388a)3-6/+358
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)23-21/+300
Issue-ID: SO-1435 Change-Id: If065ef5c91e769452fd6701fa6c28a23b4bdf2b2 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2019-01-24Fix AR receipe retrivalsubhash kumar singh3-6/+59
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 singh2-6/+38
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)2-2/+15
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>