aboutsummaryrefslogtreecommitdiffstats
path: root/bpmn/MSOCommonBPMN
AgeCommit message (Collapse)AuthorFilesLines
2018-11-14accept a la carte create instance group requestBenjamin, Max (mb388a)1-0/+1
Updated postBPELRequest to accept RequestClientParameter Switched to using .toString rather than .name for enum Added source to fix failing test Added action to fix failing apih tests Removed unused headers from test Removed unused import from RequestClientParameter Updated to use instanceGroupId constant Removed defaulting source in requestInfo Added validation for mandatory headers Added test case for modelVersionId in service related instance Added relatedInstance validation for create instanceGroup Added unit test cases for MembersValidation Added test cases for relatedInstances validation Added tests for add/remove member validation Added updates for deleteInstanceGroups Removed serviceProxy from test resource file Removed ServiceProxy as it is no longer needed Changed action to be removeMembers in endpoint Added removeMembers endpoint and validation Updated validation for create instanceGroups ... Change-Id: I12b14d6d81dd0690eea33dfcbf1be17c509f9832 Issue-ID: SO-1207 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-11-14separate error status from progression statusBenjamin, Max (mb388a)1-0/+15
Re-ordered statuses, capitalized, and added delimiters added retrystatusmessage to to string in infrarequests Added retryStatusMessage to OrchestrationRequests removed the word min from retry status message string added retry status message to infra active requests Began adding retryStatusMessage Added rollback status and flow status to status message added flow status table to separate errors from status Change-Id: If756fa4523955e4e4b6bfd10aad730b715892b62 Issue-ID: SO-1205 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-11-0711/7: merge casablanca to masterRob Daugherty8-46/+53
Commit: dbb53cabbff772880134699eb81dee775d7df8df Subject: Send correct resourceModuleName Issue: SO-1178 Commit: d3759e15184562647ea83b92cf02140fc705cb0d by ss835w Subject: Update Regex Logic to take into account new scale out URI... Issue: SO-117 Commit: 5dadc2c5790c961a74085d3d10b6f5aec6b7ba30 Subject: Fix msb url in homing cloudsite Issue: SO-1180 Commit: 9a9b0fa23afe8d46171fe95f1090de5a7f701d3d Subject: Updated Reference data for AutoScaleOut Issue: SO-1174 Commit: 3178cad6c756140b18eb658277598e3e2d2d3dcf Subject: ConfigurationParameter is empty for scaleout Issue: SO-1083 Commit: 402bf528e9a796f6ce31ad36c16316c2b31acc48 Subject: Added Null check for gtConfigurationParameter Issue: SO-1179 Commit: fb6ab40a64e74876ba1f08c4d3bdb6a040c21b94 Subject: Bug fixes November 5th Issue: SO-1188 Commit: ce37ae979311ed4e55150426d477db262773beb0 Subject: Removed slashes and added catch block Issue: SO-1183 Commit: 16aa0b6cc42c7287fc080c81451e301c0acc14cf Subject: removed retry from rainy day table Issue: SO-1185 Commit: 2073a3b4c20965252c7f3a0c1aea8e4407e876fa Subject: Fixing scaleOut workflow looping issue Issue: SO-1182 Commit: 5ca364a5e975877244ee51796602043a4b078a23 Subject: Make homingBB optinal and fix homing process Issue: SO-1168 Commit: 1c554c3332ccf6be4e576e9159bbb0f901197379 Subject: bug fixing with reading dmaap message Issue: SO-1191 Change-Id: Id747bc05b791787f304316396bc5fcd20d350b6f Issue-ID: SO-1190 Signed-off-by: Rob Daugherty <rd472p@att.com>
2018-11-07Make homingBB optinal and fix homing processAlexis de Talhouët1-4/+1
Properly defined whether or not to call homing at AssignVnfBB where by default homing doesn't get called, but if a homing solution is provided, then we resolve the solutions. The goal is to change the BPMN definition to use serviceTask rather than a scriptTask, allowing to use the Srping component to inject logic. Also we create a new HomingV2 component that is agnostic of the homing implementation, which goal is to route the homing request to the proper bbackend implementation; e.g. oof vs homing. Finally, we remove the un-needed variables set in the execution context. Change-Id: Ic9fb2a599c6375617c92a6d3462b62921ee47a6f Issue-ID: SO-1168 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2018-11-06Merge "Bug fixes November 5th" into casablancaRob Daugherty3-32/+60
2018-11-06Merge "Fix msb url in homing cloudsite" into casablancaRob Daugherty2-5/+21
2018-11-05Bug fixes November 5thBenjamin, Max (mb388a)3-32/+60
building block validator test now passes added buildingblockvalidator process instance test Retrieve actual error from WorkflowExceptionErrorMessage when the error message is empty, not only when null. Propagate orchestrationStatusValidationResult values from BB to BB. corrected use of constructor for AaiUtil use AaiUtil method to create path for get call modified how allotted resource urls are constructed - Removed the findExistingVnfcInstanceGroup method. It is not required to check this because the vnfResourceCustomization is always a new object at this location. Enable multiStage VF Module Create processing only when aLaCarte flag is on. Change-Id: If8cf397a84abc290e67e287d5b2264dd226398bc Issue-ID: SO-1188 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-11-05Catchup commits for DublinBenjamin, Max (mb388a)25-1171/+501
added property for retry timer multiplier for testing Infra APIH table, fixed test assertNull condition. Infra APIH table, added tests for request-url = null. Infra APIH should write request_url to infra_active_requests. Return SelfLink URL on ServiceInstantiation SyncResponse. Added JUNITS. Added helper method to get AAI ResourceUri to faciliate unit test. Fixed code to correctly extract related generic vnf or vce id. updated unit test coverage for update network Handle REST NotFoundException for serviceInstance nodes query. Process should continue for new order request and throw exception only for SUPP request. Added disconnect functionality to the gw vnf test tool. Added conversion of vnf management option to dhv change speed sync subnet status with network update updated macroData vol assigned delete continue script Correct the name of DeleteVfModuleBB subprocess. fix the custom resolver to not convert int in string to int Write the returned value from Homing to gBBInput Use explicit conversion to JSON to read cloudConfiguration settings. added property for retry timer multiplier for testing avoid storing AAI yang models in execution added handlingCode to rollback test in workflowactionbb passed in alacarte flag to execute layer for rainy day added test cases for RollbackToAssigned rainy day hand added rollback to assign in catalog db rainy day hand Updated vnf adapter delete stubs to be a post for test. Added a javadoc to basic auth override method Added a check to not add blank headers to the headerMap in httpClient. Added check for if entity exist before calling readEntity. Fixed failing junits and updated way the body is obtained Added missing import statement for http client. Fixed mistakes and made updates caught during review. Removed post and httpPost methods from RESTClient and refactored references Refactored multiple http post references to use httpClient instead. Removed close connection method and randomized port in unit test Added http client unit test, coverage is currently at 90 percent Resolve conflict in sdnc adapter reste v1 method Began removing http delete and delete methods from RESTClient and aaiUtil. Removed http put method and executeput method, refactored references. fixed broken tests in the branch in jenkins build Fix Springboot 2.0 start up issues, and other issues added in implementation to generate self link if there isnt one removed dbcp2 from poms that still had them added rollbackstatusmessage to stub in testprocess added rollback_status_message to the schema sql file Added variable for rollbackStatusMessage Added rollbackStatusMessage to get response added rollback status message to archived infra request set rollback status message to successful on boolean added logic to split rollback and regular error message added rollback status message to infra active requests pushing the cloud config changes as well Added media type and fixed cast plural issue. Made various updated and fixes to code that was changed. Removed all no longer used RESTClient imports from classes Removed and refactored references for aaiUtil methods and all remaining RESTClient methods, removed RESTClient project and updated poms. Return canonical stack id on multicloud create Fix OOF Config Ingestion Fix variable to retrieve sdnc endpoint Prepare resources for service uuid req Fix swapped parameters for multicloud DELETE Update msb-java-sdk to resolve license issues cloud owner support for SDNC interface correlationId is now read from userParams Fix up request body of multicloud adapter body removed LinkedHashMap<?,?> from java classes Cut over logging project to release not snapshot Update unit tests, revert test code, fix comments Fix remaining number of Unit Tests, on avpn flow Fix JUNITS add callback url, fix BPMN issues Update SDNC interaction to support a-sync updated bpm assert import and corrected tests updated test case to be mockito 2 compliant additional changes to import statements and tests Change the place where the data for multistage gets set Update treatment of PENDING_ACTIVATION VF_MODULE CREATE entries to SILENT_SUCCESS to support first stage of multistage. Implement second stage of multistage design VF Module Creation removed LinkedHashMap<?,?> from java classes Removed SNAPSHOT from dependency Cut over logging project to release not snapshot Fixed failing BBInputSetup tests Update unit tests, revert test code, fix comments Updated apih tests to use networkInstanceGroup Updated ModelType enum and fixed compilation issues Fix remaining number of Unit Tests, on avpn flow Fix JUNITS add callback url, fix BPMN issues Implementation of the first stage of multistage design for VF Module creation. Update SDNC interaction to support a-sync no longer leave modified files after test runs Remove generated CSAR, that occurs during JUNIT Update Camunda Pods to use Flyway Migration in 1902 Updated hashcode method and removed comment. Added aggregate routes to the sdnw request and updated pom sdnw dependency. Began to set aggreagate route information for vrf configuration. modified remaining files with att-aic references Correct rollbackData setting and protect against potential null objects. correct AAIObjectPlurals enum value name Update POJO to use type URL for selfLink. Optional<URL> - construct SelfLink Url format. Construct SelfLink Url format from full Url. added missing properties to application-test.yaml fixed compliation error after merge of unit test restored files which should not have been deleted Fix SO vulnerabilities with cxf Fixing bpmn infra endpoint in so-monitoring yaml removed att-aic from codebase default cloud owner now configurable Set homingService in WorkflowAction Fix Java Ex in Homing Version should be 1.3.1 to release new dockers Pnf Spring Environment correction test property now has dynamic wiremock port removed test specific wiremock rule that was causing problems re-enabled and corrected integration tests for so-bpmn-tasks Test to get sniro homing v2 test working by splitting test suites for each spring application Reverted changes to old migration scripts.. Fixed spring context issue with test HomingV2. Removed unused import to fix compilation errors Fixed onap changes to homing, migrated homingV2 to homingBB, fixed broken junits again. - Updated isUseHttpsWithDmaapTest to check assertTrue rather than assertFalse. - Upgraded code to make the isUseHttpsWithDmaap configurable. It will default to true if no value is found in the config file. moved workflowaction test class to the test section added status message update for retry and rollback beefed up error message debug logging and req db msg added debug lines to workflowactionbbtasks reqdbcall Issue-ID: SO-1187 Change-Id: Iec1aff4ed30a43c0e0b2cdb06c28d8db8a99a830 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-11-05Springboot 2.0 upgradeBenjamin, Max (mb388a)61-1650/+2162
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-11-03Merge "Send correct resourceModuleName" into casablancaRob Daugherty1-2/+6
2018-11-02Added Null check for gtConfigurationParameterPrema Bhatt1-1/+3
Change-Id: Icd21f579eebfe40b70344456420701fbc2408722 Issue-ID: SO-1179 Signed-off-by: Prema Bhatt <pb6115@att.com>
2018-11-02ConfigurationParameter is empty for scaleout Prema Bhatt4-4/+22
Mapping for ConfigurationParameter List was missing in BBInputSetupMapperLayer class. Added mapping and updated Unit tests and test data Change-Id: Ice8c7c30c97a5b8a8444a2243ddbea4d5fb036af Issue-ID: SO-1083 Signed-off-by: Prema Bhatt <pb6115@att.com>
2018-11-01Fix msb url in homing cloudsiteMarcus G K Williams2-5/+21
This change adds a getMsbHost method to homingUtils to enable correct configuration of the msburl used in identity_services for multicloud. Issue-ID: SO-1180 Change-Id: Ib7adecda98b1d5f5770e2d17a2e76c970619ab46 Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2018-10-31Send correct resourceModuleNameMarcus G K Williams1-2/+6
Issue-ID: SO-1178 Change-Id: I593ec7db0bac3e0b343bd0eb960977d0110fd9b8 Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2018-10-3110/31: merge casablanca to masterRob Daugherty6-7/+93
Commit: 649c4e85cc991ffe9c13fd3fab4cc3a303faa656 Subject: Fix Error, Check that vimID is present Issue: SO-1156 https://gerrit.onap.org/r/#/c/71247/ Commit: 959493d3274d2f2749586248cf31ee12b730e2af Subject: Bug fixes October 26th Issue: SO-1169 https://gerrit.onap.org/r/#/c/71343/ Commit: 373c057bfa82583f615ea46814ad3cdf9ea8d669 Subject: Resolve vf_module_id setting bug Issue: SO-1165 https://gerrit.onap.org/r/#/c/71270/ Commit: 6c2c8a66fade016f74b51bdfea3ba04494530b97 Issue: SO-1102 Subject: Pnf Spring Environment correction https://gerrit.onap.org/r/#/c/71137/ Change-Id: I22b4566050f627e1f1428aacdb52ec4d4fe75733 Issue-ID: SO-1173 Signed-off-by: Rob Daugherty <rd472p@att.com>
2018-10-29Add junit tests for CreateAAIVfModuleLukasz Muszkieta3-115/+219
Change-Id: Ib879988d06f1956b1ce6801c62c5d5ce8712704a Issue-ID: SO-784 Signed-off-by: Lukasz Muszkieta <lukasz.muszkieta@nokia.com>
2018-10-26Bug fixes October 26thBenjamin, Max (mb388a)6-7/+93
Set non-custom health diagnostic check code to a default value. created custom java serialization for SimpleUri changed property value for cloud-owner in unit test converted aai call to use the AAI Client Correct a JUnit data file to include userParams values that are expected to be set. Set userParams on requestContext to parameters that need to be passed to downstream systems. Change-Id: I3974691875ef967f90a15f076ae27bc0cd76ee8e Issue-ID: SO-1169 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-10-238/23: merge casablanca to masterRob Daugherty14-265/+250
Change-Id: I0a73fbedf8c6f22e0a37cd8f0505ddcf83250341 Issue-ID: SO-1160 Signed-off-by: Rob Daugherty <rd472p@att.com>
2018-10-23removed att-aic from codebaseBenjamin, Max (mb388a)6-29/+29
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-23default cloud owner now configurableBenjamin, Max (mb388a)1-41/+0
default cloud owner can now be set via a property Change-Id: I9b900cb2a5c7176a78e889ad2ce31a4ed9d38585 Issue-ID: SO-1158 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-10-22Fix Java Ex in HomingMarcus G K Williams3-193/+214
Issue-ID: SO-1145 Change-Id: I35b28f9e4cd67536a7807f9e083b0c1c4fa9a03c Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2018-10-19bug fixes october 19thBenjamin, Max (mb388a)4-2/+7
Fixed issue with resource version being added twice. added silent success to orch validation when unassign is not found Removed SNAPSHOT from dependency Fixed failing BBInputSetup tests Updated apih tests to use networkInstanceGroup Updated ModelType enum and fixed compilation issues Change the place where the data for multistage gets set Update treatment of PENDING_ACTIVATION VF_MODULE CREATE entries to SILENT_SUCCESS to support first stage of multistage. Implement second stage of multistage design VF Module Creation Implementation of the first stage of multistage design for VF Module creation. Change-Id: I6d76282d1f37c081355cee72797d8e13da4e3cb0 Issue-ID: SO-1149 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com> Signed-off-by: Rob Daugherty <rd472p@att.com>
2018-10-19Update version to 1.4.0-SNAPSHOT for DublinRob Daugherty1-1/+1
Henceforth, the master branch will be for Dublin work. Change-Id: I269fd8f227e37afdab9c633f45488c643e5e765e Issue-ID: SO-1151 Signed-off-by: Rob Daugherty <rd472p@att.com>
2018-10-17Bug fixes October 16Benjamin, Max (mb388a)2-1/+16
Treat the VfModule returned from PrepareUpdateAAIVfModule call as an AAI object collection create, connect instanceGroup to cloudRegion Fix a typo in the name of the method for getting a variable testing mapping of instance group role test NetworkInstanceGroup role to be SUB-INTERFACE use enum value with hyphen for subtype Some updates based on feedback to java codes updated client to use optional instead of passing null added case where client sends null due to mapping issue added generic response object and pinc returns response build relationship now correctly removes wrapper Ensure that no null object gets referenced while checking if VNF is empty. Change-Id: I6177877518475c1f2e8e4e9dbd2ad1e2f3e10d18 Issue-ID: SO-1144 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-10-17Merge "Bug fixes for casablanca"Rob Daugherty9-19/+36
2018-10-16Fix OOF Config IngestionMarcus G K Williams3-4/+30
Update Homing OOF Config Path Issue-ID: SO-1127 Change-Id: I10ba6dcf23d474ba5e9832a6f4f35e52ead020b5 Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2018-10-16Bug fixes for casablancaBenjamin, Max (mb388a)9-19/+36
Updated builder to use String.format Added exception specifically for issues interacting with requestdbadapter Updated exception message and added junit test case Added case to handle when homing is not called during assign vnf. include network ID for completion handler Added exception handling for saving to requestdb added null check to mdc and interceptors to sdnc cxf 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 updated how request db is set to failure in workflowA updated in and out mapping to be generalBuildingBlock change source out mapping to generalBuildingBlock Use explicit conversion to JSON to read cloudConfiguration settings. Use explicit conversion to JSON to read cloudConfiguration settings. Correct the name of DeleteVfModuleBB subprocess. Write the returned value from Homing to gBBInput updated unit test coverage for update network sync subnet status with network update Added WorkflowException to out mapping which will trigger an exception to be thrown when populated. Correct the payload for HealthCheck APP-C Action to remove escaping and change parameter name. Added WorkflowException to out mapping which will trigger an exception to be thrown when populated. Commit a change that was not staged in previous commit updated arguments to getConstructor method forgot to extract throwable from Optional object added throwable constructor to createException fixed broken unit test and added a new test and method set the network technology in the network request remove namespace from added networkId payload element - Updated SDWan test case to check the database to make sure the VNFCustomization object exist. - Updated code to only loop in iNotif.getResources() for VF resources, all others are unnecessary and were causing issues with the Service object. - Removed modifiedHeatTemplate variable since this isn't needed in the ONAP code base. Make sure vnfResponseCode variable is set to 200 when VNF is correctly retrieved from A&AI. VRR VRRCreateVfModule - send availability_zone to SDNC Infra Assign request Safeguard the retrieval of Boolean setting for isRollbackEnabled. Set isRollbackEnabled to opposite of suppressRollback early on in the execution. Reverse suppressRollback value to pass as backout parameter to VNF Adapter Add the exceptions to the calls to aai client queries Correct retrieval of the object from Optional for A&AI queries. Change-Id: I7d22e621b0316c14ce61bd51a9d5753473622697 Issue-ID: SO-1134 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-10-12Dynamic Cloud Owner SupportBenjamin, Max (mb388a)68-3612/+570
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-09Fix rollbackBenjamin, Max (mb388a)1-2/+7
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 assertion that global count var was reset to 0 updated rollback to reset current sequence count var revert the other change and fix the rollback logic instead fixed current sequence and updated rollback code Change-Id: Ifd3282de1dbda8b36d4d89e5b7135ad464a9b963 Issue-ID: SO-1107 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-10-09E2EService support model-driven resource sequenceYulian Han1-3/+78
Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa5f064401 Issue-ID: SO-1114 Signed-off-by: Yulian Han <elaine.hanyulian@huawei.com>
2018-10-01Fix CreateVfModule Instantiation ErrorMarcus G K Williams1-0/+1
Issue-ID: SO-1097 Change-Id: I0eff52da7b90450d2a8b9d3ab5d1d92c245bb4f6 Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2018-09-21Merge "various bugfixes for casablanca"Rob Daugherty2-8/+9
2018-09-20Update OofHoming w/ directivesMarcus G K Williams2-42/+81
Issue-ID: SO-746 Change-Id: I597f7621a32eeb5b8e92cf80700c60bccdc5e560 Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2018-09-20various bugfixes for casablancaBenjamin, Max (mb388a)2-8/+9
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)4-9/+11
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-20Merge "Add junit tests for ConfirmVolumeGroupName"Rob Daugherty2-34/+59
2018-09-20Add junit tests for ConfirmVolumeGroupNameLukasz Muszkieta2-34/+59
Change-Id: I382bf9599dfee3a30c129c121d91fddeec42937f Issue-ID: SO-784 Signed-off-by: Lukasz Muszkieta <lukasz.muszkieta@nokia.com>
2018-09-20bug fix for ccvpn uc after integration testYulian Han2-36/+111
Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa70000020 Issue-ID: SO-683 Signed-off-by: Yulian Han <elaine.hanyulian@huawei.com>
2018-09-19Merge "Workflow Activities Execution Environment"Rob Daugherty3-9/+93
2018-09-19Workflow Activities Execution EnvironmentElena Kuleshov3-9/+93
Add a license header to ExecuteActivity.java Fix a JUnit by modifying the values for the expected variables. BBInput changes to support CM flows Implement JavaDelegate for activities execution Change-Id: I9cfc51241d414b85441d1a8443a950b97d14b65f Issue-ID: SO-827 Signed-off-by: Elena Kuleshov <EK1439@att.com>
2018-09-19Workflow Designer Activities ImplementationElena Kuleshov2-1/+10
Logging changes and error message fixes for runAppcCommand() added unit test and removed catch blocks Workflow Designer Activities Implementation Change-Id: I22d3d95541708ddc9e2617a92085b0d4c16caad9 Issue-ID: SO-829 Signed-off-by: Elena Kuleshov <EK1439@att.com>
2018-09-18NexusIQ issue: commons-beanutilsRob Daugherty1-4/+0
This artifact is not actually used by SO. Removed it from the poms. Change-Id: Icfeb3026581996bc980a223232a305c488a01fb2 Issue-ID: SO-1065 Signed-off-by: Rob Daugherty <rd472p@att.com>
2018-09-18Merge "save csar file path add directory version"Seshu Kumar M1-1/+3
2018-09-17Merge "more stability fixes"Marcus Williams1-1/+0
2018-09-17more stability fixesBenjamin, Max (mb388a)1-1/+0
Remove conditional to not check VNF topology add empty string verification for serviceName field Add junits for CNRCR and NtwkAdptr changes. Add search in new CollNtwkResCust tbl to get NtwkResource. - Updated test data files to include 'pre-load' flag in both VfModuleOperation and NetworkOperation json test data files. - MSO to not to send <preload>boolean</from-preload> to SDNC in network-topology-opertion and vf-module-topology-operation. Updated GeneralTopologyObjectMapper to set 'from-preload' to null so that elements with Nulls are not sent to SDNC. Updated buildNetworkInformation() and buildVfModuleInformation() methods. update flow stats to not cause bpmn flow to crash Fix headers so SDNC does not return XML Add implementation of deleteVolumeGroupResponse parsing; fix JUnits that worked by accident. Change-Id: Ia96d552d731e112505fcf739029a6fd4d0134546 Issue-ID: SO-1061 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-09-17Updated error handling of BPMN sub flowsBenjamin, Max (mb388a)1-5/+5
Added error handling subprocess to only those BBs that call a sub flow. Refactored error handling in ExecuteBuildingBlock. Added error handling and enhanced modeling of remaing BB flows Added error handling and enhanced modeling of assign/activate BBs. Change-Id: I2ab6236e3c2206b74b6368db69d8953a779f4f19 Issue-ID: SO-1059 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-09-13Stability fixesBenjamin, Max (mb388a)2-2/+3
sdnc now logs the full response message as a json removed erroneous encoding of variables with full XML Return created network from getVirtualLinkL3Network added exception logger to workflowaction aai check Check for null value for vnfcPorts before referencing it Added test case for invalid camunda response Changed to use updateStatus method Added saving for currentActiveReq and test for 401 resp Change JUnit to use expectedException and clean up unused items. Add vfModuleId to the exception message for missing model info. Report an error if VF Module model info is expected but is null. - Just renamed the Cvnfc and Vnfc set names - Updated code to check for duplicate VNFC's across multiple modules in the same VNF. - Removed commented out if statement line for ALLOTTED_RESOURCE - Reinitialize the Cvnfc and Vnfc Sets each time we iterate the VFModule loop. This will avoid the concurrent modification exception. Eliminated Ben from the sample request Changed to use else if for null check Added null check before catdb call and test case Fix implementation of a call to VNF Adapter for DeleteVolumeGroupBB. Update the method to no call save and do a put Revert usage of PUT method, use save instead Change-Id: I9f69fb68d0639c23b8e1de6931938119bd3ac54b Issue-ID: SO-1032 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-09-12Merge "Update GenericHealthCheck to send vnfHostIpAddress"Rob Daugherty3-9/+17
2018-09-12Update GenericHealthCheck to send vnfHostIpAddressPrema Bhatt3-9/+17
Change-Id: Ia0adb8784e81001ca0b54bfa62b12f28060114cf Issue-ID: SO-1024 Signed-off-by: Prema Bhatt <pb6115@att.com>
2018-09-12Merge "Sonar fix for ResourceRequestBuilder"Byung-Woo Jun1-2/+3