aboutsummaryrefslogtreecommitdiffstats
path: root/bpmn/MSOCommonBPMN
AgeCommit message (Collapse)AuthorFilesLines
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 Williams5-14/+23
- 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 Martella2-4/+4
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-30Add ConfigScaleOut to ApplicationControllerActionArthur Martella1-0/+1
Change-Id: Ia9aaf05cd2a255491b0f73351653f1b622140e62 Issue-ID: SO-602 Signed-off-by: Arthur Martella <am153x@att.com>
2018-05-30Merge "Change topics setup for LCM"Marcus Williams2-11/+6
2018-05-30Change topics setup for LCMElena Kuleshov2-11/+6
- 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-30Merge "Correct controllerType property name"Marcus Williams1-1/+1
2018-05-30Correct controllerType property nameElena Kuleshov1-1/+1
Change-Id: I71003381548d1d221854f78e0d0734994dd16d5f Issue-ID: SO-602 Signed-off-by: Elena Kuleshov <ek1439@att.com>
2018-05-29Fix OOF Homing InterfaceMarcus G K Williams4-66/+145
- 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-24Merge "Fix serviceInstanceName in Homing"Seshu Kumar M2-13/+22
2018-05-24Fix serviceInstanceName in HomingMarcus G K Williams2-13/+22
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-24Merge "Removing license from OOF Homing Demand"Seshu Kumar M2-12/+4
2018-05-23Removing license from OOF Homing DemandMarcus G K Williams2-12/+4
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-23APPC client changes topic for controllerTypeArthur Martella1-2/+7
... again. Back to just changing topic.read and topic.write based on controllerType (but still setting controllerType too, just in case). Change-Id: I175d20b998c6d141ca7587504535bd7bb494563c Issue-ID: INT-475 Signed-off-by: Arthur Martella <am153x@att.com>
2018-05-23Change LCM property for SDNC topicArthur Martella1-0/+2
Followup to https://gerrit.onap.org/r/#/c/48571/ Adding property sdnc-topic.read and sdnc-topic.write to match topic.sdnc.read and topic.sdnc.write on advice of SDNC LCM dev. Change-Id: I3c856f126ecb2f6b1c45df818ea7d294e0440e5c Issue-ID: INT-475 Signed-off-by: Arthur Martella <am153x@att.com>
2018-05-22APPC client changes topic for controllerTypeArthur Martella1-2/+7
When controllerType is sdnc, it's still using the appc topic names. Trying this to switch topic based on controllerType. Patch 2 changed to match APPCClient in ATT code base. Change-Id: I72e7e84720f73ac30d3d28e3387af2d537d301ad Issue-ID: INT-475 Signed-off-by: Arthur Martella <am153x@att.com>
2018-05-18Merge "Fix resource building logic"Seshu Kumar M1-1/+5
2018-05-17Fix resource building logicsubhash kumar singh1-1/+5
Fix resource building logic. Change-Id: I95064d945a6ff026a0ea10336a550d9bb8af401a Issue-ID: SO-624 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-05-17Revert placementInfo to placement in SniroHomingMarcus G K Williams2-3/+3
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 Williams2-4/+4
Issue-ID: SO-628 Change-Id: I3bd802fc966f466b12556d19e347a130e152a51d Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2018-05-15WorkflowResponse json issuesRob Daugherty17-131/+145
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 Martella4-3/+17
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-05-04Use tosca parser without resolving GetInputsubhash kumar singh1-1/+1
Use tosca parser without resolving GetInput. Change-Id: I964464dd76c0bdd096e67ce78ab4cc7c2e76a167 Issue-ID: SO-422 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-05-04Add enforcer.skip to pom.xmlArthur Martella1-2/+2
To prevent appc snapshot problem Also change appc version to SNAPSHOT Change-Id: Ifce05b7f44ccc70a2d654526d67da873dd325dcd Issue-ID: SO-605 Signed-off-by: Arthur Martella <am153x@att.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-25Set Resource Recipe Time Out Valc001491072-12/+15
Set Resource Recipe Time Out Val Change-Id: I7f304465c71837ee37e5fa99a48ca14d97d8f91f Issue-ID: SO-587 Signed-off-by: c00149107 <chenchuanyu@huawei.com>
2018-04-25Sonar-Critical:Use Dedicated ExceptionAS004650591-157/+157
File Name:ApplicationControllerAction.java Line: L127 L134 L142 L150 L155 L160 L165 Sonar Link: https://sonar.onap.org/project/issues?assignees=as00465059&id=org.onap.so%3Aso&open=AWJuJvroRGy6eclHE9B2&resolved=false&rules=squid%3AS00112&severities=CRITICAL%2CMAJOR Change-Id: I84c79aef3ceda73b9421b0a1881c5d14817c7840 Issue-ID: SO-593 Signed-off-by: AS00465059 <AS00465059@techmahindra.com>
2018-04-24Create VF Module ErrorRob Daugherty3-40/+89
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-23Sonar-Critical Bug FixingAS004650593-295/+303
File:RestfulUtil.java Line:L85 Sonar Link: https://sonar.onap.org/issues?assigned=false&projectUuids=AWHCr9eDWid2ybiDeORt&resolved=false&rules=squid%3AS1166&severities=BLOCKER%2CCRITICAL File:E2EServiceInstances.java Line:L263 L1059 Sonar Link: https://sonar.onap.org/issues?assigned=false&projectUuids=AWHCr9eDWid2ybiDeORt&resolved=false&rules=squid%3AS1166&severities=BLOCKER%2CCRITICAL File:OrchestrationRequests.java Line:L343 Sonar Link: https://sonar.onap.org/issues?assigned=false&projectUuids=AWHCr9eDWid2ybiDeORt&resolved=false&rules=squid%3AS1166&severities=BLOCKER%2CCRITICAL File:ASDCConfiguration.java Line:L286 L378 SonarLink: https://sonar.onap.org/issues?assigned=false&projectUuids=AWHCr9eDWid2ybiDeORt&resolved=false&rules=squid%3AS1166&severities=BLOCKER%2CCRITICAL File:ResourceInput.java Line:L287 Sonar Link: https://sonar.onap.org/issues?assigned=false&projectUuids=AWHCr9eDWid2ybiDeORt&resolved=false&rules=squid%3AS1166&severities=BLOCKER%2CCRITICAL File:ResourceRecipeRequest.java Line:L136 Sonar Link: https://sonar.onap.org/issues?assigned=false&projectUuids=AWHCr9eDWid2ybiDeORt&resolved=false&rules=squid%3AS1166&severities=BLOCKER%2CCRITICAL File:ResourceRequestBuilder.java Line:L108 L214 Sonar Link: https://sonar.onap.org/issues?assigned=false&projectUuids=AWHCr9eDWid2ybiDeORt&resolved=false&rules=squid%3AS1166&severities=BLOCKER%2CCRITICAL File:CheckAaiForCorrelationIdDelegate.java Line:L70 Sonar Link: https://sonar.onap.org/issues?assigned=false&projectUuids=AWHCr9eDWid2ybiDeORt&resolved=false&rules=squid%3AS1166&severities=BLOCKER%2CCRITICAL File:AbstractSdncOperationTask.java Line:L359 Sonar Link: https://sonar.onap.org/issues?assigned=false&projectUuids=AWHCr9eDWid2ybiDeORt&resolved=false&rules=squid%3AS1166&severities=BLOCKER%2CCRITICAL File:DmaapClient.java Line:L62 Sonar Link: https://sonar.onap.org/issues?assigned=false&projectUuids=AWHCr9eDWid2ybiDeORt&resolved=false&rules=squid%3AS1166&severities=BLOCKER%2CCRITICAL File:HasAnnotationPropertyWithValueMatcher.java Line:L60 Sonar Link: https://sonar.onap.org/issues?assigned=false&projectUuids=AWHCr9eDWid2ybiDeORt&resolved=false&rules=squid%3AS1166&severities=BLOCKER%2CCRITICAL Change-Id: Ic168a118790c31850a9f32f98465be5d52b8c96f Issue-ID: SO-581 Signed-off-by: AS00465059 <AS00465059@techmahindra.com>
2018-04-21Fix request parameter building for sdnc resourcesubhash kumar singh1-6/+1
Fix request parameter building for sdnc resource Change-Id: Ib87c08e31837ec9f2c10bcfe9ce7caccfb3f461e Issue-ID: SO-422 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-04-21Merge "Fix input for SDNC resource creaation"Chuanyu Chen1-2/+7
2018-04-20Fix input for SDNC resource creaationsubhash kumar singh1-2/+7
Fix version id and model name. Fix input param for sdnc resource request. Change-Id: I6ade488aec061c9bf4dc0cd04e124896a71571be Issue-ID: SO-422 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-04-20Update create flow for E2E servicec001491074-9/+74
Update create generic flow for E2E service Change-Id: I7f5c912348ce0d0ee9035aa3a5e34979ee14b247 Issue-ID: SO-583 Signed-off-by: c00149107 <chenchuanyu@huawei.com>
2018-04-18AAIRestClient support for Basic AuthRob Daugherty2-21/+10
Adding support for Basic Auth in the AAI Rest Clients because ONAP uses this (whereas ECOMP uses 2-way SSL). In general, each AAI client will allow the user to configure properties called "aai.auth" and "mso.msoKey". If these are set, then the client will add the Authorization header to every request. Change-Id: I7c81ec05d2ec4a7dca131f2e9e19d341ac89b09f Issue-ID: SO-576 Signed-off-by: Rob Daugherty <rd472p@att.com>
2018-04-16Change version of sdc-tosca dependencyArthur Martella1-16/+1
Rolling back version of sdc-tosca library to 1.3.0 to match sdc-distribution-client Removing the exclusion of jtosca and letting sdc-tosca pick the version it wants Change-Id: I5ac8775cce41a92c1964c7a2f24bf0a6b1e3e5df Issue-ID: SO-564 Signed-off-by: Arthur Martella <amartell@research.att.com>
2018-04-11Merge "Fix exception case in null return"Seshu Kumar M1-0/+9
2018-04-10Fix exception case in null returnsubhash kumar singh1-0/+9
Fix exception case in null return. Change-Id: I7f6a0ec3c372e34c1f04468be729d1cbc079e991 Issue-ID: SO-422 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-04-10Merge "Bug Fix - OOF api updates processing flavor-label"Seshu Kumar M6-127/+119
2018-04-10Merge "Fix URL to get CSAR name"Seshu Kumar M1-3/+4
2018-04-10Merge "Add service type for bpmn input"Seshu Kumar M1-0/+1
2018-04-10Merge "Update web.xml file to enable properties"Seshu Kumar M1-0/+1
2018-04-10Merge "Fix JsonProperty for BpmnParam"Seshu Kumar M1-1/+1
2018-04-10Fix URL to get CSAR namesubhash kumar singh1-3/+4
Fix URL to collect CSAR name. Change-Id: I6ba5baf5b41cb24793e510f93d1a9ffe6de4407e Issue-ID: SO-422 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-04-10Add service type for bpmn inputsubhash kumar singh1-0/+1
Add service type for bpmn input. Change-Id: Icc7487724bd4f6df5a78473f39a0e99a4e16cd28 Issue-ID: SO-422 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-04-10Update web.xml file to enable propertiessubhash kumar singh1-0/+1
Update web.xml to enable reacing properties from MSO-API-Prop. Change-Id: I7dc1f48ff798c6f83e8976584edb5dfd9152f950 Issue-ID: SO-422 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-04-10Fix JsonProperty for BpmnParamsubhash kumar singh1-1/+1
Fix JsonProperty for BpmnParam. Change-Id: I98c9e92ccd08c0d5965d9f18dc68ab6d0c7f822b Issue-ID: SO-422 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-04-10Fix variables in CreateVnfReceipesubhash kumar singh0-0/+0
Fix variable in CrateVnf receipe. Change-Id: Ibca9bbefc64de80103825c4ce0f0ca6541956638 Issue-ID: SO-422 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-04-10Fix variable to fetch request idsubhash kumar singh0-0/+0
Fix variable to fetch request id. Change-Id: I936dae6004083816956ecb8bff5e76327ce81766 Issue-ID: SO-422 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
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>