Use already-defined constant MODEL_VERSION

Replace literal 'version' with already-defined constant MODEL_VERSION.

Issue-ID: SO-666

Change-Id: I74d1c74d62b8beaceb1cb43e67ce3764c31ee9f0
Signed-off-by: Mariah Jacobs <mariah.jacobs@intel.com>

Fix build issue due to missing appc client libs

Changed versions from 1.3.0-SNAPSHOT to 1.3.0 for appc maven artifacts:
client-lib
client-kit

Change-Id: Ie4d98b400c7557655c74c3225b089c2ccc54b0cb
Issue-ID: SO-682
Signed-off-by: Michal Kabaj <michal.kabaj@nokia.com>

Merge "add junit for CamundaTaskClient"

Merge "Define constant instead of literal getVnfRecipe"

Merge "Removed commented-out code block"

Merge "Define constant instead of literal "template_name""

Removed commented-out code block

Removed two lines of commented-out code for readability.

Issue-ID: SO-666

Change-Id: If897ba1f7b4eaeab2bb41c2c7e7b8e6a8e34b245
Signed-off-by: Mariah Jacobs <mariah.jacobs@intel.com>

Return expression instead of variable 'returnResp'

Immediately return expression instead of assigning it to variable "returnResp".

Issue-ID: SO-666

Change-Id: I7a9de4ebfb59776d9225f3bd29ef57d184b2679a
Signed-off-by: Mariah Jacobs <mariah.jacobs@intel.com>

Define constant instead of literal getVnfRecipe

Constant GET_VNF_RECIPE is defined and used instead of duplicating
literal "getVnfRecipe".

Issue-ID: SO-666

Change-Id: Ia82aa03dd6381c7d70942f718c35d39a36e6ea25
Signed-off-by: Praneta Paithankar <praneta.paithankar@intel.com>

Define constant instead of literal "template_name"

Constant TEMPLATE_NAME is defined and used instaed of literal "template_name".

Issue-ID: SO-666

Change-Id: I8a8ab9fd8efc64003648601ee60eed0fef48b684
Signed-off-by: Praneta Paithankar <praneta.paithankar@intel.com>

Add OOF API documentation

Add OOF API documentation

Change-Id: I9adc172093cd547f4ddd3f07b1070054fbe0b3f1
Issue-ID: SO-660
Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>

Update Known issues

Issue-ID: SO-660

Change-Id: Iec417a8a70c496cccf111f8a0fe3599f0d73ed23
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>

Correct the R1 in the images/SO_1.png

Issue-ID: SO-660

Change-Id: I9dba2837f1c272707d99d84c1866ceb41cc65720
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>

remove the duplicate files

Issue-ID: SO-660

Change-Id: I9f8647989422d9a0a0e50092600cb2a47efc1528
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>

Changed the SNIRO to OOF

Issue-ID: SO-660

Change-Id: I3558ce7eddd8bf9fa00adc89441ab56fd8b2b473
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>

Update the OOF interaction in the arch

Issue-ID: SO-660

Change-Id: I35dc19783138257910469b45009c5a34c818d0eb
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>

updating the SO document reference names

Issue-ID: SO-660

Change-Id: I33b28aff86bff49990c1181d57d52cf7e5e4793d
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>

Correction of the SO docs take 2

Issue-ID: SO-660

Change-Id: I89cfdfd06f39b996202942774911f93e06fce030
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>

Merge "update release notes take1"

Merge "update copyright info"

update release notes take1

Issue-ID: SO-660

Change-Id: Id603cca18c5b35214f788b78d57e8a3563956d3a
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>

update copyright info

Issue-ID: SO-660

Change-Id: I8582aea66a9521a4b55796a078a64f94a99533e9
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>

Merge "Update release version."

Merge "Update release notes with known issue."

Update release version.

Issue-ID: SO-660

Change-Id: I6f89cd56b5ed52f7b165549e9701939fa8e4fb05
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>

Merge "Fix API documentation for UUI req"

Update release notes with known issue.

Issue-ID: SO-660

Change-Id: I6d07e5b6009e4c130078853ffce3383c1db2d31a
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>

Fix API documentation for UUI req

Fix API documentation for UUI req

Change-Id: Iac29eb404f5d3513f12c921018c15099a1aa3d40
Issue-ID: SO-660
Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>

Merge "APPC controller type for ScaleOut"

Merge "Fix formatting issue in RN"

APPC controller type for ScaleOut

Change-Id: I7d3ee2b272bfe9e2df201cb1ec6ee91cc2b8d292
Issue-ID: SO-602
Signed-off-by: Elena Kuleshov <ek1439@att.com>

Merge "Updated mso bpmn urn properties app c"

Merge "Set controllerType to DEFAULT when null."

Merge "Fix controllerType variable name"

Merge "Update ConfigScaleOut payload format"

Fix formatting issue in RN

Fix issue in quick link section
Change-Id: I6216fd607f273ccbbdb7132308f413a0b09e11c9
Issue-ID: DOC-271
Signed-off-by: Gildas Lanilis <gildas.lanilis@huawei.com>

Updated mso bpmn urn properties app c

Issue-ID: SO-663
Change-Id: I875653072f3d4319503aa74b0198e16d1c868e5f
Signed-off-by: Bancala, Ben (bb3476) <bb3476@att.com>
swapped read and write in mso bpmn urn properties

Issue-ID: SO-663
Change-Id: I875653072f3d4319503aa74b0198e16d1c868e5f
Signed-off-by: Bancala, Ben (bb3476) <bb3476@att.com>
reversed the order of read and write

Issue-ID: SO-663
Change-Id: I875653072f3d4319503aa74b0198e16d1c868e5f
Signed-off-by: Bancala, Ben (bb3476) <bb3476@att.com>

add junit for CamundaTaskClient

Change-Id: I3afd465b6b2536cd3a285865de9a8aa29c046bd8
Issue-ID: SO-665
Signed-off-by: Lukasz Muszkieta <lukasz.muszkieta@nokia.com>

Merge "Document Security section of the Release Notes"

Merge "Introduce resource sequence as per modelname"

Document Security section of the Release Notes

Change-Id: I51f436745c8edaaf3eb10f43665f93e22ab80af7
Issue-ID: DOC-271
Signed-off-by: Gildas Lanilis <gildas.lanilis@huawei.com>

Set controllerType to DEFAULT when null.

Change-Id: I6fa62b9dca0e7f69030fffab5cbc13fe57b39294
Issue-ID: SO-602
Signed-off-by: Elena Kuleshov <ek1439@att.com>

Fix controllerType variable name

Change-Id: Ida50f031fb4a4d81e8948e8b8c4e7611434aa202
Issue-ID: SO-602
Signed-off-by: Elena Kuleshov <ek1439@att.com>

Update ConfigScaleOut payload format

Change-Id: Ib05c30783b1c719c84b91be81cf052422da8fb9a
Issue-ID: SO-602
Signed-off-by: Elena Kuleshov <ek1439@att.com>

Merge "fix resource_operation_status table change"

Add RegionOne_flavorList to bpmn variables

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>

fix resource_operation_status table change

Issue-ID: SO-634

Change-Id: I2ddf86640d7d20808dbbe379949f61b9f8031769
Signed-off-by: guanwenyao <guanwenyao@chinamobile.com>

Fix OOF serviceResourceId bug

- 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>

Merge "Throw exception if resource receipe is not avail"

Introduce resource sequence as per modelname

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>

Throw exception if resource receipe is not avail

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>

Miscellaneous fixes for SO-SDNC integration

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>

Add ConfigScaleOut to ApplicationControllerAction

Change-Id: Ia9aaf05cd2a255491b0f73351653f1b622140e62
Issue-ID: SO-602
Signed-off-by: Arthur Martella <am153x@att.com>

Merge "Set CreateVfModuleInfra health check to false"

Set CreateVfModuleInfra health check to false

Issue-ID: SO-659
Change-Id: I4f7d9ce861db6d997ebc1108cdf1bd0995a7aa19
Signed-off-by: Bancala, Ben (bb3476) <bb3476@att.com>

Merge "Change topics setup for LCM"

Change topics setup for LCM

- Fix general topic properties.
- Fix junit for getLcmProperties

Change-Id: I424129c18a017908280c6bdc831a6a72ba1192ca
Issue-ID: SO-602
Signed-off-by: Elena Kuleshov <ek1439@att.com>

Merge "Correct controllerType property name"

Merge "Add space to 'Tunnel XConn'"

Correct controllerType property name

Change-Id: I71003381548d1d221854f78e0d0734994dd16d5f
Issue-ID: SO-602
Signed-off-by: Elena Kuleshov <ek1439@att.com>

Add space to 'Tunnel XConn'

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>

Merge "Fix OOF Homing Interface"

Fix OOF Homing Interface

- 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>

Merge "Use actual vfModuleId in APP-C payload."

Merge "Pass parameters from SDNC response to APP-C."

Use actual vfModuleId in APP-C payload.

Change-Id: I6d0d30b10615fd7b411ab723cf27fbeea2fec21e
Issue-ID: SO-602
Signed-off-by: Elena Kuleshov <ek1439@att.com>

Pass parameters from SDNC response to APP-C.

Change-Id: I7d83ee933361ca16d9b05639bfb84b9c1466887c
Issue-ID: SO-602
Signed-off-by: Elena Kuleshov <ek1439@att.com>

Merge "CorrelationId implementation correction"

fix query ns scale endless loop

Issue-ID: SO-634

Change-Id: I79ac70be79345c966642dc5b99c25b4a39dc575d
Signed-off-by: guanwenyao <guanwenyao@chinamobile.com>

Merge "Fix library CVEs in SO"

CorrelationId implementation correction

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>

Merge "Fix serviceInstanceName in Homing"

Fix serviceInstanceName in Homing

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>

Revert correlationId impl

This reverts commit c40b51651eff7997eb1bc823644a059b5406868c.

Change-Id: I99e03cf9be05110ca7b4609a35ce7106f3c30b3b
Issue-ID: SO-640
Signed-off-by: Lukasz Muszkieta <lukasz.muszkieta@nokia.com>

Merge "First take warning correction"

Merge "Removing license from OOF Homing Demand"

Removing license from OOF Homing Demand

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>

APPC client changes topic for controllerType

... 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>

Merge "Change LCM property for SDNC topic"

Merge "NETWORK_RECIPE for CM flows"

Change LCM property for SDNC topic

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>

NETWORK_RECIPE for CM flows

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>

Merge "Fix cloudOwner, cloudRegionId in Homing"

First take warning correction

Issue-ID: SO-635

Change-Id: I3c5051db8b8361df1cc1a5f555b32ce8578ed8b2
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>

Fix cloudOwner, cloudRegionId in Homing

Issue-ID: SO-637
Change-Id: I0c95e5d5c7a9ea60525d103823bd22495f6ac6a6
Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>

Merge "use space character instead tab characters"

Merge "add scale function in VfcAdapterRest.java"

add scale function in VfcAdapterRest.java

Issue-ID: SO-634

Change-Id: I57cc8f3e54de0fa02a437112aaa478b742c1ab9f
Signed-off-by: guochong <guochong@chinamobile.com>

use space character instead tab characters

Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa5f0643f8
Issue-ID: SO-632
Signed-off-by: Yulian Han <elaine.hanyulian@huawei.com>

Merge "Fix resource looping if AAI response empty"

Merge "createe2einstance status is processing"

Merge "fix endless loop"

Fix library CVEs in SO

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>

Merge "Fix customerLocation var in VcpeCusRes Flow"

Fix customerLocation var in VcpeCusRes Flow

Issue-ID: SO-636
Change-Id: Ieb6c3da2c0485585d009bfca1d689f4c485a2879
Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>

APPC client changes topic for controllerType

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>

Fix resource looping if AAI response empty

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>

fix endless loop

Issue-ID: SO-634

Change-Id: Id39f2487d111099abf09330f3f2f089605cbe945
Signed-off-by: guochong <guochong@chinamobile.com>

createe2einstance status is processing

but progress is 100 for wrong opertype

Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa5f0643f6
Issue-ID: SO-632
Signed-off-by: Yulian Han <elaine.hanyulian@huawei.com>

Merge "Added setting pnf name in pnf-pnp"