summaryrefslogtreecommitdiffstats
path: root/mso-catalog-db
AgeCommit message (Collapse)AuthorFilesLines
2019-05-01Merge "Correct Catalog DB beans" into dublinSteve Smokowski18-448/+75
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-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-11corrected inlucde filter for formatterBenjamin, Max (mb388a)1-102/+102
all pom.xml files now have two spaces validation is on for pom.xml files Change-Id: I424ea2e4d6a549f468792e5f90a43f3a97e6c954 Issue-ID: SO-1781 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>
2019-03-20Config AssignSunilB1-1/+2
Generic Bulding block for assign shall trigger controller for config assign action Change-Id: I2da91cccdbff9eacbb225b7f3a7bdbb253be607a Issue-ID: SO-1481 Change-Id: I2da91cccdbff9eacbb225b7f3a7bdbb253be607a Signed-off-by: sunilb <sb00577584@techmahindra.com>
2019-03-18Removed MsoLogger classr.bogacki1-2/+1
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-14Added vnfc support to BB layerBenjamin, Max (mb388a)1-2/+14
added vnfc to gbb for execute bb and bb layer enhance workflow action layer to handle vnfcs Change-Id: I0d39c3aefe66180ed6f2b75a0c946e07ca603261 Issue-ID: SO-1658 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-03-13Merge "Remove service recipes from service object"Steve Smokowski2-2/+18
2019-03-12Remove service recipes from service objectBenjamin, Max (mb388a)2-2/+18
- Added back in the @MapKey = action for the Map. - Added test methods back in for the ServiceRecipe. - Added getter and setter for Service object. - Added code to reference the Service object from ServiceRecipe. - Remove service recipes from service object since service_recipes are manually managed. Change-Id: Ife50d4e6e46da95e0b6f964fdcfda8084da38dea Issue-ID: SO-1612 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-03-12add instance group support to SOBenjamin, Max (mb388a)6-2/+34
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 Catalogeeginux13-1203/+2093
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-02-08fix cvnfc bean and repository accessBenjamin, Max (mb388a)4-2/+89
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)3-16/+162
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-01-28Merge 'origin/casablanca' into masterBenjamin, Max (mb388a)12-11/+273
Issue-ID: SO-1435 Change-Id: If065ef5c91e769452fd6701fa6c28a23b4bdf2b2 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2019-01-22Fix CSAR distribution on CCVPN servicesubhash kumar singh1-6/+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)3-5/+32
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-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-11Service Proxy ConsolidationBenjamin, Max (mb388a)6-253/+98
- 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>
2018-12-24update request input and sequence to DBsubhash kumar singh5-1/+49
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-06fix how we get cloud info in GR_APIKalkere Ramesh, Sharan (sk720x)1-0/+1
added jpa repo for northbound request with a cloudowner Change-Id: I3a2aeb3547f194bc404ed1bc08ba6d8560961a79 Issue-ID: SO-1283 Signed-off-by: Kalkere Ramesh, Sharan (sk720x) <sk720x@att.com>
2018-12-05Add Cloud OwnerSmokowski, Steve (ss835w)2-2/+28
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-11-30Fix alacarte homing flowsMarcus G K Williams3-1/+213
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>
2018-11-27Merge "Fix model vnfresource bean annotation" into casablancaSeshu Kumar M1-0/+3
2018-11-27Fix model vnfresource bean annotationsubhash kumar singh1-0/+3
Fix model vnfresource bean annotation. Change-Id: If18ea766623ad087eae8ac9ea31258dacd192ff7 Issue-ID: SO-1252 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-11-26Do not validate certain BBsBenjamin, Max (mb388a)2-2/+2
changed resource type from CUSTOM to NO_VALIDATE when building block detail is CUSTOM skip validation Change-Id: Ie00fad1f96071703a35b96cc5fe83ce5dc2092bb Issue-ID: SO-1243 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-11-21Add Keystone V3 SupportBenjamin, Max (mb388a)4-3/+34
update JEL with explicit getVariable call set project object into scope object add camunda properties as defaults in application.yaml added exception handling to keystone v3 case added in password method to identity object initial commit of keystone v3 auth support updated json property values with "_name" added new columns to cloud identity Change-Id: Ie08e9893c34d7199197efdb21fe4dd5413b25f44 Issue-ID: SO-1225 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-11-13Fix the retrival of resource recipesubhash kumar singh5-2/+28
Fix the retrival of resource recipe. Change-Id: Iaec1046f487ce61b995d61414dbe4229e8a51115 Issue-ID: SO-1197 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com> (cherry picked from commit 1c831520f085527c9525d8a757e9c0ccddae0219)
2018-11-12Fix OOF Directives processingMarcus G K Williams2-1/+1
- Various fixes to process OOF directives correctly - Add orchestrator userParam Processing to ala carte and vCPE path to ensure multicloud adapter can be called when homing - Fix JsonUtils to accept json object as well as strings - Adds JsonUtils unit tests to ensure json object code works correctly and didn't break previous func. - Fix OOF Homing codes processing of OOF response to match Casablanca response from OOF (including OOF directives) - Add CloudIdentity get and put to catalogDBClient, along with junit tests - to enable creation of cloudSites - Fix serviceResourceId check Issue-ID: SO-1203 Change-Id: Ice9a9d1da2ce0cd4bd11029e3669b30d658fe359 Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>