Age | Commit message (Collapse) | Author | Files | Lines |
|
This patch fixes this for template https://gerrit.onap.org/r/#/c/ccsdk/cds/+/95081/
but not for script, where the occurrence value might be needed.
In reality, this overall occurrence thing is a mistacke, but
it's solving an issue that I yet don't know how to properly
solve.
Change-Id: I7f8579ad2bde3f96b06aaf09c8b8c67d4b97e7b0
Issue-ID: CCSDK-1693
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
Signed-off-by: Shaaban Ebrahim <shaaban.eltanany.ext@orange.com>
(cherry picked from commit d39772eaeb2c6e6665c4a6d41f6af84f63151184)
|
|
Refactoring ResourceAssignmentUtils parseResponseNodeForPrimitiveTypes API to remove cyclic value assignments
Issue-ID: CCSDK-1748
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: I27b5a7d3ed2df38cf4e3e44686aec094ebdb5f25
Refactoring ResourceAssignmentUtils
Changing isNull condition to isNullOrEmpty to make sure Empty value doesn't get assigned to resource
Issue-ID: CCSDK-1748
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: I0744537c7ddec80f20ffd7e6545b947439f63743
Resource Resolution Refactoring
Refactoring some logging statements and adding new loggers
Issue-ID: CCSDK-1748
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: I5676659eea01056a7d29206f13473a4361516755
|
|
Issue-ID: CCSDK-1718
Issue-ID: CCSDK-1717
Issue-ID: CCSDK-1746
Refactoring Resource Resolution Component
Use Case:
----------
Input Value (IV): It can be API Input Value or API Default value
If a Resource is marked as Input
-> pick IV
If a Resource is marked as other than Input
-> pick IV
-> if IV is not present then resolve it as per DataDictionary Definition
** Return Error if Resource is not resolved using assert : ResourceAssignmentUtils.assertTemplateKeyValueNotNull
Change-Id: Ib92d970d07a1dcf7362ab499a398de49ae8323a1
Change-Id: I42c1c15070f77bc9e7e73cc0dc2ee3a30ff19564
Signed-off-by: Steve Siani <alphonse.steve.siani.djissitchi@ibm.com>
|
|
|
|
Fix: Fix for list typed data resolution retrieved from database table.
Improvement: exposing occurrence property to template engine;
useful, when doing multi-occurrence template generation,
to index list data resolved previously.
Issue-ID: CCSDK-1693
Signed-off-by: Serge Simard <serge@agilitae.com>
Change-Id: I3a601ebabfcd42c439a515d3fe44ff4fc00b2314
Signed-off-by: Serge Simard <serge@agilitae.com>
|
|
Issue-ID: CCSDK-1615
Signed-off-by: Steve Siani <alphonse.steve.siani.djissitchi@ibm.com>
Change-Id: I1035aa05b4b038095c9d17fdcd00c462bed5085a
|
|
Issue-Id: CCSDK-1623
Signed-off-by: Oleg Mitsura <oleg.mitsura@amdocs.com>
Change-Id: Iec7c6909c39c34894be11bfdac45f6394010d9cf
|
|
Issue-ID: CCSDK-1611
Signed-off-by: Steve Siani <alphonse.steve.siani.djissitchi@ibm.com>
Change-Id: I6bb9878ab4fea7024125fa4ce6293bfb8faee316
|
|
|
|
When being called by SDNC, expected response format is a String, not
a Json, then within SDNC we call jsonToTCtx by passing the String as
input.
When we receive the Json instead of a string, that function throw an
exception because it expects a String.
Also, SDNC marshall directly within the SLI context the Json object,
but the path isn't the one being looked for.
Finally, resource resolution, by its definition, as per as its model,
should set the returned value as a string, not a json.
Change-Id: Iffae3128507069c2546e179c17e50fb16e43f310
Issue-ID: CCSDK-1606
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
|
|
Change-Id: Ia42f56541bef0418dddb797c019ecda3afa6983b
Issue-ID: CCSDK-1380
Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
|
|
Change-Id: Ife75d290540e3ed0e0dfd0a82785a498607a2d25
Issue-ID: CCSDK-1577
Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
|
|
|
|
|
|
|
|
Change-Id: I44a3596c05b02faa171f90b9207f774ce34976a6
Issue-ID: CCSDK-1577
Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
|
|
Change-Id: I66d340727918842a26f07e8609a043c37e5089f4
Issue-ID: CCSDK-1577
Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
|
|
Change-Id: If68ce2e944700cb19380d34ff3b466a9c8633472
Issue-ID: CCSDK-1577
Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
|
|
Change-Id: I83a3d1391c60cd426236b55d0d399e273e7c15dc
Issue-ID: CCSDK-1577
Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
|
|
Change-Id: If21c4964bda08e5d50e6fd11fb1d657e5bf8785c
Issue-ID: CCSDK-1577
Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
|
|
When doing resource resolution, if the same resolution-key,
or the same resource-id/resource-type combo, is used, then the
process will only try to resolve the resources set with a "failure"
status from the RESOURCE_RESOLUTION db table.
In the case the resource has previsously successfully been resolved,
then we need to set its value in the resource assignemnt resolution
store so it can be used later in the processing, for instance if another
resource depends on it.
Change-Id: Ifa3957fe3d2365e1f4347aa61ed963124f8a69f7
Issue-ID: CCSDK-1606
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
|
|
It can happen the resolve fails, and the status end up not
being set, hence to avoid any exception, we default to failure.
Change-Id: Ia5fb9ad954c109f394425f33c506e66d7e1969e4
Issue-ID: CCSDK-1606
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
|
|
Change-Id: I18c4d0803e20ed18e4dde553288d37143dff936a
Issue-ID: CCSDK-1572
Signed-off-by: Eliezio Oliveira <eliezio.oliveira@est.tech>
|
|
Change-Id: I7888ac302da2a51ca34c531b7553d04af13786ac
Issue-ID: CCSDK-1380
Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
|
|
|
|
Change-Id: Icd12c87e017d4b8586bb60f63abce6cda3c7751c
Issue-ID: CCSDK-1380
Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
|
|
|
|
JPA repository functions .findBy......... needs occurence value
the API in the TemplateResolutionService was defaulting it to 1.
Issue-Id: CCSDK-1526
Signed-off-by: Oleg Mitsura <oleg.mitsura@amdocs.com>
Change-Id: Iea1e7c50d57c60323eb5c71c0caf61d1ad573bfb
|
|
Change-Id: I0f323bd13c433d9ef0e207f51234d10cd8c22858
Issue-ID: CCSDK-1352
Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
|
|
Change-Id: Ibbec8cd5785372a89e14a86d4e6ff7f9fed4aad2
Issue-ID: CCSDK-1499
Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
Signed-off-by: Steve Siani <alphonse.steve.siani.djissitchi@ibm.com>
|
|
Issue-ID: CCSDK-1489
Signed-off-by: Steve Siani <alphonse.steve.siani.djissitchi@ibm.com>
Change-Id: If27c0dd301f2c0e63cecc662cd89b1a72d1b21f1
|
|
Exception is always thrown due to the contract, enforcing
the get attribute to throw an exception if not found.
For the resource resolution result, we can simply initialize
the property to an empty json, so system won't throw an exception
if user request the output, but process failed.
Change-Id: I39e288590502c75495e2938a44b874dfd0671155
Issue-ID: CCSDK-1495
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
|
|
Issue-ID: CCSDK-1479
Signed-off-by: Prathamesh Morde <prathamesh.morde@bell.ca>
Change-Id: I37fbce8d4621d85d3a47d38464eeeee267d46741
Signed-off-by: Prathamesh Morde <prathamesh_morde@yahoo.ca>
|
|
|
|
Issue-Id: CCSDK-1467
Signed-off-by: Abdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com>
Change-Id: Ibc50be0bf9986c49d2c7546f895c85c6851447bb
|
|
ISSUE-ID: CCSDK-1463
Signed-off-by: prathameshmo <prathamesh.morde@bell.ca>
Change-Id: Id4e9827d94999a585b79460f147562bdd655ccfb
|
|
Change-Id: I460b3747ffdf5f4cfcb486803097939d1ae1fec0
Issue-ID: CCSDK-1046
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
|
|
There are three existing ways to perform the resolution:
either we don't store the results at all, whether for resource or template
either we store using the resolution key. The combination of blueprintName,
blueprintVersion, artifactName and resolutionKey has to be unique. If it
is re-used, it is considered as a new attempt for that specific resolution
request, and process will only try to resolve resources not marked at SUCCESS
in the database.
either we store using the resourceId and resourceType. As previous point, the
combination of blueprintName, blueprintVersion, artifactName and resolutionKey
has to be unique. If it is re-used, it is considered as a new attempt for that
specific resolution request, and process will only try to resolve resources not
marked at SUCCESS in the database.
TBD: add uni tests
Issue-ID: CCSDK-1423
Change-Id: I6b7198453cf0002edfa7a0c9ea3179555211b5dc
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
|
|
Also, mark resolution as failed for capability when failure.
Change-Id: I3c1704b5b99ace7096f1d9e1cd9bb7f5b595db13
Issue-ID: CCSDK-1422
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
|
|
Change-Id: I69ba541b4b301735a988cf01673827a79daf1f8c
Issue-ID: CCSDK-1431
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
|
|
tempalte and resources for get/put API
Change-Id: Ia00bdb08f5f52231481edc6de232f850c66874e9
Issue-ID: CCSDK-1423
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
|
|
Change-Id: I2e6b4dd278c1a4a3069a44f648129599365909d4
Issue-ID: CCSDK-1428
Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
|
|
Change-Id: Ie1fe9c02542ccd5fbfa18f1e2d6ddb633f55c214
Issue-ID: CCSDK-1423
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
|
|
- also fixing default mechanism
- fixes rest resolution when NullNode is returned as input value
- fixes rest resolution when data type specified so raw json isn't
returned, only the parsed json based on the data type
Change-Id: I1f4a35c6c97000b52620c9b0cc911f15016c4e80
Issue-ID: CCSDK-1422
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
|
|
This will allow to include template within template to create
template hierarchy
Change-Id: I21c5deaf51d391e1a51b9863a905c26b1891db16
Issue-ID: CCSDK-1417
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
|
|
Issue-ID: CCSDK-1407
Signed-off-by: Serge Simard <serge@agilitae.com>
Change-Id: I18db6b654cbf4f416af54596ee71f56eaa860d32
|
|
- Upload CBA sometimes failed because Property files were left opened.
- Default value were ignored on datatype elements.
- Various erroneous error messages
- Fixed job template lookup by name encoding when name contains blanks.
Issue-ID: CCSDK-1357
Signed-off-by: Serge Simard <serge@agilitae.com>
Change-Id: If9d4b0339d647e6c99121f5464a1b6da787761a0
Signed-off-by: Serge Simard <serge@agilitae.com>
|
|
|
|
When Blueprints Processor was not able to evaluate a variable, it would
set its value to null.
The expected behaviour would be to set the value to the default repres-
entation in the formal notation as defined by Apache Velocity, which is
a dollar followed by the name of the variable between curly braces. For
example, if the value of the variable pnf-id could not be evaluated in
runtime, its value would be defined as the string "${pnf-id}".
The problem happened during evaluation of the variables that would be
later sent to the template-meshing code for processing.
The fix was to add a check before the value was assigned to the varia-
ble; if the was not null, the assignment will happen normally. Otherwi-
se, if the evaluation resolves to null, the variable receives the defa-
ult value (string "${<variable name>}").
Besides the tests that were put in place to test the code changed for
this fix, two tests were added to the existing test case of the templa-
te meshing code, to act as regression test.
Change-Id: I635afb1eba4c0d45b821811f0119fa6c87ea9542
Issue-ID: CCSDK-1358
Signed-off-by: ottero <rodrigo.ottero@est.tech>
|
|
Issue-ID: CCSDK-1324
Signed-off-by: Steve Siani <alphonse.steve.siani.djissitchi@ibm.com>
Change-Id: I21705485de9a11a65c1e032fc121c89917334104
|