summaryrefslogtreecommitdiffstats
path: root/bpmn/MSOCommonBPMN/src/main/groovy
AgeCommit message (Collapse)AuthorFilesLines
2018-11-12Fix OOF Directives processingMarcus G K Williams2-49/+68
- 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-10Bug fixes November 10thBenjamin, Max (mb388a)1-1/+2
use network name on delete when heat id not present compare mod count index as Integers Change-Id: I76e567378fed83fb857d4d16b88f7a199d0df475 Issue-ID: SO-1204 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.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 Daugherty1-1/+21
2018-11-06Merge "Fix msb url in homing cloudsite" into casablancaRob Daugherty2-5/+21
2018-11-05Bug fixes November 5thBenjamin, Max (mb388a)1-1/+21
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-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-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-17Bug fixes October 16Benjamin, Max (mb388a)1-1/+1
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 Daugherty2-3/+6
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)2-3/+6
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)17-1534/+336
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-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-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-20Update LoggingSmokowski, Steve (ss835w)1-2/+0
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 Daugherty1-15/+0
2018-09-20Add junit tests for ConfirmVolumeGroupNameLukasz Muszkieta1-15/+0
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-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-08-27Merge "is sniro request is initial or speed change"Rob Daugherty1-2/+5
2018-08-24Use serviceSubsriptionType in OOF Homing RequestMarcus G K Williams2-35/+20
SO maps "instanceName" to "serviceName" field in the Homing Request, however OOF is expecting 'subscriptionServiceType' Issue-ID: SO-667 Change-Id: I3faa6cc600b6515d9c6e01e18cb289104f3976fc Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2018-08-23is sniro request is initial or speed changeBenjamin, Max (mb388a)1-2/+5
Changed logic to determine if sniro request is initial or speed change. Change-Id: I36eeea8860855bf5226560dcc2722a2c27723ef9 Issue-ID: SO-893 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-08-23get service type and customer id from uri keysBenjamin, Max (mb388a)1-18/+21
Added logic to get service type and customer id from uri keys for sdnc request. Change-Id: I3b0c4b88737e2ad6fc573d335addff221d06e885 Issue-ID: SO-889 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-08-21Add device resource bpmn process for ccvpn ucYulian Han2-33/+115
Bug fix for ccvpn uc Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa70000013 Issue-ID: SO-683 Signed-off-by: Yulian Han <elaine.hanyulian@huawei.com>
2018-08-09Fix LoggingSmokowski, Steve (ss835w)1-0/+7
Add more logging information for Java.Lang Exceptions Issue-ID: SO-822 Change-Id: I5eb25adc087c9fb495829af2c9d0d1be7374f4a3 Change-Id: I5eb25adc087c9fb495829af2c9d0d1be7374f4a3 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2018-08-09Merge "Refactored references to AaiUtils"Seshu Kumar M3-915/+5
2018-08-08Save sppartner to AAI and call ExternalAPI bug fixElaine_Han1-0/+1
Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa70000005 Issue-ID: SO-683 Signed-off-by: Yulian Han <elaine.hanyulian@huawei.com>
2018-08-07Refactored references to AaiUtilsBenjamin, Max (mb388a)3-915/+5
to use AAIResourceClient updated bpmn, removed Generic AAI flows, and removed dead useless code Did not modify E2E Delete Service Instance flow as it has changed significantly Issue-ID: SO-813 Change-Id: I1a6bc5353ef89e2ce4359be2654395f7ce060aba Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-08-06Add SPPaterner resource procssElaine_Han2-0/+240
Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa70000001 Issue-ID: SO-683 Signed-off-by: Yulian Han <elaine.hanyulian@huawei.com>
2018-08-02Add junit for MSOCommonBPMNLukasz Muszkieta2-16/+1
Change-Id: I665f35bd6385ceec2d5aeff9a1d8af359bccd97a Issue-ID: SO-784 Signed-off-by: Lukasz Muszkieta <lukasz.muszkieta@nokia.com>
2018-07-31Containerization feature of SOBenjamin, Max (mb388a)51-16878/+16260
Change-Id: I95381232eeefcd247a66a5cec370a8ce1c288e18 Issue-ID: SO-670 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-05-31Add RegionOne_flavorList to bpmn variablesMarcus G K Williams1-0/+2
Flavor Labels are not passed to DoCreateVnfAndModules.bpmn, in turn it needs to be passed to DoCreateVfModule Issue-ID: SO-661 Change-Id: I51c4e77677a17513725d5b832e379bbb72f13185 Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2018-05-31Fix OOF serviceResourceId bugMarcus G K Williams1-3/+12
- Works around a bug in OOF where OOF does not return a serviceResourceId with homing solutions. SO uses serviceResourceId to match a homing deman to a homing request. This patch addes resourceModuleName as another way to match a demand to a request, as currently OOF needs this to be unique. - Changes SO homing processing of key cloudRegionId to key locationId as this is now the key used for cloudRegionId in solutions sent back from OOF Issue-ID: OPTFRA-249 Change-Id: I8e5d9244a227ea4d3d061a758f202144bac270ce Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2018-05-29Fix OOF Homing InterfaceMarcus G K Williams2-42/+103
- Update homing request build to send correct request to OOF - Use nfFunction field as resourceModuleName requires updating nfFunction fields during vcpeRestCust service creation in SDC - Fix No Solution Error from OOF - Made subscriber info and cloud info optional as OOF Homing does not require it - Update Homing Requests for AR to provide vgMuxInfra modelInfo instead of vgmuxAR modelInfo as required by OOF Issue-ID: SO-573 Change-Id: If1c41c81f387bb614be954d158d6cc4d9c48e2c8 Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2018-05-24Fix serviceInstanceName in HomingMarcus G K Williams1-7/+13
serviceInstanceName was not set in CreateVcpeResCustService and not made available in Homing Flow. Issue-ID: SO-573 Change-Id: I9d3098aa252ceba139c75a24c71950bab70b14b6 Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2018-05-23Removing license from OOF Homing DemandMarcus G K Williams1-7/+3
OOF does not support License deman in Beijing Issue-ID: SO-573 Change-Id: Ia7e013949773595b520ed4cbd0bbe8cb0f18922c Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2018-05-17Revert placementInfo to placement in SniroHomingMarcus G K Williams1-1/+1
Issue-ID: SO-628 Change-Id: I6e9e44d453a72b4e9ec1a0abe99eb8028aa5ba1a Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2018-05-16Revert placementInfo to placement in SNIROUtilsMarcus G K Williams1-2/+2
Issue-ID: SO-628 Change-Id: I3bd802fc966f466b12556d19e347a130e152a51d Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2018-05-03ecomp-model-information to onap-model-informationArthur Martella1-17/+28
Change-Id: I05f4648ff898a54e7a00d899d97129746172cdb4 Issue-ID: SO-603 Signed-off-by: Arthur Martella <am153x@att.com>
2018-04-09Bug Fix - OOF api updates processing flavor-labelMarcus G K Williams2-46/+80
Additional API interactions were added to OOF response post API freeze that enable core HPA functionality. This patch updates the processsing of the API reponse to process additional flavor parameters. Issue-ID: SO-408 Change-Id: I1656a7ba955ab41c57b7a3e07a3d0cc38b16e2fa Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2018-04-06Added hc and configscaleout to vfmoduleinfraBancala, Ben (bb3476)1-1/+3
Change-Id: I2d5434785708ed34d1f28e22f134857bfcae02b1 Issue-ID: SO-551 Signed-off-by: Bancala, Ben (bb3476) <bb3476@att.com>;
2018-03-28ControllerType update for CM flowsElena Kuleshov1-2/+5
Change-Id: I42c60ba45baaf29fa5fe54a8bb7ffc0aab5622c7 Signed-off-by: Elena Kuleshov <ek1439@att.com> Issue-ID: SO-526
2018-03-27Refactor homing flows for OOF/HPAMarcus G K Williams5-275/+969
1. Split Homing into OOF and SNIRO versions 2. Added OOF API interactions 3. Added Unit tests for OOF Homing Code Issue-ID: SO-404 Change-Id: Ifeeeec9ea450d8b330110a565208ed89a1e18cde Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2018-03-14AT&T 1712 and 1802 release codeRob Daugherty42-1038/+1871
This is code from AT&T's 1712 and 1802 releases. Change-Id: Ie1e85851e94bc66c4d9514a0226c221939531a04 Issue-ID: SO-425 Signed-off-by: Rob Daugherty <rd472p@att.com>
2018-03-09Simplify boolean expressions in groovyMunir Ahmad2-4/+4
Change-Id: I8dc254337f5975c2af6a2de74f20eff919993cf2 Issue-ID: SO-437 Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>
2018-03-07Support get resource recipe groovy common methodc001491071-0/+21
Support get resource recipe groovy common method Change-Id: Iec7efcf162465cdef4be9093697a5b094a3020bb Issue-ID: SO-452 Signed-off-by: c00149107 <chenchuanyu@huawei.com>
2018-03-05Merge "Removed unreachable log"Seshu Kumar M1-398/+396
2018-03-05Removed unreachable logMunir Ahmad1-398/+396
Change-Id: I10bcb20f8cb7729da7ce382279ee377ba905bcb0 Issue-ID: SO-437 Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>