summaryrefslogtreecommitdiffstats
path: root/adapters/mso-catalog-db-adapter
AgeCommit message (Collapse)AuthorFilesLines
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-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-04Merge "Fix Cloud Version" into casablancaSeshu Kumar M1-1/+1
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 Williams3-1/+95
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-24Add ActivitiesBBs to building block detailElena Kuleshov1-0/+13
Change-Id: I96524757c4efb93f5ff03f31a4cf8dcb5fa88025 Issue-ID: SO-1243 Signed-off-by: Kuleshov, Elena (ek1439) <evn@att.com>
2018-11-26Do not validate certain BBsBenjamin, Max (mb388a)1-0/+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-24Fix version string in querysubhash kumar singh1-1/+1
Fix version string in query. Change-Id: Idf990d7f58cc93302670fb270735d71f0a834912 Issue-ID: SO-689 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-11-21Fix Default RecordSmokowski, Steve (ss835w)1-1/+22
Issue-ID: SO-1184 Change-Id: I2708484dce63be8bb043231444aec6eb6438fdae Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2018-11-16Added script with table dataBrittany Plummer (bp896r)1-0/+4
Issue-ID: SO-1224 Change-Id: I38dfb86ae866aa510e16b95f2c86619bc663fe2f Signed-off-by: Brittany Plummer (bp896r) <bp896r@att.com>
2018-11-15Fix auth for catalog dbsubhash kumar singh1-4/+12
Fix auth for catalog db. Change-Id: Ic787993f608b7ddf74167f7859a519ca02b794ed Issue-ID: SO-689 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-11-15vCPE BRG allottedResourceRole is nullRob Daugherty1-1/+1
In Beijing we used: o.getNfRole() In Casablanca, it was: o.getTargetNetworkRole() I'm changing it to: o.getTargetNetworkRole() != null ? o.getTargetNetworkRole() : o.getNfRole() Change-Id: I874b2f01fd651bb38a361fa9c36f9937b1f02b2f Issue-ID: SO-1200 Signed-off-by: Rob Daugherty <rd472p@att.com>
2018-11-14Update SchemaSmokowski, Steve (ss835w)2-0/+5
Issue-ID: SO-1211 Change-Id: I7a7c6788010c3c3bbaba0d72ec656cebc124d6e6 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2018-11-14Merge "Add Ref Data" into casablancaSeshu Kumar M1-0/+10
2018-11-14Add Ref DataSmokowski, Steve (ss835w)1-0/+10
Add Missing reference data for Test cases Issue-ID: SO-1184 Change-Id: Ibf3ed0b802885f64b7d4850b5209932fcf35524a Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2018-11-13Fix the retrival of resource recipesubhash kumar singh1-3/+22
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-3/+6
- 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>
2018-11-07Removed retry from RainyDay tbl for healthCheckBBPrema Bhatt2-0/+4
Updated rainy_day_handler_macro to remove retry for GenericVnfhealthCheckBB and ConfigurationScaleOutBB. Updated file name to be consistent. Issue-ID: SO-1185 Change-Id: If49e5ec8e5d98c1dfad1fdc678a4a7fc45b2566e Signed-off-by: Prema Bhatt <pb6115@att.com>
2018-11-06removed retry from rainy day tablebb34761-0/+18
Issue-ID: SO-1185 Change-Id: I6b972828d1a5b57cbfe532d0b8a79a3a10711b3b Signed-off-by: bb3476 <bb3476@att.com>
2018-11-01Updated Reference data for AutoScaleOutPrema Bhatt1-0/+26
Updated building_block_detail Reference data and added entries into orchestration_status_state_transition_directive table for AutoScaleOut Change-Id: I19a2ea7e217c751be16be5784a8161aab4436285 Issue-ID: SO-1174 Signed-off-by: Prema Bhatt <pb6115@att.com>
2018-10-16Prepare resources for service uuid reqsubhash kumar singh1-2/+9
Retrieve all the resource for queried service uuid. Change-Id: If2beaa27570821c9897387d3b7098a939d99c895 Issue-ID: SO-689 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-10-12Dynamic Cloud Owner SupportBenjamin, Max (mb388a)2-5/+60
added in cloud configuration object to request params Fix Bean scanning so it picks up the resttemplate removed unnecessary RestTemplate Bean configurations corrected typo in CloudConfiguration class updated gr api test cases with dynamic cloud owner updated groovy files to allow for dynamic cloud owner values updated GR API layer to include cloud owner added enum for default cloud owner add cloud owner variable to camunda in mapping removed references to att-aic from BBInputSetup updated aai schema dependency to 1.3.1 from 1.3.0 Fixed incorrect type AAIUri and updated logging in the method. use existing service instance id instead of generating Pass cloudOwner to process to propagate to subprocesses. NOTE: our aai-schema dependency is 1.3.1-SNAPSHOT to be compatible with the cloud owner changes here. The releaesed 1.3.0 version is NOT compatible. Change-Id: I43b46774b77981d1c8bfe7c7a79b9434889e62ae Issue-ID: SO-1128 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com> Signed-off-by: Rob Daugherty <rd472p@att.com>
2018-10-01Merge "Updated Reference data for AutoScaleOut"Rob Daugherty1-0/+7
2018-09-27 Duplicate service entry removedprashank1-4/+0
Change-Id: Icddb4a0ce3454f638cc425e4cf14609a36fa68ea Issue-ID: SO-754 Signed-off-by: prashank <prashant.kumar1@amdocs.com>
2018-09-24Add cloudSite Post to catalogDbClientMarcus G K Williams3-5/+52
Issue-ID: SO-1081 Change-Id: I5808292c4b11413dfef07216d2b933b3358e4fae Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2018-09-21Updated Reference data for AutoScaleOutPrema Bhatt1-0/+7
Change-Id: I7a4739a748dda3e34369b2f0fa5ca398ffe8be9b Issue-ID: SO-1083 Signed-off-by: Prema Bhatt <pb6115@att.com>
2018-09-20various bugfixes for casablancaBenjamin, Max (mb388a)1-0/+13
fixed unit tests after addition of A&AI edge label added option for edgelabel between vnf inst group added belongs to in connecting a vnf to instance group - Adding test for getRainyDayHandlerStatusByFlowNameAndServiceTypeAndVnfTypeAndErrorCodeAn dWorkStep method in the catalogdb client correct default RainyDay table search input updated custom resolver to include float and added comment to explain timestamp configuration added a custom resolver and updated snake yaml version Replacing bowman client with restTemplate.exchange | Add Accept and Content-Type to headers Removing the unused imports as well Implementing some review comments for hte tests being ignored Replacing bowman client with restTemplate.exchange |Fixing Junits Replacing bowman client with restTemplate.exchange | Making Data inserts to go specifically in requestDB Replacing bowman client with restTemplate.exchange | Adding Junits Replacing bowman client with restTemplate.exchange | Adding Junits Replacing bowman client with restTemplate.exchange | Adding Junits Replacing bowman client with restTemplate.exchange - Updated tosca parser version to 1.4.3 and upgraded vnfc test case with new csar to pass with latest parser code. added test case for when workflow has not called all flows fixed issue with rollback and retry in workflowaction Reverted homing changes and changes assign vnf to use the homing produced GeneralBuildingBlock. fixed unit test to build the correct format hashmap reverted extraction back to LinkedHashMap marshal sdnc output to an object removed unused variables and imports extract response code/message from embedded map add junits to parse SDNC assign response removed missed org.openecomp.mso imports from bpmn Change-Id: Ib2b6591a744ecb5b08c522494cdf1ad7dae18a08 Issue-ID: SO-1069 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-09-20Update LoggingSmokowski, Steve (ss835w)1-1/+1
Update logging to meet Casablanca Spec Change-Id: I029d6c63765992d6f091d96e2b4c34c60d30c484 Issue-ID: SO-947 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2018-09-17Accept VNF Recreate RequestsBenjamin, Max (mb388a)1-0/+5
Updated nfRole in sample catdb json response Added gr-api-default recipe for recreate Updated description in catdb response json Updated catdb response file to have the correct action Added action to common package Removed requestor ids and source from test requests Began adding recreate endpoint and tests Began adding validation for recreate and junit tests Change-Id: I60c588be104b82b2d0dfb8587069e04f7b4710be Issue-ID: SO-1057 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-09-08stability fixesBenjamin, Max (mb388a)2-0/+9
fixed bean error fixed execution variable name do not explicitly set hibernate objects Removed remaing references to tunnel-xconnect fixed virtual link case Change-Id: Ia5a59794e84beadcbf259efb899878cc4465ca57 Issue-ID: SO-997 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-09-08added generic fabric support to SOBenjamin, Max (mb388a)5-6/+167
Fix Autoincrement of ID field in table Fix accidental removal of method Update usage of requestdb client removed unused imports in common tasks and test Fix broken branch, have unit tests pass references the Epic branch Fix broken branch from compiling committing classpath for vfc adapter cause its not going away added in the fail case for when there are no profiles removed second set of adapters in application test yml removed double adapters in request db application test added jpa repo dependency to the so bpmn folder pom add creation timestamp column to the table added in null checks for Config returned from policy switched to string in requestprocess with jenerate switched to string in requestprocess with jenerate updated aai version in common pom to 605 from 591 renamed the db scripts for flyway sync to register added endpoint to application test yml for failing test ... Change-Id: I800f837ea75d7cdff740dc3a387e4d7654cfd085 Issue-ID: SO-972 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-09-03fixed sonar issue in WebSecurityConfigImpl.javaSandeep J1-1/+3
fixed sonar issue detailed in SO-874 Issue-ID: SO-874 Change-Id: Ie14f5376566642d75123e23764bf6f7869861393 Signed-off-by: Sandeep J <sandeejh@in.ibm.com>
2018-09-01Logging ImprovementSmokowski, Steve (ss835w)4-6/+45
Add Spring interceptor to log all the SpringDataRest calls Issue-ID: SO-947 Change-Id: Ia1a574cedd90e79bb2fd30a094831dc5cd269ff0 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2018-08-31Merge "Update Logging"Rob Daugherty3-7/+2
2018-08-31Update LoggingSmokowski, Steve (ss835w)3-7/+2
Add CXF interceptor for SOAP based logging Clean up extra logging statements Add UT to ensure MDC properly populated Change package name on Jax-RS Filter to be more accurate Issue-ID: SO-947 Change-Id: I3a2afc58de3bf370675658ce3d19cf899b90def7 Change-Id: I3a2afc58de3bf370675658ce3d19cf899b90def7 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2018-08-30Create a Reference Table for Controller SelectionRob Daugherty2-0/+22
Also: Modify Alacarte Reference Data This commit consolidates changes from three abandoned commits: https://gerrit.onap.org/r/60959 https://gerrit.onap.org/r/60953 https://gerrit.onap.org/r/60397 Change-Id: I295a79cb05ca742ae5743892397e75c7c228bde3 Issue-ID: SO-763 Issue-ID: SO-676 Signed-off-by: Rob Daugherty <rd472p@att.com>
2018-08-28Converted ServiceInstances to catalog db clientBenjamin, Max (mb388a)5-39/+337
- Fixed issues related to created Date Format, enabled required Test - Fixed issues related to queryParam names, enabled required Test - Fixed issues related to queryParam names - Improving coverage for catalogDbClient by another 10% (its 78% now) - Improving coverage for catalogDbClient by another 10%. There is a failing test which will be explored shortly - Improving coverage for catalogDbClient, adding some tests and their basic asserts - merging with dev and resolving the compilation issue arising due to it - Removing some TODO introduced in code for incremental pushes - Fixing failing unit test cases with the build - Refactoring done for code change in catalogDBClient - merged changes with development branch - Modified unit tests for Catalogdb Client related code - Modified unit tests for Catalogdb Client related code - Fixed some of the repository code for retrieving single resource - Modified unit tests for Catalogdb Client related code - Modified unit tests for Catalogdb Client related code - Modified unit tests for Catalogdb Client related code - Removed @Param from repositories and added -Parameters argument in maven compile plugin ... Change-Id: Ieeb7bcc21a573465e485fedfbbe771c8b89db3f8 Issue-ID: SO-925 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-08-27Merge "fixed sonar issue in QeruServiceNetworks.java"Seshu Kumar M1-1/+2
2018-08-27fixed sonar issue in CatalogDbAdaptorRest.javaSandeep J1-2/+2
removed unsused imports Issue-ID: SO-908 Change-Id: Ib730929e8f255274bf85124ca7a8fcc31b95b051 Signed-off-by: Sandeep J <sandeejh@in.ibm.com>
2018-08-27fixed sonar issue in QeruServiceNetworks.javaSandeep J1-1/+2
removed unused import at line 31 Issue-ID: SO-907 Change-Id: If7cbb9ab074a6e7477dbf1b3eff02f372b75b59f Signed-off-by: Sandeep J <sandeejh@in.ibm.com>
2018-08-24Merge "Created Ref Data tbl for controllerSelection"Marcus Williams1-0/+8
2018-08-24retired flows no longer in useBenjamin, Max (mb388a)1-0/+8
corrected spelling for migration sql file delete 1802-style flow, MSO to create l3network in AAI Revert "retire 1802-style flow, MSO to create l3network in AAI" retire 1802-style flow, MSO to create l3network in AAI Change-Id: I0a63d086891565c2346424a3d1b49ce974f5db24 Issue-ID: SO-901 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-08-23Created Ref Data tbl for controllerSelectionPrema Bhatt1-0/+8
RD: I rebased this and fixed the unit tests. Issue-ID: SO-763 Change-Id: Ie5f6a708cffbc70a9481afd35db3047fe44cb088 Signed-off-by: Prema Bhatt <pb6115@att.com> Signed-off-by: Rob Daugherty <rd472p@att.com>
2018-08-23Merge "Changed RequestFactory for Catalog DB client"Rob Daugherty3-23/+85
2018-08-23Changed RequestFactory for Catalog DB clientBenjamin, Max (mb388a)3-23/+85
- Missed some files, the repository isn't required now that we dont fetch the identity service directly - Fixing review comments and removing the unused import - Fixing the build :) Now that cloudSite has a 1-1 relationship with cloudidentity, there shouldn't be a need to query the identity on its own unless the site is missing Refactored some code to use site to fetch identity as a composition - Changing the catalogDb client to use HttpComponentsClientHttpRequestFactory instead of SimpleClientHttpRequestFactory, the later would lead to a IOException (FileNotFoundException specifically) whenever a 40X type of a response code is returned from the spring rest endpoint. Adding some tests for the catalogDbClient which earlier got missed in handover. Also fixing another issue with cloudSite repository which was not fetching data correctly. Fixed a repository which was added initially but later the same went missing (Not sure how) Change-Id: I72506865c4c5f7fd07a6031c146a4aba1a96c2c8 Issue-ID: SO-892 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-08-23Renamed migration from version 4.2 to 4.3Benjamin, Max (mb388a)1-1/+1
renamed migration from 4.2 to 4.3 to avoid collision Change-Id: Ie7ecb089555c5150d3e66d9e6de62f8228d1d373 Issue-ID: SO-891 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-08-23fixed sonar issue in CatalogQueryExceptionCommonSandeep J1-1/+2
fixed sonar issue: removed unused import Issue-ID: SO-883 Change-Id: Ie9117601c7d64974067b5ab81ccb8a58d4a2fdc5 Signed-off-by: Sandeep J <sandeejh@in.ibm.com>
2018-08-23Merge "resolved sonar issue in QueryServiceMacroHolder"Byung-Woo Jun1-4/+6
2018-08-23resolved sonar issue in QueryServiceMacroHolderSandeep J1-4/+6
removed the commented lines of code as per issue raised by SONAR Issue-ID: SO-881 Change-Id: Ic25a7418df06c7b7da2c60bec9dc4adbc97d902b Signed-off-by: Sandeep J <sandeejh@in.ibm.com>
2018-08-15Merge "Cloud Config Updates"Rob Daugherty1-0/+122