summaryrefslogtreecommitdiffstats
path: root/bpmn/MSOCommonBPMN/src/test
AgeCommit message (Collapse)AuthorFilesLines
2018-05-31Fix OOF serviceResourceId bugMarcus G K Williams4-11/+11
- 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-31Miscellaneous fixes for SO-SDNC integrationArthur Martella1-2/+2
changing capitalization of SDNC in LCM property adding payload to createVfModule bpmn Change-Id: Ib4d8e172a929a8138cf4e3fbf446170467b44a42 Issue-ID: INT-475 Signed-off-by: Arthur Martella <am153x@att.com>
2018-05-30Merge "Change topics setup for LCM"Marcus Williams1-2/+3
2018-05-30Change topics setup for LCMElena Kuleshov1-2/+3
- Fix general topic properties. - Fix junit for getLcmProperties Change-Id: I424129c18a017908280c6bdc831a6a72ba1192ca Issue-ID: SO-602 Signed-off-by: Elena Kuleshov <ek1439@att.com>
2018-05-29Fix OOF Homing InterfaceMarcus G K Williams2-24/+42
- 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-6/+9
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-5/+1
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-2/+2
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-15WorkflowResponse json issuesRob Daugherty13-72/+58
This commit adds some robustness to the interface between the API-H and BPMN, specifically, in how the response is handled. I don't have proof, but there appears to be some randomness to the json provider behavior when used with the jax-rs. Sometimes, the serializer is adding the root element, and sometimes it is not. Maybe there's something wrong with the configuration. Maybe we have competing json providers. I couldn't pin this down. I'm almost certain it is the presence of the root element in the content that causes the API-H code to fail parsing of the BPMN response. This doesn't kill the request, as you might expect, but rather, the API-H passes the BPMN response through to the client (VID, or policy, or whatever). The original problem (SO-586) was "fixed" by "removing the wrapper". This "wrapper" is a needed feature of the interface between BPMN and the API-H. We shouldn't have removed it. The fact that the "fix" appeared to work is due to the behavior I described in the previous paragraph. The API-H chokes on the message, and it passes it through unchanged. Not really what we want. So, I don't know why the jackson/json behavior is flaky and different now, but I can (and did) modify the API-H so it can parse a json message whether or not it has a root element. Note that WorkflowResponse.java (in BPMN) and CamundaResponse.java (in the API-H) are basically the same bean representing the message format. Seems less than ideal to have two different classes. Also note that I changed the name of the "response" attribute of the WorkflowResponse and CamundaResponse classes to "content". Got tired of seeing this nonsense everywhere in the code: response.getResponse() Change-Id: Icaf70f8457de99e493cf882170fe778c620308c9 Issue-ID: SO-586 Issue-ID: SO-618 Signed-off-by: Rob Daugherty <rd472p@att.com>
2018-05-08Remove wrapper from WorkflowResponseArthur Martella3-1/+15
When the workflow response succeeds, the requestReferences object is being wrapped by "WorkflowResponse": {"response": {... and all the other fields from the WorkflowResponse object are being included as well. Adding a WorkflowResponseSerializer didn't seem to work since the root node was still included and there was no ObjectMapper in which to set WrapRootValue to false. So this is the next best thing. Patch 2 fixes most of the broken unit tests. Change-Id: Ifa5bd02e70b23f41c9042ac207848c8ade77313a Issue-ID: SO-586 Signed-off-by: Arthur Martella <am153x@att.com>
2018-04-24Create VF Module ErrorRob Daugherty2-10/+20
There are multiple issues here. 1) The LCM healthcheck and config-scale-out should be made conditional upon the VNF orchestration status being Active or Activated. I'm not going to do that with this commit, since the logic will probably need to be moved to the DoCreateVfModule flow. What I will do is bypass the LCM operations to unblock testing. Another ticket will need to address the real solution. 2) APP-C gave us an API where the controller type is configured in their client object, which is NOT what we wanted. As a result, we have to keep a client object for each controller type. Our implementation did not do this. 3) Need to support the APP-C client configuration properties for specifying the SDN-C topic names. I'm refactoring the APP-C client urn mapping names to make it clear that they are for configuring the APP-C *client* and not necessarily for APP-C itself. Change-Id: I588f3b98b4ee44ba53b4931f9f1a7938ee70bebf Issue-ID: SO-577 Signed-off-by: Rob Daugherty <rd472p@att.com>
2018-04-10Merge "Bug Fix - OOF api updates processing flavor-label"Seshu Kumar M4-81/+39
2018-04-09Add junit coverage for CryptoHandler javaFelix Sangalang1-0/+42
junit coverage for CryptoHandler Issue-ID: SO-568 Change-Id: I8f0a57deb96dcfbed0cf439efbf81de5b2389748 Change-Id: I8f0a57deb96dcfbed0cf439efbf81de5b2389748 Signed-off-by: Felix Sangalang <fs7692@us.att.com>
2018-04-09Add junit coverage for PayloadClient javaFelix Sangalang1-0/+81
junit coverage for PayloadClient Issue-ID: SO-567 Change-Id: If21192023f84c1e838ea3d0731b82695a9aa90b3 Change-Id: If21192023f84c1e838ea3d0731b82695a9aa90b3 Signed-off-by: Felix Sangalang <fs7692@us.att.com>
2018-04-09Bug Fix - OOF api updates processing flavor-labelMarcus G K Williams4-81/+39
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-03-28Merge "ControllerType update for CM flows"Rob Daugherty2-7/+8
2018-03-28ControllerType update for CM flowsElena Kuleshov2-7/+8
Change-Id: I42c60ba45baaf29fa5fe54a8bb7ffc0aab5622c7 Signed-off-by: Elena Kuleshov <ek1439@att.com> Issue-ID: SO-526
2018-03-28Added subworkflow for Pnf pnpbiniek1-0/+44
Change-Id: Ifeba2e74a03ce8c5a13b80f673809c3ef60bfe3f Issue-ID: SO-506 Signed-off-by: biniek <lukasz.biniek@nokia.com>
2018-03-28Merge "Correct URLs mocked by VNF Adapter Test, again"Rob Daugherty2-5/+46
2018-03-27Merge "Refactor homing flows for OOF/HPA"Seshu Kumar M13-137/+1541
2018-03-27Correct URLs mocked by VNF Adapter Test, againArthur Martella2-5/+46
This time the URLs cover both those used by MSOCommonBPMN tests and MSOInfrastructureBPMN tests. Change-Id: I7d5587cc708b4773480e9182f06b260a0b4e3af0 Issue-ID: SO-489 Signed-off-by: Arthur Martella <amartell@research.att.com>
2018-03-27Refactor homing flows for OOF/HPAMarcus G K Williams13-137/+1541
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-27Adding JunitSumapriya7-0/+307
Adding Junit for: 1.CallbackHeader.java 2.ObjectFactory.java 3.RequestHeader.java 4.RequestTunables.java 5.SDNCAdapterCallbackRequest.java 6.SDNCAdapterRequest.java 7.SDNCResponse.java Sonar Link: https://sonar.onap.org/code?id=org.onap.so%3Aso&selected=org.onap.so%3AMSOCommonBPMN%3Asrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fmso%2Fclient%2Fsdnc%2Fsync Change-Id: If0ae47961df2537bebe5f02cb615b66913509422 Issue-ID: SO-535 Signed-off-by: Sumapriya <SS00493505@techmahindra.com>
2018-03-22Added OpenPojo Validations to beansSmokowski, Steve (ss835w)1-0/+75
Change-Id: I34d8922a55b1ba35610ad0856dcd3363fa016785 Issue-ID: SO-516 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2018-03-21Generate sdnc network operation request bodyc001491071-7/+12
Generate sdnc network operation request body Change-Id: I192a50e322f9982b07b3fa3cbb7c180ab6a66bc3 Issue-ID: SO-501 Signed-off-by: c00149107 <chenchuanyu@huawei.com>
2018-03-20Adding JunitAS004650594-0/+185
Adding Junit for: 1.BpmnParam.java 2.BpmnRestClient.java 3.ResourceInput.java 4.ResourceRecipeRequest.java Sonar link: https://sonar.onap.org/code?id=org.onap.so%3Aso&selected=org.onap.so%3AMSOCommonBPMN%3Asrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fmso%2Fbpmn%2Fcommon%2Frecipe Change-Id: Icb2c545cb62a49fdd84ce998aa43792436aeaf41 Issue-ID: SO-491 Signed-off-by: AS00465059 <AS00465059@techmahindra.com>
2018-03-20Adding JunitAS004650591-0/+53
Junit for SDNCRequest.java Sonar-Link: https://sonar.onap.org/code?id=org.onap.so%3Aso&selected=org.onap.so%3AMSOCommonBPMN%3Asrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fmso%2Fclient%2Fsdnc%2Fbeans Change-Id: Ic34040d0b68766e3575d2b698e7f0037110cae88 Issue-ID: SO-502 Signed-off-by: AS00465059 <AS00465059@techmahindra.com>
2018-03-19Adding JunitAS004650593-0/+134
Junit for: 1.MsoRequestsDbExceptionBean.java 2.MsoRequestsDbException.java 3.UpdateInfraRequest.java Sonar Link: https://sonar.onap.org/code?id=org.onap.so%3Aso&selected=org.onap.so%3AMSOCommonBPMN%3Asrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fmso%2Fclient%2Fadapter%2Frequests%2Fdb%2Fentities Change-Id: I7776846e4529bf5d9b6156606df6603f9b5ef79e Issue-ID: SO-492 Signed-off-by: AS00465059 <AS00465059@techmahindra.com>
2018-03-16Merge "Adding Junit"Seshu Kumar M8-0/+409
2018-03-16Adding JunitSumapriya8-0/+409
Adding Junit for: 1.CreateVnfNotification.java 2.MsoRequest.java 3.RollbackVnfNotification.java 4.UpdateVnfNotification.java 5.VnfRollback.java 6.DeleteVnfNotification.java 7.ObjectFactory.java 8.QueryVnfNotification.java Sonar Link: https://sonar.onap.org/code?id=org.onap.so%3Aso&selected=org.onap.so%3AMSOCommonBPMN%3Asrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fmso%2Fbpmn%2Fcommon%2Fadapter%2Fvnf Change-Id: I7cc60cb10984d58f50bd40033d48e224de4efbd7 Issue-ID: SO-490 Signed-off-by: Sumapriya <SS00493505@techmahindra.com>
2018-03-14Merge "Add UT Test for resource parameters function"Seshu Kumar M1-0/+7
2018-03-14Add UT Test for resource parameters functionc001491071-0/+7
Add UT Test for resource parameters function Change-Id: Ia5729a786e73980f67e38e0ecae47d0573c5ddd1 Issue-ID: SO-452 Signed-off-by: c00149107 <chenchuanyu@huawei.com>
2018-03-14AT&T 1712 and 1802 release codeRob Daugherty65-577/+3459
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-13Update license for ResourceRequestsubhash kumar singh1-1/+1
Update license for ResourceRequest. Change-Id: Icb17226758d85368fa8a4de3a6c76332253cdab8 Issue-ID: SO-453 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-03-13Merge "Remove redundant type cast"Seshu Kumar M1-2/+1
2018-03-12Merge "Combine the design and runtime parameter"Chuanyu Chen1-0/+35
2018-03-12Combine the design and runtime parametersubhash kumar singh1-0/+35
Combine designand run time paramters. Change-Id: Ide61cb14697f137e73308b29b721cedb1bd3e13e Issue-ID: SO-453 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-03-10Remove redundant type castMunir Ahmad1-2/+1
Change-Id: Ie00d5ec5a4677c99a9a689bf18a85055902f6384 Issue-ID: SO-437 Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>
2018-03-09Remove redundant intValueMunir Ahmad1-1/+1
Change-Id: Iecc0cd25f0c8ecd2c8dc9b4d9b09c66a6394cb83 Issue-ID: SO-437 Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>
2018-03-09Revert Reduce log noise/warningsRob Daugherty49-9128/+9077
This reverts commit 327b17ab250b4c17cf3f91f5e4cd9bffd89f3d1e. It is seriously impeding our ability complete the promised merge of AT&T 1802 code. While I'm all for coding standards, if we are serious about using spaces instead of tabs, then I think we need to (1) agree with the community when this will happen, (2) do consistently in all files, and (3) enforce it. Change-Id: Ib9b996f6b6c7d81ac9ac95d58b0c7d8cc39675ff Issue-ID: SO-368 Signed-off-by: Rob Daugherty <rd472p@att.com>
2018-03-08Reduce log noise/warnings format to conventionsMarcus G K Williams49-9077/+9128
Reduce build log warnings by formatting tests to ONAP code conventions (removing tabs etc.) Issue-ID: SO-368 Change-Id: I48c6d359b83617aebeb79db4e30c1d72d31f7eec Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2018-03-08Merge "Remove redundant declaration of extending object"Seshu Kumar M1-1/+1
2018-03-08Remove redundant declaration of extending objectMunir Ahmad1-1/+1
Change-Id: Iee7e4fc93dd82cab27986335560a41000851c33d Issue-ID: SO-437 Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>
2018-03-07Remove unused codeMunir Ahmad1-5/+0
Change-Id: I504f083d6055ea348f3a3547aba9d3de0611cd20 Issue-ID: SO-437 Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>
2018-03-06Fix javadocMunir Ahmad1-1/+1
Change-Id: Iddc39df32089e1a37c04d089522ead295a037118 Issue-ID: SO-437 Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>
2018-03-01Support decompose service by model uuidc001491072-2/+11
Support decompose service by model uuid Change-Id: Ib6f751440bc9c60df12e18857f23b4c62181b9c6 Issue-ID: SO-451 Signed-off-by: c00149107 <chenchuanyu@huawei.com>
2018-02-24Replace explicit type with dimond everywhereMunir Ahmad27-128/+128
Change-Id: I2443c6d0f7dae2bf153da46b77bc95bba1c495c1 Issue-ID: SO-437 Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>
2018-02-24Make use of lambda for comparatorMunir Ahmad1-10/+2
Change-Id: Iff3cf5202d754c926b010e1d1dd82418b42ae241 Issue-ID: SO-437 Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>
2018-02-21Replace Collection.sort with List.sortMunir Ahmad1-8/+8
Change-Id: Ie7f81c79ac334e5783c4b7f6e1f45e454e215cda Issue-ID: SO-437 Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>