summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-05-29Fix OOF Homing InterfaceMarcus G K Williams6-86/+186
- 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-29Merge "CorrelationId implementation correction"Seshu Kumar M13-383/+411
2018-05-29fix query ns scale endless loopguanwenyao1-5/+4
Issue-ID: SO-634 Change-Id: I79ac70be79345c966642dc5b99c25b4a39dc575d Signed-off-by: guanwenyao <guanwenyao@chinamobile.com>
2018-05-29Merge "Fix library CVEs in SO"Chuanyu Chen1-15/+33
2018-05-28CorrelationId implementation correctionLukasz Muszkieta13-383/+411
service instance id is now correctly passed in case of delete instance operation Change-Id: Ifb5c27194d6a588852051df0aa391b559b484ac0 Issue-ID: SO-640 Signed-off-by: Lukasz Muszkieta <lukasz.muszkieta@nokia.com>
2018-05-24Merge "Fix serviceInstanceName in Homing"Seshu Kumar M4-13/+28
2018-05-24Fix serviceInstanceName in HomingMarcus G K Williams4-13/+28
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-24Revert correlationId implLukasz Muszkieta13-410/+384
This reverts commit c40b51651eff7997eb1bc823644a059b5406868c. Change-Id: I99e03cf9be05110ca7b4609a35ce7106f3c30b3b Issue-ID: SO-640 Signed-off-by: Lukasz Muszkieta <lukasz.muszkieta@nokia.com>
2018-05-24Merge "First take warning correction"Seshu Kumar M3-6/+6
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-23Merge "Change LCM property for SDNC topic"Rob Daugherty1-0/+2
2018-05-23Merge "NETWORK_RECIPE for CM flows"Marcus Williams6-9/+9
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-23NETWORK_RECIPE for CM flowsRob Daugherty6-9/+9
Increased ACTION field in all recipe tables to 40 chars. Change-Id: I4eb76ce1859f901adb07df753663f9f46372f15f Issue-ID: SO-639 Signed-off-by: Rob Daugherty <rd472p@att.com>
2018-05-23Merge "Fix cloudOwner, cloudRegionId in Homing"Seshu Kumar M2-0/+15
2018-05-23First take warning correctionseshukm3-6/+6
Issue-ID: SO-635 Change-Id: I3c5051db8b8361df1cc1a5f555b32ce8578ed8b2 Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
2018-05-23Fix cloudOwner, cloudRegionId in HomingMarcus G K Williams2-0/+15
Issue-ID: SO-637 Change-Id: I0c95e5d5c7a9ea60525d103823bd22495f6ac6a6 Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2018-05-23Merge "use space character instead tab characters"Seshu Kumar M1-59/+59
2018-05-23Merge "add scale function in VfcAdapterRest.java"Seshu Kumar M1-0/+27
2018-05-23add scale function in VfcAdapterRest.javaguochong1-0/+27
Issue-ID: SO-634 Change-Id: I57cc8f3e54de0fa02a437112aaa478b742c1ab9f Signed-off-by: guochong <guochong@chinamobile.com>
2018-05-23use space character instead tab charactersYulian Han1-59/+59
Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa5f0643f8 Issue-ID: SO-632 Signed-off-by: Yulian Han <elaine.hanyulian@huawei.com>
2018-05-23Merge "Fix resource looping if AAI response empty"Chuanyu Chen1-10/+14
2018-05-23Merge "createe2einstance status is processing"Chuanyu Chen2-69/+66
2018-05-23Merge "fix endless loop"Chuanyu Chen1-1/+1
2018-05-23Fix library CVEs in SOchenying831-15/+33
Fix additional CVEs: berkeleydb For CVE-2016-3418 CVE-2016-0694 CVE-2016-0689 CVE-2016-0682 commons-email For CVE-2017-9801 jasypt For CVE-2014-9970 jetty For CVE-2017-9735 libxi For CVE-2016-7946 CVE-2016-7945 netty For CVE-2016-4970 xalan For CVE-2014-0107 Issue-ID: SO-579 Change-Id: Ifbc606367f2553f28b10b8a9644ece7785de6405 Signed-off-by: chenying83 <chenying83@huawei.com>
2018-05-23Merge "Fix customerLocation var in VcpeCusRes Flow"Seshu Kumar M1-1/+2
2018-05-22Fix customerLocation var in VcpeCusRes FlowMarcus G K Williams1-1/+2
Issue-ID: SO-636 Change-Id: Ieb6c3da2c0485585d009bfca1d689f4c485a2879 Signed-off-by: Marcus G K Williams <marcus.williams@intel.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-22Fix resource looping if AAI response emptysubhash kumar singh1-10/+14
Fix ressource looping if AAI response is empty for resource list. Change-Id: I244d3836beb98ec2689c71df5c61f24f40619d96 Issue-ID: SO-632 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-05-22fix endless loopguochong1-1/+1
Issue-ID: SO-634 Change-Id: Id39f2487d111099abf09330f3f2f089605cbe945 Signed-off-by: guochong <guochong@chinamobile.com>
2018-05-22createe2einstance status is processingYulian Han2-69/+66
but progress is 100 for wrong opertype Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa5f0643f6 Issue-ID: SO-632 Signed-off-by: Yulian Han <elaine.hanyulian@huawei.com>
2018-05-22Merge "Added setting pnf name in pnf-pnp"Seshu Kumar M4-4/+54
2018-05-22Merge "Add correlationId to ServiceInstancesRequest"Seshu Kumar M13-384/+410
2018-05-21Move pnfDefaultTimeout to dmaap.propertiesArthur Martella3-7/+4
Re: https://gerrit.onap.org/r/#/c/48031/1 SO is failing health check because pnfCheckInputs is not found in dmaap.properties, and pnf.properties is not being read, since applicationContext.xml has two PropertyPlaceholderConfigurer attributes, but it's only using one. Moved defaultTimeout to dmaap.properties, where applicationContext.xml will be able to read it, and renamed it to pnfDefaultTimeout to make it clearer what it is. Change-Id: I6490de472fbf4875e53204f4248c6325787c8af5 Issue-ID: SO-506 Signed-off-by: Arthur Martella <am153x@att.com>
2018-05-21Merge "Adjust INFO.yaml"Rob Daugherty1-1/+17
2018-05-21Merge "Added checking input variables in pnf-pnp"Rob Daugherty7-104/+271
2018-05-18Adjust INFO.yamlJessica Wagantall1-1/+17
Addition: - Marcus Williams - Sanchita Pathak Removal: - Tal Liron - Heliu Zhong - Yuanwei Yang Change-Id: I4d5ed58584c387fe180dc2e8d91c9d9fc35ca8ea Issue-ID: CIMAN-134 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
2018-05-18Merge "Fallback for cloud region calls to AAI"Rob Daugherty1-3/+11
2018-05-18Fallback for cloud region calls to AAIArthur Martella1-3/+11
In the integration environment, there's no cloud region named att-aic. Therefore, try without att-aic first (CLOUD-REGION) and if that fails, try att-aic (DEFAULT-CLOUD-REGION) Change-Id: Ie4a4a3924eb6fe1120519e124a7967a62c96428f Issue-ID: INT-475 Signed-off-by: Arthur Martella <am153x@att.com>
2018-05-18Fix subcategory population for vnf resourcesubhash kumar singh1-1/+1
Fix subcategory population for vnf resource. Change-Id: Ib9b03a19cc12ed66f552096a9b3a499ac6ef574f Issue-ID: SO-630 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-05-18Merge "Fix parsing for category and subcategory"Seshu Kumar M1-0/+2
2018-05-18Fix parsing for category and subcategorysubhash kumar singh1-0/+2
Fix parsing of VNF resource. Change-Id: Ib2adfaab1ae9bb5fa9cff195cdecbdea5aea18e1 Issue-ID: SO-630 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.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-17Added checking input variables in pnf-pnpbiniek7-104/+271
Change-Id: I1a4f4b9704385a17995e76d4b87484c2f588b889 Issue-ID: SO-506 Signed-off-by: biniek <lukasz.biniek@nokia.com>
2018-05-17Merge "Fix resource population to DB"Seshu Kumar M2-16/+43
2018-05-17Fix resource population to DBsubhash kumar singh2-16/+43
Fix resource population to DB. Change-Id: Iae25ce2f15fa121a45a55559458fcbbd217f2c7d 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 Williams4-5/+5
Issue-ID: SO-628 Change-Id: I6e9e44d453a72b4e9ec1a0abe99eb8028aa5ba1a Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>