Merge "Fix sdc-tosca version" into casablanca

Merge "update the release to 1.3.4" into casablanca

Fix sdc-tosca version

Fix sdc-tosca version.

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

Merge "Fix model vnfresource bean annotation" into casablanca

Fix model vnfresource bean annotation

Fix model vnfresource bean annotation.

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

update the release to 1.3.4

Issue-ID: SO-1249

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

Merge "Add ActivitiesBBs to building block detail" into casablanca

Merge "Add aLaCarte variable to ExecuteActivity." into casablanca

Do not validate certain BBs

changed resource type from CUSTOM to NO_VALIDATE
when building block detail is CUSTOM skip validation

Change-Id: Ie00fad1f96071703a35b96cc5fe83ce5dc2092bb
Issue-ID: SO-1243
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

Fix intgration issue for E2E service

Fix intgration issue for E2E service.

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

Add ActivitiesBBs to building block detail

Change-Id: I96524757c4efb93f5ff03f31a4cf8dcb5fa88025
Issue-ID: SO-1243
Signed-off-by: Kuleshov, Elena (ek1439) <evn@att.com>

Add aLaCarte variable to ExecuteActivity.

Change-Id: I5dbc470a7ccc92847985681ea9fb39566fdb443f
Issue-ID: SO-1243
Signed-off-by: Kuleshov, Elena (ek1439) <evn@att.com>

Merge "Fix retrieval for SDNC endpoint" into casablanca

Merge "Fix version string in query" into casablanca

Merge "Fix parsing for pnf-name" into casablanca

Fix retrieval for SDNC endpoint

Fix retrieval for SDNC endpoint.

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

Fix version string in query

Fix version string in query.

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

Fix parsing for pnf-name

Fix parsing for pnf-name.

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

use config value instead hard code of url

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

asdc process vf resource into db bug fix

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

Merge "update the version to 1.3.3" into casablanca

Merge "Changed nodeport from 9091 to 30224" into casablanca

update the version to 1.3.3

Change-Id: I385abf3c7d0d04df8a3bf20f79d24c6d595691d6
Issue-ID: SO-1242
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>

Changed nodeport from 9091 to 30224

Change-Id: I64999b518b5ea2d20bd74a07ed1e566df065688f
Issue-ID: SO-1164
Signed-off-by: eHanan <eoin.hanan@ericsson.com>

Fixing JsonMappingException issue

Change-Id: I6654464a85152058787e5ce2530c0cf332c8e6e0
Issue-ID: SO-1236
Signed-off-by: Shinu John <shinu.john@ericsson.com>

Fix Default Record

Issue-ID: SO-1184

Change-Id: I2708484dce63be8bb043231444aec6eb6438fdae
Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>

Merge "insert service progress into db if no record" into casablanca

insert service progress into db if no record

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

Enhanced Exception handling.

Issue-ID: SO-1182
Change-Id: Iae4a0072b637ddd0e64c4ec54421509e1c03ccc5
Signed-off-by: Prema Bhatt <pb6115@att.com>

Merge "Modify Retry" into casablanca

Merge "Not invoking automatic BPMN deployment" into casablanca

Modify Retry

Issue-ID: SO-1182

Change-Id: Icbba1bdbb210d868e67c6f9b2ca029648534bbe0
Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>

Not invoking automatic BPMN deployment

SO's SDC Controller is not invoking automatic BPMN deployment
on Workflow distribution.

Submitting this change on behalf of Elena Kuleshov.

Change-Id: Ice68f15d505a88099da61c992a20b943dd40d756
Issue-ID: SO-1214
Signed-off-by: Rob Daugherty <rd472p@att.com>

Fix for vCPE flows

A sequence flow was accidentally deleted in the
DoCreateVnfAndModules process. This fixes it.

Also adding VfModuleModuleNames support for the original
(Not V2) version of CreateVcpeResCustService.

Change-Id: I20bba7448802a548bb913bc2e016c9c0f2abdd42
Issue-ID: SO-1213
Signed-off-by: Rob Daugherty <rd472p@att.com>

Merge "Bug Fixes November 16th" into casablanca

Merge "Fix retrieval of resourceInputObj in delete e2e" into casablanca

Merge "Fix namespace for requestdb update" into casablanca

Fix retrieval of resourceInputObj in delete e2e

Fix retrieval of resourceInputObj in delete e2e.

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

Fix namespace for requestdb update

Fix namespace for requestdb update.

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

Merge "Add deployment view of SO" into casablanca

Merge "Add Monitoring feature details" into casablanca

Merge "Fix the API issue Take 2" into casablanca

Merge "Fix for the API problem" into casablanca

Merge "Fix variable set for e2e service" into casablanca

Merge "Fix the service id modified" into casablanca

Add deployment view of SO

Issue-ID: SO-1230

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

Add Monitoring feature details

Change-Id: Ib4e591bfc4176e8a9786a161a8f403ac47efe982
Issue-ID: SO-1230
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>

Fix the API issue Take 2

Change-Id: Ie26ff7540a1194cd36242c91858b1ed5961365d9
Issue-ID: SO-1230
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>

Fix for the API problem

Change-Id: I50726946cfb425952c8947d8ec643fa753645399
Issue-ID: SO-1230
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>

Merge "Fix request resource building" into casablanca

Fix variable set for e2e service

Fix variable set for e2e service.

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

Fix the service id modified

Fix the service id modified.

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

Fix request resource building

Fix request resource building.

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

Bug Fixes November 16th

fix failing junit when heatID not available
provide name if ID is not present on delete op
removed logic to skip unassign sdnc in rollback flows
Move default settings to CrVfModRequest pojo.
Check for null backout and failIfExists params - 1810.
Updated exception message and test
Added tests for networkCustomization not found
Added tests for delete and update network
Separated networkResourceCustomization and networkResource lookups
Removed version check as not necessary for setting boolean

Change-Id: Ia4b409244dc5ebdbb163d4a178713115719366ca
Issue-ID: SO-1231
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

Merge "Fix the sdnc groovy" into casablanca

Fix the sdnc groovy

Fix the sdnc groovy for setting value.

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

Added script with table data

Issue-ID: SO-1224
Change-Id: I38dfb86ae866aa510e16b95f2c86619bc663fe2f
Signed-off-by: Brittany Plummer (bp896r) <bp896r@att.com>

Merge "Fix invocation of resource receipe" into casablanca

Bump version to 1.3.2

Change-Id: I7db9974c232bf06b6a9b0d326bbe0c3acb9f1788
Issue-ID: SO-1222
Signed-off-by: Rob Daugherty <rd472p@att.com>

Merge "Accept vCPE vfModuleNames in NB API" into casablanca

Merge "Update Library Version" into casablanca

Update Library Version

Update javax.servlet
Issue-ID: SO-1171

Change-Id: I063cefdb3ad405045b3d6f1ea301da83a1cc2361
Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>

Accept vCPE vfModuleNames in NB API

This affects the vCPE custom flow.  You can specify zero or more
VF Module names (correlated with the model invariant UUID) in the
user parameters, like this:

  "userParams": [
    .
    .
    .
    {
      "name": "VfModuleNames",
      "value": [
        {
          "VfModuleModelInvariantUuId": "5366deab-be06-44c7-b4f7-77e657b78b25",
          "VfModuleName": "VGW:e2:25:25:25:%"
        }
      ]
    }
  ]

Change-Id: I673c04775bf5796079dc0ed19890e73e76820ac0
Issue-ID: SO-1213
Signed-off-by: Rob Daugherty <rd472p@att.com>

Fix invocation of resource receipe

Fix invocation of resource receipe.

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

Merge "Fix auth for catalog db" into casablanca

Fix auth for catalog db

Fix auth for catalog db.

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

Update swagger html

Change-Id: I44ed8b9b38392be1e0fff017dfe06c97fec6310d
Issue-ID: SO-1077
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>

Update release notes for Casablanca branch.

Change-Id: I526efa36cdc29d3d6cd7c48c695d8adfbe218044
Issue-ID: SO-1077
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>

Fix auth token for request-db

Fix auth token for request-db.

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

Merge "vCPE BRG allottedResourceRole is null" into casablanca

vCPE BRG allottedResourceRole is null

In Beijing we used:
o.getNfRole()

In Casablanca, it was:
o.getTargetNetworkRole()

I'm changing it to:
o.getTargetNetworkRole() != null ? o.getTargetNetworkRole() : o.getNfRole()

Change-Id: I874b2f01fd651bb38a361fa9c36f9937b1f02b2f
Issue-ID: SO-1200
Signed-off-by: Rob Daugherty <rd472p@att.com>

Up Timer

Issue-ID: SO-1209

Change-Id: Icb018e4a178ab13f6d142bdcb1000411c0d0dedf
Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>

Update Schema

Issue-ID: SO-1211

Change-Id: I7a7c6788010c3c3bbaba0d72ec656cebc124d6e6
Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>

Merge "Update Schema" into casablanca

Merge "bug fixing" into casablanca

Merge "Add Ref Data" into casablanca

Update Schema

Issue-ID: SO-1211

Change-Id: I7eb43d47f51790224b84ac6d58b89b9e9d9dfe83
Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>

Merge "Fix the uri for BPMN invocation" into casablanca

bug fixing

during pnf flow service instance is now created

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

Add Ref Data

Add Missing reference data for Test cases

Issue-ID: SO-1184

Change-Id: Ibf3ed0b802885f64b7d4850b5209932fcf35524a
Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>

Fix the uri for BPMN invocation

Fix the uri for BPMN invocation.

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

Merge "Get Csar file bug fix" into casablanca

Get Csar file bug fix

modify getting openecomp.db.endpoint config codes
Delete bug fix for R3 config changes

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

Fix issues with mulicloud adapter parameters

Use the static final string variable for the parameter
key values instead of literal string of the variable name.

Also, vf_module_id and vnf_id (generic vnf id for multicloud)
are already part of the required input list, so they are
not needed to be added to the list of inputs.

Change-Id: I2b0bbf385e4114f0432673a3d7e8c9d652226f0a
Issue-ID: SO-1210
Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>

Fix the variable to retrieve resource sequence

Fix the variable to retrieve resource sequence.

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

Replace xmlencode with xmlEscape

Replace xmlencode with xmlEscape.

Change-Id: Ib84e7e4f10881abbc938ee03b66ed3358f06e2dc
Issue-ID: SO-689
Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
(cherry picked from commit d080aa2ebd5c8b98e0210185030b90ed5a4a6edd)

Merge "Fix the retrival of resource recipe" into casablanca

Fix the retrival of resource recipe

Fix the retrival of resource recipe.

Change-Id: Iaec1046f487ce61b995d61414dbe4229e8a51115
Issue-ID: SO-1197
Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
(cherry picked from commit 1c831520f085527c9525d8a757e9c0ccddae0219)

fix installing VL resource bug

Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa5f064406
Issue-ID: SO-1184
Signed-off-by: Yulian Han <elaine.hanyulian@huawei.com>
(cherry picked from commit a2e9ad5d9b34d764493951737ab73821b03bba0c)

Fix OOF Directives processing

- Various fixes to process OOF directives
correctly
- Add orchestrator userParam Processing to ala carte
and vCPE path to ensure multicloud adapter can be
called when homing
- Fix JsonUtils to accept json object as well as
strings
- Adds JsonUtils unit tests to ensure json object
code works correctly and didn't break previous func.
- Fix OOF Homing codes processing of OOF response to
match Casablanca response from OOF (including OOF
directives)
- Add CloudIdentity get and put to catalogDBClient,
along with junit tests - to enable creation of cloudSites
- Fix serviceResourceId check

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

Bug fixes November 10th

use network name on delete when heat id not present
compare mod count index as Integers

Change-Id: I76e567378fed83fb857d4d16b88f7a199d0df475
Issue-ID: SO-1204
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

arUrl variable is null on vCPE PUT to AAI

Change-Id: Iee4641f098c519b7833a1f5038a2024b42a11198
Issue-ID: SO-1201
Signed-off-by: Rob Daugherty <rd472p@att.com>

Updated pom.xml appc library version to 1.4.0

Issue-ID: SO-1199
Change-Id: I5c1f8d6e434ce12e370435bcae4f22485c5d249e
Signed-off-by: Prema Bhatt <pb6115@att.com>

Removed retry from RainyDay tbl for healthCheckBB

Updated rainy_day_handler_macro to remove retry for
GenericVnfhealthCheckBB and ConfigurationScaleOutBB. Updated file name
to be consistent.

Issue-ID: SO-1185
Change-Id: If49e5ec8e5d98c1dfad1fdc678a4a7fc45b2566e
Signed-off-by: Prema Bhatt <pb6115@att.com>

Merge "bug fixing with reading dmaap message" into casablanca

Merge "Make homingBB optinal and fix homing process" into casablanca

bug fixing with reading dmaap message

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

Make homingBB optinal and fix homing process

Properly defined whether or not to call homing at AssignVnfBB where by
default homing doesn't get called, but if a homing solution is provided,
then we resolve the solutions.
The goal is to change the BPMN definition to use serviceTask rather
than a scriptTask, allowing to use the Srping component to inject
logic.
Also we create a new HomingV2 component that is agnostic of the homing
implementation, which goal is to route the homing request to the proper
bbackend implementation; e.g. oof vs homing.
Finally, we remove the un-needed variables set in the execution context.

Change-Id: Ic9fb2a599c6375617c92a6d3462b62921ee47a6f
Issue-ID: SO-1168
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>

Fixing scaleOut workflow looping issue

Updated both GenericVnfHealthCheck and ConfigurationScaleOut BB with
appropriate Exception catch block and added Exception unit test.

Issue-ID: SO-1182
Change-Id: Ia29741a4a7d8e1bb759ace4fd888864141d224d6
Signed-off-by: Prema Bhatt <pb6115@att.com>

removed retry from rainy day table

Issue-ID: SO-1185
Change-Id: I6b972828d1a5b57cbfe532d0b8a79a3a10711b3b
Signed-off-by: bb3476 <bb3476@att.com>