aboutsummaryrefslogtreecommitdiffstats
path: root/bpmn/so-bpmn-infrastructure-common/src/test/groovy
AgeCommit message (Collapse)AuthorFilesLines
2019-06-06Merge remote-tracking branch 'origin/dublin' into 'origin/master'Steve Smokowski1-7/+10
Change-Id: I551ea3f29a76dc99532455ea4d7e84a316f9bf38 Issue-ID: SO-1980 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2019-05-01build sndc and user directives in groovyEric Multanen1-7/+10
Fill out the sdnc_directives and user_directives used by the multicloud vnf plugin adapter when invoked via the groovy path. Change-Id: Ia11680be682b38756f188c71e3e000bc21c15aa9 Issue-ID: SO-1822 Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>
2019-04-26 Removed hardcoded values for PNF creation (cvlan, svlan, remoteId)marios.iakovidis1-0/+67
Change-Id: Ie4a63dd06279713c9f13062a09b44eb0e7f2e6bc Issue-ID: SO-1815 Signed-off-by: MariosIakovidis <marios.iakovidis@huawei.com>
2019-04-09Service instance modificationZhuoyao Huang1-0/+301
extend update interface for service instance modification on CCVPN use case extension Issue-ID: SO-1393 Change-Id: Ib21843be32738de0197185906ba38c61f1095f24 Signed-off-by: Zhuoyao Huang <10112215@zte.com.cn>
2019-04-03Fix runtime bugs in bpmn groovyk.kazak3-1745/+690
DoDeleteVfModuleV2: non-existing variable uri (was renamed to resourceUri) DoUpdateNetworkInstance: queryIdResponse type is expected to be L3Network UpdateVfModuleVolumeInfraV1: non-existing variable cloudOwner Include tests for those fixes to build Change-Id: Icaea91260fbf6603f134df893a64ec1ca5ac40ab Issue-ID: SO-1649 Signed-off-by: k.kazak <k.kazak@samsung.com>
2019-04-01replace all fixed wiremock portsBenjamin, Max (mb388a)22-108/+61
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-19Add cloudOwner to VNF adapter callEric Multanen3-0/+5
The BPMN layer has the CloudRegion which includes the CloudOwner attribute, but this is not passed to the VNF adapter layer. Calls to the Multicloud infrastructure workload need the CloudOwner as well. This patch adds CloudOwner to the VNF adapter API. While the intended usage is primarily for the multicloud adapter, it touches a log of other files - though those do not make use of it at this point. Change-Id: I88028096fbd84fc3fe5d53786c70b3c8806bb711 Issue-ID: SO-1447 Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>
2019-03-13Run groovy bpmn/vcpe testsk.kazak11-6286/+5674
Fixed groovy tests in bpmn/vcpe/scripts to be runnable Added them to build Reformatted the code and removed unnecessary imports Change-Id: Id85c88bee666fc7f513042e0a4e83f337ab2765c Issue-ID: SO-1649 Signed-off-by: k.kazak <k.kazak@samsung.com>
2019-01-28Merge 'origin/casablanca' into masterBenjamin, Max (mb388a)3-11/+458
Issue-ID: SO-1435 Change-Id: If065ef5c91e769452fd6701fa6c28a23b4bdf2b2 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2019-01-24Removed deprecated Matcher importsBenjamin, Max (mb388a)6-6/+6
replaced org.mockito.Matchers with ArgumentMatchers Change-Id: I2feb4d4fb314cd14aca0719c4cc29b1a0510cbf7 Issue-ID: SO-1413 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-01-14Add missing license headersBenjamin, Max (mb388a)1-0/+20
add headers to files which were missing them Issue-ID: SO-1390 Change-Id: I6c754f72c5d1ef6485d6343aae4b994120901d08 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-01-11explicitly type defs and strings for templatesBenjamin, Max (mb388a)6-14/+14
explicitly type defs and strings for templates Change-Id: If4af5b0cdf086cd0d30277d1e835e2aa7c8e7f9c Issue-ID: SO-1386 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-01-04Bugfixes for December 2018Benjamin, Max (mb388a)1-22/+23
Changed the way that the cidr is constructed in network utils. added in the if statement to check if selflink already exists removed execution line that was not needed in pull added service instance id to workflowResourceIds for virtualLinkKey network flows wrote test for updating request to complete in db workflow action directly updates db instead of using mso complete process Increase max timeout for SDNO Health Checks dmaap. Added execution variable and corrected type and way data is retrieved to fix defect fixed retry status message in request db for #/5 updated workflowActionBBTasks for flow status message updated flow status to failed on a workflowaction fail Removed slashes and fixed rollbackStatusMessage Updated requestStatus logic for adding status messages Added junit test to validate casue of a defect and cleaned up code and logging added end timestamp to request db on complete request fixed l3Network update of orchestation status in DoUpdateNetworkInstance groovy as well fixed update of l3network orchestration status Add explicit resetting of heatStackId in A&AI to DeleteVfModule and DeleteVolumeGroup BBs. Preserve heatStackId setting in the copiedVfModule when updating the VF Module in A&AI. added functionality to skip rollback based on flag Update snapshot version for logging, add headers fixed optional of error in retrieveErrorMessage method Set heatStackId to null if we want to remove it in A&AI. added in a warn logger statement to keep track of field map network technology from l3network instead of model info for network adapter object mapper Force heatStackId value to empty on an attempt to set it to null on update updated common pom to use aai schema version 1.4.1 removed handle sync error from SDNCHandler bpmn flow Change-Id: I1bd7aa55b06d4e439000b216165c9daafeacc9a4 Issue-ID: SO-1361 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-12-17Merge "Bug fix for getInstnaceId"Steve Smokowski1-0/+118
2018-12-15Bug fix for getInstnaceId黄卓垚101122151-0/+114
CreateSDNCNetworkResource.afterCreateSDNCCall can't get instance id from getInstnaceId in afterCreateSDNCCall for modelName default case is missing Issue-ID: SO-1331 Change-Id: Ic9dab916cc17f0175c42f915d5acf4f817a4321c Signed-off-by: Zhuoyao Huang <10112215@zte.com.cn>
2018-12-15Bug fix for getInstnaceIdZhuoyao Huang1-0/+118
CreateSDNCNetworkResource.afterCreateSDNCCall can't get instance id from getInstnaceId for modelName default case is missing Issue-ID: SO-1331 Change-Id: Ia5eb03131a3137e5eede83a97d5b464e66bd2055 Signed-off-by: Zhuoyao Huang <10112215@zte.com.cn>
2018-12-12Merge "response from aai is now volumeGroups"Steve Smokowski1-1/+4
2018-12-11response from aai is now volumeGroupsKalkere Ramesh, Sharan (sk720x)1-1/+4
AAI Client response is now expected to be VfModules Change-Id: I13be95496fc711656036dab6c7452638a19139bf Issue-ID: SO-1327 Signed-off-by: Kalkere Ramesh, Sharan (sk720x) <sk720x@att.com>
2018-12-10Added quriedVolumeGroupId to createvfModuleKalkere Ramesh, Sharan (sk720x)1-0/+1
Added quriedVolumeGroupId to create Change-Id: Ife1ad6b3f96918b9d96b52ea509a85ecada5c74d Issue-ID: SO-1314 Signed-off-by: Kalkere Ramesh, Sharan (sk720x) <sk720x@att.com>
2018-11-15Accept vCPE vfModuleNames in NB APIRob Daugherty2-7/+457
This affects the vCPE custom flow. You can specify zero or more VF Module names (correlated with the model invariant UUID) in the user parameters, like this: "userParams": [ . . . { "name": "VfModuleNames", "value": [ { "VfModuleModelInvariantUuId": "5366deab-be06-44c7-b4f7-77e657b78b25", "VfModuleName": "VGW:e2:25:25:25:%" } ] } ] Change-Id: I673c04775bf5796079dc0ed19890e73e76820ac0 Issue-ID: SO-1213 Signed-off-by: Rob Daugherty <rd472p@att.com>
2018-11-05Springboot 2.0 upgradeBenjamin, Max (mb388a)27-634/+1570
corrected typo in CloudConfiguration class removed files which should not have been merged updated gr api test cases with dynamic cloud owner updated groovy files to allow for dynamic cloud owner values moved VFModularity folder to mso-infrastructure bpmn updated GR API layer to include cloud owner added enum for default cloud owner - fixing junit test cases for using catalogDb client r2 - fixing junit test cases for using catalogDb client - Internal review comments incorporated for merging mocking into BaseTest - Internal review comments incorporated for removing direct repo calls - CLONE - Key Management Hardcoded encryption key | fixing junits - CLONE - Key Management Hardcoded encryption key Updated builder to use String.format Added exception specifically for issues interacting with requestdbadapter Updated exception message and added junit test case removed useless error handling test case from workflow changed method name and added junit coverage to errors added max retry and success status after completed bb Added case to handle when homing is not called during assign vnf. Fixing fortify issues | Implementing review comments - Key Management Hardcoded encryption key - fixing prop files - Key Management Hardcoded encryption key include network ID for completion handler Added exception handling for saving to requestdb - Adding a check on the predicate availability on the repository before firing the query with default conditions. This ensures that the api returns data only when there is an input against which it was able to form some conditions Modify UT to show that the API does not behave - adding negative test case for checkInstanceNameDuplicate added assertion that global count var was reset to 0 updated rollback to reset current sequence count var workflowaction calls rollback is complete before error workflowaction will set failure on successful rollback added check for isrollback to know which complete to call removed file which should not have been added add fabric check before running vf module a la carte Enhance UCPEMigrateService junits and add them to Jenkins build.. Added back removed test case for ManualTasks Added test case for response error Added rainy day test cases for ManualTasks revert the other change and fix the rollback logic instead fixed current sequence and updated rollback code added network cloud heat template parameters to mapper Generate a unique subRequestId for each request to APP-C. reverted conditional logic for determining fabric Fix Bean scanning so it picks up the resttemplate removed unnecessary RestTemplate Bean configurations removed file which should not have been added workflowaction calls rollback is complete before error workflowaction will set failure on successful rollback added check for isrollback to know which complete to call add fabric check before running vf module a la carte added assertion that global count var was reset to 0 updated rollback to reset current sequence count var include network ID for completion handler Revert Application.yaml change accidentally checked in Added exception handling for saving to requestdb Added case to handle when homing is not called during assign vnf. removed useless error handling test case from workflow changed method name and added junit coverage to errors ... add cloud owner variable to camunda in mapping Revert "Pass cloudOwner to subflow DoCreateVfModuleVolumeV2. Added juint test to verify variables are set in the execution. Set default cloudOwner in main module CreateVfModuleVolumeInfraV2" updated cloud configuration pojo to inlcude defaults Revert "Test to verify ServiceInstance object mapping" Test to verify ServiceInstance object mapping Pass cloudOwner to subflow DoCreateVfModuleVolumeV2. Added juint test to verify variables are set in the execution. Set default cloudOwner in main module CreateVfModuleVolumeInfraV2 Pass cloudOwner to subflow DoCreateVfModuleVolumeV2. Set default cloudOwner 'att-aic' if null per old requirements. removed references to att-aic from BBInputSetup Changes done in encryption decryption logic | used DelegateExecutionFake in Tests Changes done in encryption decryption logic | used DelegateExecutionFake in Tests Changes done in encryption decryption logic Changes done in encryption decryption logic | removed Default Auth Constant as per the comments Changes done in encryption decryption logic | Fixed UT Changes done in encryption decryption logic | Added XmlComparator assertion for verifying XML Changes done in encryption decryption logic | Reverted as per the review comment Changes done in encryption decryption logic | Fixed UTs Changes done in encryption decryption logic | Fixed UTs Changes done in encryption decryption logic | modified related encrypted properties in test yaml files Changes done in encryption decryption logic for fortify issue resolution | Fixed UTs Changes done in encryption decryption logic | modified related encrypted properties in yaml files Changes done in encryption decryption logic for fortify issue resolution. Fixed Property fetching issue in required file Added TasksBeansTest using openpojo Removed renamed test file from tasksbeans Updated imports on TasksBeansTest Added openpojo test to replace the individual tests Removed tests that provided no coverage script clean up -Update reference data to support distinct recreate and replace requests with their own sequences Update reference data to support distinct recreate and replace requests with their own sequences- Fix seq number Update reference data to support distinct recreate and replace requests with their own sequences added null check to mdc and interceptors to sdnc cxf validations can now match against multiple BBs reverted changes to BBInputSetup class added support for pre and post validation for BBs initial commit of generic building block validator converted test to no longer be a springboot test Remove cosmetic changes from BPMN files to be consistent. Remove minor changes that are not related to functionality. Rework to implement the functionality as part of Validator Combine the verification methods into one based on the flow's name; change the logging. Add verification of status of other VF Modules in the VNF for the delete/deactivate/unassign. added network-technology validation for CreateNetworkBB Sonar Issue Fix | Changes done in encryption decryption logic | Refactoring Changes done in encryption decryption logic| Used AES/GCM/NoPadding algorithm | fixed sonar issues added network-type and network-technology to mapper Continue the fight to make JUNITS work properly Update ASDC ATT to be springboot 2.0 compliant Continue to fix Unit tests for springboot 2.0 port removed autowired from workflowactionbbtaskstest fixed workflowactiontest and reduced size by 500 lines Update last of UT for mockito upgrade to 2.0 Fix more JUNITS due to mockito 2.0 upgrade Unit Test fixes to use proper mockito not spring Update Base Test to import proper packages for compile Additional Springboot 2.0 changes, for tests Additional springboot 2.0 fixes and upgrades Update Migration to be Flyway 5 Compliant Fix MSOBPMN Infrastructure common tests Fix Groovy Unit Tests in CommonBPMN Project Update MSO common BPMN to Springboot 2.0 Upgrade ASDC controller to SpringBoot 2.0 Port Openstack adapters to springboot 2.0 Fix VFC Adapter to be springboot 2 compatible Port CatalogDB adapter code to springboot 2 Port SDNC Adapter to Springboot 2.0 ... added update scripts to macro data instead of v12 sql added secondarypolicy to rainy day handling table confirm subnet map is not null in adapter response shallow copy subnet before AAI udpate update AAIObjectType to use uriTemplate extract subnet data from adapter response update correct AAIObjectType for subnet query update subnet(s) in AAI on network create completion confirm subnet map is not null in adapter response shallow copy subnet before AAI udpate update AAIObjectType to use uriTemplate extract subnet data from adapter response update correct AAIObjectType for subnet query update subnet(s) in AAI on network create completion fixed test http entity unit test to remove testing appid and transaction id added unit test for querySubsystemHealth method. also added resttemplate mock to implement healthcheck endpoint fixed unit test to use mock instead of actually goes out to health check endpoint added code to extend globalhealthcheck to include pinging other components and consolidate the responses converted test to no longer be a springboot test Remove cosmetic changes from BPMN files to be consistent. Remove minor changes that are not related to functionality. added update scripts to macro data instead of v12 sql Rework to implement the functionality as part of Validator added secondarypolicy to rainy day handling table added network-type and network-technology to mapper Combine the verification methods into one based on the flow's name; change the logging. Add verification of status of other VF Modules in the VNF for the delete/deactivate/unassign. updated how request db is set to failure in workflowA corrected code to match existing unit tests corrected tests after springboot 2 upgrade Added Required UTs in UpdateConfigurationStateTest and also fixed some UTs. added in missing parenthesis on method call added back execution variable for allotted uri addressed comments on pull request refactor AAI Rest calls from groovy files - Changes as per review comments checkin to refactor AAI rest | Fixing AAIResourceClient.update call refactor AAI Rest calls from groovy files - UpdateConfiguration refactor AAI Rest calls from groovy file - DeleteConfiguration refactor AAI Rest calls from groovy file - UpdateConfiguration refactor AAI Rest calls from groovy file - CreateConfiguration & ConfigurationUtils refactor AAI Rest calls from groovy files - Fix getARByID issue checkin to refactor AAI rest | Adding Junits checkin to refactor AAI rest | Adding few more classes checkin to refactor AAI rest of DoCreateVfModuleVolumeV2 checkin to refactor AAI rest | Update junit checkin to refactor AAI rest of DoCreateVfModuleVolumeV2 | Adding junits checkin to refactor AAI rest of DoCreateVfModuleVolumeV2 | Adding junits checkin to refactor AAI rest of DoCreateVfModuleVolumeV2.groovy ... updated in and out mapping to be generalBuildingBlock change source out mapping to generalBuildingBlock Change-Id: I122f1ebe3e15b77da0a55af201d89d47e326bf83 Issue-ID: SO-1098 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-10-29Fix Error, Check that vimID is presentMarcus G K Williams1-1/+87
Issue-ID: SO-1156 Change-Id: I14445f0e6dbed00b37a189f3a7c05923c6d4e5ab Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2018-10-23removed att-aic from codebaseBenjamin, Max (mb388a)4-32/+32
remove att-aic cloud owner from ONAP files Change-Id: Ifba8ef6f53194ddca12d11973817f6d85e2fa7e3 Issue-ID: SO-1161 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-10-12Dynamic Cloud Owner SupportBenjamin, Max (mb388a)8-26/+27
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-08-09Groovy CompileSmokowski, Steve (ss835w)45-0/+21873
Groovy was not compiling as the maven plugin was off. I had to move some files around, and add some import statements to make it compile again. I also had to rename some packages to onap.so. A few files were deleted that did not compile but were not in use. Issue-ID: SO-823 Change-Id: I99d04b4f25709c86d397d72700c237d81362d8b3 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>