aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-06-01Merge "Introduce resource sequence as per modelname"Chuanyu Chen2-3/+6
2018-05-31Merge "fix resource_operation_status table change"Chuanyu Chen3-8/+9
2018-05-31Add RegionOne_flavorList to bpmn variablesMarcus G K Williams3-0/+5
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 resource_operation_status table changeguanwenyao3-8/+9
Issue-ID: SO-634 Change-Id: I2ddf86640d7d20808dbbe379949f61b9f8031769 Signed-off-by: guanwenyao <guanwenyao@chinamobile.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-31Merge "Throw exception if resource receipe is not avail"Seshu Kumar M1-4/+13
2018-05-31Introduce resource sequence as per modelnamesubhash kumar singh2-3/+6
Resource sequence can be defined in mso.apihandler-infra.properties file as per following: mso.workflow.custom.<service-model-name>.resource.sequence=<, separated values> Change-Id: I156cfcfea4936be541014726dc6063f7f4e2d2b4 Issue-ID: SO-422 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-05-31Throw exception if resource receipe is not availsubhash kumar singh1-4/+13
Throw exception if resource receipe is not available for the resource in service. Change-Id: Ic6110a1f03d9a0f22d963812eab99e571191140d Issue-ID: SO-422 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-05-31Miscellaneous fixes for SO-SDNC integrationArthur Martella3-4/+5
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 "Set CreateVfModuleInfra health check to false"Marcus Williams1-1/+1
2018-05-30Set CreateVfModuleInfra health check to falseBancala, Ben (bb3476)1-1/+1
Issue-ID: SO-659 Change-Id: I4f7d9ce861db6d997ebc1108cdf1bd0995a7aa19 Signed-off-by: Bancala, Ben (bb3476) <bb3476@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-30Merge "Add space to 'Tunnel XConn'"Marcus Williams9-25/+25
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-30Add space to 'Tunnel XConn'Arthur Martella9-25/+25
Adding space to change TunnelXConn to Tunnel XConn so that SO will match SDNC. Change-Id: I2a752fd1c6b3ed115c8a2dafbd47e3ce24f49a57 Issue-ID: SO-650 Signed-off-by: Arthur Martella <am153x@att.com>
2018-05-30Merge "Fix OOF Homing Interface"Seshu Kumar M6-86/+186
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 "Use actual vfModuleId in APP-C payload."Seshu Kumar M1-2/+2
2018-05-29Merge "Pass parameters from SDNC response to APP-C."Seshu Kumar M2-19/+97
2018-05-29Use actual vfModuleId in APP-C payload.Elena Kuleshov1-2/+2
Change-Id: I6d0d30b10615fd7b411ab723cf27fbeea2fec21e Issue-ID: SO-602 Signed-off-by: Elena Kuleshov <ek1439@att.com>
2018-05-29Pass parameters from SDNC response to APP-C.Elena Kuleshov2-19/+97
Change-Id: I7d83ee933361ca16d9b05639bfb84b9c1466887c Issue-ID: SO-602 Signed-off-by: Elena Kuleshov <ek1439@att.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>