summaryrefslogtreecommitdiffstats
path: root/components/model-catalog/blueprint-model
AgeCommit message (Collapse)AuthorFilesLines
2020-09-22Enabling Code FormatterSingal, Kapil (ks220y)14-202/+211
Code Formatter was turned off due to java 11 migation Issue-ID: CCSDK-2852 Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com> Change-Id: I3d02ed3cc7a93d7551fe25356512cfe8db1517d8
2020-09-21Fixing docker image tagSingal, Kapil (ks220y)3-3/+0
Moving related properties to parent most pom and using same across Removing unnecessary version tag from poms Issue-ID: CCSDK-2794 Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com> Change-Id: I37d16d3f7a467bb579f70235f69a8bff0fe4ba8e
2020-09-14Revert change assembly descriptor idJozsef Csongvai1-1/+1
Changing ID also changes the file name of the zipfile. This caused the -Pdeploy-cba to fail as it was expecting a file with ending *-cba.zip, instead it got *-cba_zip.zip Issue-ID: CCSDK-2787 Change-Id: I825218724fd917a69a727cb1945cf313c950b27f Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca>
2020-09-11Refactoring poms groupId artifactIdSingal, Kapil (ks220y)6-67/+59
Issue-ID: CCSDK-2787 Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com> Change-Id: Ica64f0c793beabb47950c7bf1eede63a0dbf3cea
2020-09-10JDK11 upgradeOleg Mitsura1-27/+0
Issue-ID: CCSDK-1870 commit2: update surefire plugin to 3.0.0-M5. Need at least M3 for JDK11. S Still TODO: what to do about the spring-boot-parent. it may need a bump as well. commit3: update parent with surefire 3.0.0-M5 commit4: another surefire version update + failsafe version update. commit5: uncomment surefire def'n in parent pom. It may need to be redefined... commit6: update to parent 2.0.1-SNAPSHOT commits... rebasing/minorfixes commit14: disabling HealthCheckApplicationTests test commit19: Kapil bugfixes: Jsonfiles "isForce" replaces (incorrect) "force"; bumps kafka scala version to 2_13 commit20: fixe back kafka scala version to 2_11 commit25: reverted + applied patches for 2_13 (due to springboot parent update) + 'application' pom to use forCount=1 and reuseForks=false and reverted scanUatEmpoweredBlueprints modification in BluepritnsAcceptanceTest commit30: rebase commit31: SDCListener tests fixes. JMockit updated from 1.19 to 1.49. Since 1.42, need to do these changes https://jmockit.github.io/tutorial/Introduction.html#runningTests commit32: Dockerfiles cleanup. adduser/group params are different from Alpine. commit33: Dockerfile for SDClistener typo commit34: Addressed Dan's comments. commit35: Image was changed to 1.0.1 (which will be built soon), and the updated base image will already have 'onap' user and group, hence the adduser/group wouldn't be needed. commit36: rebase commit37: bumped up BP proc maven-surefire-plugin Xmx Signed-off-by: Oleg Mitsura <oleg.mitsura@amdocs.com> Change-Id: I3d864d500150e7d81bb2ce73333f2db67c004e93
2020-09-02Adding parent pom referenceSingal, Kapil (ks220y)5-8/+56
Adding parent pom to cba-assembly-descriptor as it needs to inherit repository from parent so maven-deploy-plugin works Issue-ID: CCSDK-2720 Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com> Change-Id: I44ce3721f280555b81475580ca47539ae83d07ca
2020-08-17Fixing and Refactoring PomSingal, Kapil (ks220y)3-35/+51
Changing parent reference to avoid relative path issue and adding copyright header to new pom Issue-ID: CCSDK-2642 Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com> Change-Id: Ibd6a6867eea9849cc1ddc37e9accdba6b4ddca09
2020-08-11Add test-blueprint-kotlin-parentJozsef Csongvai8-92/+469
This parent project is intended for inheritence in CBA pom.xml. It provides dependencies for testing and mocking kotlin scripts. By turning a CBA into a maven project which inherits this parent, users will be able to debug and unit test their kotlin scripts. The parent also includes a profile (-Pdeploy-cba) which will enrich and publish the CBA to a running instance of CDS, defined by properties in the CBA pom.xml. This patch also adds a common assembly descriptor for resuse in maven-assembly-plugin where it is used to package CBA into zip. Issue-ID: CCSDK-2642 Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca> Change-Id: I160c3c3e982ad4ed46f0704d6dc27dadfb0dfdc8
2020-06-09Add ResourceResolutionResult to ResourceResolutionServiceJozsef Csongvai1-0/+15
In order to ensure consistent behavior for assignment-map, supporting occurences and multiple artifact-prefixes, ResourceResolutionService needs to return assignment-map alongside generated template content. Issue-ID: CCSDK-2389 Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca> Change-Id: I54c1991d23d65217f3492b08a2170a6d41b6482d
2020-06-05Data dictionary fixes and improvements from vFW CNF demoSamuli Silvius8-71/+12
During doing vFW CNF use case CBA model with CDS (See INT-1260) found some diff/improvements to update to CDS starter dictionary. Issue-ID: CCSDK-2408 Signed-off-by: Samuli Silvius <s.silvius@partner.samsung.com> Change-Id: I8e899b3ab34bcd499e917da318f589e69008dc6d
2020-05-17update vlb cds instantiation and scale out packageAbdelmuhaimen Seaudi24-7758/+8051
Issue-ID: CCSDK-2376 Signed-off-by: Abdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com> Change-Id: I307ed09b73487e8c830eadf26b477601b0a0d6f4
2020-04-09Remove unneeded backup filesDan Timoney4-204/+0
Remove unneeded backup files created by updParentVersion script Issue-ID: CCSDK-2308 Signed-off-by: Dan Timoney <dtimoney@att.com> Change-Id: I8d76b8ee3ccb2dbe563f22aadf1125f8226a104f
2020-04-07Roll to next Guilin snapshotDan Timoney8-6/+214
Roll to next Guilin snapshot release Issue-ID: CCSDK-2152 Signed-off-by: Dan Timoney <dtimoney@att.com> Change-Id: I1a5ea68da8821ffe28ac84e60177af05e26b3585
2020-03-30Roll to next Frankfurt snapshot and fix sonar buildDan Timoney4-6/+6
Roll to next Frankfurt snapshot. Also, fixed config to skip sonar for error-catalog, which has no scannable components. Sonar builds were failing because error-catalog does not have standard maven source and test directories (src/main, src/test) Issue-ID: CCSDK-2152 Signed-off-by: Dan Timoney <dtimoney@att.com> Change-Id: Iacb76b240e71206de8306af7e2447eaa07b0d33b
2020-03-18Use released parent pomsDan Timoney1-1/+0
Use released version of parent poms Issue-ID: CCSDK-2166 Signed-off-by: Dan Timoney <dtimoney@att.com> Change-Id: Ib45fc3134e2ba0e97908d9efa12e3cbec265b381
2020-03-04Fix case for all Software upgrade actionsgummar4-43/+53
Issue-ID: CCSDK-2145 Signed-off-by: gummar <raj.gumma@est.tech> Change-Id: Ic29056d100ffba9d6d1c2a6b3f73d6a95f3bee28
2020-03-03Fix case for all Software upgrade actionsgummar4-79/+79
Issue-ID: CCSDK-2145 Signed-off-by: gummar <raj.gumma@est.tech> Change-Id: Ie2a6b6c72997be65ac304f6cd1daac3a8aa85480
2020-02-26Merge SW Upgrade Blueprint into PNF_AAI and create one UAT BP for PNFgummar29-325/+1183
UAT: Add support to multiple responses for a single request Set property IN_UAT=1 during UAT execution so blueprints can tune their settings to values more suitable for testing (like timeouts) Add 'times' field to specify expected number of invocations Add UAT blueprint script for PNF SW Upgrade UC Add current thread check for Hazelcast distributed lock Resolve URI before returning Issue-ID: CCSDK-2091 Change-Id: Id256bad043488f88f1b60015ebf9ade4be607fa2 Signed-off-by: gummar <raj.gumma@est.tech>
2020-02-25Fix Sonar Jenkins jobDan Timoney1-0/+4
Updated pom.xmls of modules that do not contain 'src/main' directory to skip Sonar scan. This allows Sonar scan to complete for the rest of CDS. Need to revisit these modules to see whether they should really be skipped or if sonar properties (e.g. sonar.sources) should instead be tailored. Issue-ID: CCSDK-2116 Signed-off-by: Dan Timoney <dtimoney@att.com> Change-Id: I8b0237886e357a0188633f007dc97cf6e725fa53
2020-02-21Eliminate Template RequirementJozsef Csongvai2-0/+40
Enables resource assignment without the use of a template. If no template is defined by the CBA, the default output is a kev-value map. If operation input: resolution-summary is set to true, output will be a list of ResolutionSummary. Issue-ID: CCSDK-2038 Change-Id: I5f6bcefcacec6e83cffac1134b13690b500a7563 Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca>
2020-02-20Update restconf executor to return responsedfarrelly2-2/+20
*Update restconfApplyDeviceConfig function to return request response *Modify pnf_config_aai CBA to test new functionality Issue-ID: CCSDK-2097 Change-Id: Id6109d8c3a8fa4e2ba1b102c4d2697ae6a03f8e2 Signed-off-by: dfarrelly <david.farrelly@est.tech>
2020-01-22Update vFW_CDS packagesAbdelmuhaimen Seaudi18-2259/+3154
Issue-ID: CCSDK-1825 Signed-off-by: Abdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com> Change-Id: I53668b3df0cf13ceaa78cbffc92df05db23fe642 Signed-off-by: Abdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com>
2019-12-31Flexible DSL Types and Templates definition.Brinda Santh1-9/+7
Easy search definitions Types and Templates inside ServiceTemplate DSL builder. Unit test modifications to support this change. Issue-ID: CCSDK-1054 Signed-off-by: Brinda Santh <bs2796@att.com> Change-Id: Ie944ff5f75f80c852555306e1a4e0fa7f5b803d7
2019-12-30Runtime services for Relationship Type and TemplatesBrinda Santh5-35/+51
Added and improved blueprint runtime service property resolution api. Relationship template CBA sample Performance improvement on Artifact resolutions. Added connection config DSL for DB, GRPC connections. Added starter relationship connection config models. Issue-ID: CCSDK-1054 Signed-off-by: Brinda Santh <bs2796@att.com> Change-Id: I73e1deed708dc924352867ddd1d1b2271c8ea106
2019-12-30Relationship Type and Templates modelsBrinda Santh3-55/+108
Enrichment Support for Relationship Types and Templates. Relationship DSL support for ConnectTo connections ( RestClient, SshClient, MessageProducer, MessageConsume, Nats) Moved datatype map from collection to complex type Issue-ID: CCSDK-1054 Signed-off-by: Brinda Santh <bs2796@att.com> Change-Id: I0f18db2cb52e1e93dfab04498b8298587cba2540
2019-12-11Metadata for name, version, tags and typeBrinda Santh4-2/+5
Mandate Tosca.meta template name, version, type and tags. Auto copy metadata from Tosca.meta to ServiceTemplate definitions. Optimize Blueprint context and runtime creation from file path. Removed attached CBA zip file in test repository dirs Issue-ID: CCSDK-1992 Signed-off-by: Brinda Santh <bs2796@att.com> Change-Id: I5d9d7a4599234a38d431328dbd9b74bd831e0115
2019-11-22CCSDK-1864 : PNF Use Case Move from Jython to Kotlin using CDS Frameworkgummar8-180/+167
Change-Id: I58eb134a07345d25be6d64dc614f25fc73ecf554 Signed-off-by: gummar <raj.gumma@est.tech> Issue-ID: CCSDK-1864
2019-11-21Fix relativePath in blueprint-modelTimoney, Dan (dt5972)1-0/+1
Fix relativePath in blueprint-model pom.xml Change-Id: I2cff59df8d4167e3f94674eee53669f625f1ef19 Issue-ID: CCSDK-1932 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
2019-11-21Include blueprints catalog in buildBrinda Santh15-26/+110
Distribute CBA through maven repository, so that it can be downloaded during image creation. Fixed missing template name and versions in TOSCA.meta file Issue-ID: CCSDK-1950 Signed-off-by: Brinda Santh <bs2796@att.com> Change-Id: I0ee106c4e86296fb88aac8e609512f6944492d74
2019-11-13CCSDK-1603:Changes in 'Config via netconf' BP to pull data from AAItragait25-47/+1001
This commit includes changes in blueprint for "Configuration over netconf", So that CDS can fetch data from AAI. It has enhancement in UAT test yaml file, so this blueprint can be tested. An enhancement is also included to introduce request headers in the source-rest. Change-Id: I4ff973538249925239b89da4c5720ec63ffe8037 Issue-ID: CCSDK-1603 Signed-off-by: tragait <rahul.tyagi@est.tech>
2019-10-31Merge "Update vLB CDS Kotlin Package"Brinda Santh Muthuramalingam27-0/+9036
2019-10-31Merge "Description: Create RESTCONF based vLB CBA Blueprint"Dan Timoney27-0/+9137
2019-10-31Merge "Add GRPC log tracing service."Dan Timoney1-0/+1
2019-10-30Merge "Modified vf-module-name"Brinda Santh Muthuramalingam5-29/+29
2019-10-27Update vLB CDS Kotlin Packagehanybaki27-0/+9036
Issue-ID: CCSDK-1838 Signed-off-by: hanybaki <habdelbaki.ext@orange.com> Change-Id: I21a797602d759f40d7b9e3e89192374a38d56ce0 Signed-off-by: Abdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com>
2019-10-27Modified vf-module-namehanybaki5-29/+29
Issue-ID: CCSDK-1816 Signed-off-by: hanybaki <habdelbaki.ext@orange.com> Change-Id: Iee947751589ef640a8c519d5ffabe424835bac93 Signed-off-by: Shaaban Ebrahim <shaaban.eltanany.ext@orange.com> Signed-off-by: root <root@olc-rancher.novalocal> Signed-off-by: Abdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com>
2019-10-24Improve Remote Python Executor error handling and allow for structured responseSerge Simard4-2/+29
Issue-ID: CCSDK-1855 Signed-off-by: Serge Simard <serge@agilitae.com> Change-Id: I924918fb06a5a0f118772dedaa41c536c7eca9e7 Signed-off-by: Serge Simard <serge@agilitae.com>
2019-10-22Merge "vnf-id Data Dictionary source has circular dependendy."Dan Timoney2-33/+0
2019-10-22Merge "Data Dictionary has erroneous resolution source for vnf-name."Dan Timoney1-4/+4
2019-10-22Add GRPC log tracing service.Brinda Santh1-0/+1
Issue-ID: CCSDK-1046 Signed-off-by: Brinda Santh <bs2796@att.com> Change-Id: I4ba6ed11d8fb63c21b9c49774ed733cca05c5646
2019-10-22Description: Create RESTCONF based vLB CBA Blueprinthanybaki27-0/+9137
Issue-ID: CCSDK-1852 Signed-off-by: hanybaki <habdelbaki.ext@orange.com> Change-Id: I7e9cda61d85aa8406fb8371658e53a75b64dd686
2019-10-14Merge "Component Script Executor Fix"Brinda Santh Muthuramalingam1-1/+2
2019-10-14Component Script Executor FixSingal, Kapil (ks220y)1-1/+2
Fixing ExecutionServiceInput object initialization and related test cases Issue-ID: CCSDK-1829 Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com> Change-Id: I43354487abfb10a98b29d749aa77b08cfdff51b8
2019-10-08update vLB CDS CBAAbdelmuhaimen Seaudi20-288/+265
Issue-ID: CCSDK-1816 Signed-off-by: Abdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com> Change-Id: I1b399aae8abca6a2f5d175560053fa0c7b646896
2019-10-03vnf-id Data Dictionary source has circular dependendy.Samuli Silvius2-33/+0
sdnc source for vnf-id requires vnf-id to be resolved. Removed sdnc source. Issue-ID: CCSDK-1794 Signed-off-by: Samuli Silvius <s.silvius@partner.samsung.com> Change-Id: I15992fa776d36d369d7a59148a19f498ed3190e0
2019-10-03Data Dictionary has erroneous resolution source for vnf-name.Samuli Silvius1-4/+4
Issue-ID: CCSDK-1794 Signed-off-by: Samuli Silvius <s.silvius@partner.samsung.com> Change-Id: I7ef71201d40b712435c9076c52a317b572d63562
2019-09-24Refactoring ResourceAssignmentUtilsSingal, Kapil (ks220y)1-0/+3
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
2019-09-18Optimizing Imports and Formatting codeSingal, Kapil (ks220y)3-6/+6
No Business logic change, no code change.. just optimizing imports and reformatting code Issue-ID: CCSDK-1744 Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com> Change-Id: I1fb2ed10525a6f392f3c0d963c2ed03cfe8dec7e
2019-09-18Refactoring Netconf NetconfMessageUtilsSingal, Kapil (ks220y)6-43/+43
Appending New Line before and after request body within doWrapRpc and removing new line is child API's which forms the request body Issue-ID: CCSDK-1743 Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com> Change-Id: Ic58566e24a21c71d545c45fb95a667c17de2fe66
2019-09-17Merge "Updated golden README for config-assing"Dan Timoney1-2/+4