summaryrefslogtreecommitdiffstats
path: root/catalog-be/src/main/resources
AgeCommit message (Collapse)AuthorFilesLines
2021-10-18Force encoding while reading files in init scriptsandre.schmid6-8/+8
To avoid system dependency by using the default encoding, this change sets the encoding when opening files in python scripts to "UTF-8". Change-Id: Ib35f4300f10dea309fcc2967448bd80cad0b335f Issue-ID: SDC-3761 Signed-off-by: André Schmid <andre.schmid@est.tech>
2021-10-15Import multiple node types in a single endpointandre.schmid36-719/+854
Change-Id: I7aa914d459a083146b92ef82197c8df265b8c5b6 Issue-ID: SDC-3752 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2021-10-12Add a display name for the category metadataKeys entriesdavsad1-0/+1
Issue-ID: SDC-3737 Signed-off-by: davsad <david.sadlier@est.tech> Change-Id: Ia9547f02267fd380feeef6be6af10beadd30457b
2021-10-05Filter categories by model namearibeiro1-8/+33
Issue-ID: SDC-3706 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: I457151f09ce0ed2edfa09340e9e08a126e114002
2021-09-10ETSI SOL001 v2.5.1 model types not deployed in upgradedavsad5-28/+63
Issue-ID: SDC-3707 Signed-off-by: davsad <david.sadlier@est.tech> Change-Id: If1bda517a9295ad380bf4e5e2fc35f15a1ff708e
2021-09-10Fix model initaribeiro1-1/+2
When upgrading, the model type for "ETSI SOL001 v2.5.1" is being updated and then the request for retrieving all model types with "NORMATIVE" type returns empty Issue-ID: SDC-3720 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: Ibc71bd05426532416eb2ac09f598e7456777403b
2021-08-26Add ETSI SOL001 v2.5.1 model types to backend initdavsad37-6/+2203
Issue-ID: SDC-3685 Change-Id: I59e56cbe071c21467d0f683c7c977a8ceca6e221 Signed-off-by: davsad <david.sadlier@est.tech>
2021-08-24Update backend-init to use new endpoints allowing specific modeldavsad5-21/+69
Issue-ID: SDC-3676 Signed-off-by: davsad <david.sadlier@est.tech> Change-Id: I5e77185dcaa0f3172958ac93198ae2df2f17366b
2021-08-05Disable locking during deploymentdavsad2-10/+18
Issue-ID: SDC-3643 Signed-off-by: davsad <david.sadlier@est.tech> Change-Id: I1a04c253d70bf5aebf33bba7b2b9f83bd559ae64
2021-06-14Init ONAP model imports using the model APIandre.schmid11-34/+2436
Creates a client for the model endpoint in the catalog init scripts. Introduces the directory structure to provide the models along its imports, separated by init/upgrade phase. Each model structure will be zipped and uploaded to the endpoint, based on the model directory name. Change-Id: I0392c1e6d3a29b30567b11016041a8e9cccbc745 Issue-ID: SDC-3615 Signed-off-by: André Schmid <andre.schmid@est.tech>
2021-05-12Use integration-java11 Dockerfilesebdet1-1/+1
Use onap/integration-java11:7.1.0 as a source for the images requiring JDK 11 in SDC Issue-ID: SDC-3298 Change-Id: Ifee3d2942dcb9c078f2ebb686bdabc0ecca857b3 Signed-off-by: xuegao <xue.gao@intl.att.com>
2021-04-19Include 4.1.1 vduCp in deploymentMichaelMorris3-1/+3
Node type was already added, but not include in the list of types to be deployed during install or upgrade Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3509 Change-Id: I71a3a9942cb7d5b6adb194b7e7f2aa4be6533ac6
2021-04-09Set default value for ETSI versionMichaelMorris1-1/+2
Sets the default value for ETSI version and updates code to use the default value for any mandatory category specific metdata with null values. Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3548 Change-Id: I445443d1de9447945fb0dd8babd3fcebd8e8ed7d
2021-03-19Publish swagger files for SDC APIsMichaelMorris4-0/+84
I have created a swagger file for each of the APIs as they are currently listed on the architecture page. Some of the files can be easily be combined if some of the APIs are combined. I have created a single file for SDCE-2 and SDCE-5 as it is not possible to seperate as they are both paritially implemented in the same class with overlapping paths I have copied the generated swagger files to the docs directory as I suspect they need to be under source control for the generation of the readthedocs page Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3525 Change-Id: Id42412704311a573e3ebf911ad34d909c1c3f1b2
2021-03-16Adding ETSI SOL001 v4.4.1 vduCpMichaelMorris3-0/+66
Previous version does not have 'container_binding' needed for CNF onboarding Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3509 Change-Id: I0894b3ec818f1448997a99c2754153998bf77151
2021-02-21ETSI NSD SOL001 v3.3.1 typesMichaelMorris24-9/+522
Types in 2.7.1 folder are types valid for v3.3.1 that have not changed from v2.7.1 Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3339 Change-Id: I8961bc9fc22ac53d61c785ef5f6cec0f958e9030
2021-02-21Update node and data types for SOL001 3.3.1 + CNF enhancementsMichaelMorris32-23/+1037
Types in 2.7.1 folder are types valid for v3.3.1 that have not changed from v2.7.1 Types in 4.1.1 folder are the CNF enhancements which it is assumed will be in v4.1.1 Includes some changes in functionality to support: 1. Deployment of both existing (2.5.1) versions of types and new versions of types through sdc-BE-init 2. Selection of the correct node type definition version at onboarding of an ETSI SOL004 VNF/CNF csar, based on the declared version supported in the csar (i.e. when a 3.3.1 csar is imported, the node type definitions valid for 3.3.1 are used (rather than current logic which always selects the latest version) Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3470 Change-Id: Iff835d230b173b9d44349caa6b0b11d783e8f8d3
2021-01-25Handle ETSI versions in NSD Pluginandre.schmid1-0/+5
The plugin now considers the ETSI version in the component metadata to generate the correct imports of nsd types, i.e., aligned with the provided version. Change-Id: I54aee04722a4434eac59ea8b70c4f30f5c81645e Issue-ID: SDC-3447 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2021-01-19Add basic auth headerxuegao8-35/+54
Add basic auth header for sdc-backend-init python scripts. Issue-ID: OJSI-273 Signed-off-by: xuegao <xue.gao@intl.att.com> Change-Id: I3559d5792509db0f65b202a731545083c7c91c96 Signed-off-by: xuegao <xue.gao@intl.att.com>
2021-01-19Add basic authxuegao1-0/+6
Adding basic auth for SDC apis. Issue-ID: OJSI-90 Signed-off-by: xuegao <xue.gao@intl.att.com> Change-Id: Ie84e6bab8d8526f7f4d21a36bba52d8fe9abebbb Signed-off-by: xuegao <xue.gao@intl.att.com>
2021-01-07Update ETSI NFV Network Service categoryandre.schmid1-3/+3
Change-Id: Idbc88a7a047e539d1826997e8d98af23c3ee9bbd Issue-ID: SDC-3416 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-12-14Remove tosca.entity.Root from interface definitionMichaelMorris1-1/+0
No definition of type tosca.entity.Root is present meaning the derived from reference in tosca.interfaces.Root to tosca.entity.Root cannot be resolved. I cannot find any definition of tosca.entity.Root in the tosca spec so I am proposing to remove the "derived from" from this interface definition. This is consistent with tosca.nodes.root which does not contain the derived from even though in the tosca spec it is derived from tosca.entity.Root Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3398 Change-Id: Ie97d2f8da6793db9a7f510e4aee856837967e963
2020-12-07Support interface input during import VFCandre.schmid1-0/+12
Change-Id: I097ce258a7dadbedf1aff6ce53dd1286da074552 Issue-ID: SDC-3372 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-12-03[SDC] Validate PMDictionary content in Deployment artifacts tabAdam Wudzinski1-0/+7
Validate PMDictionary file content when adding or updating PMDictionary in Deployment artifacts tab. Fix dependencies conflict. Issue-ID: SDC-3390 Signed-off-by: Adam Wudzinski <adam.wudzinski@nokia.com> Change-Id: I6f6bb196ef061419a309a8ded5fdbe116982a037
2020-10-30Remove the Log4j 1.2.15sebdet1-1/+1
Remove the log4j 1.2.15 brought by Sigar library + update ESAPI to support slf4J instead of log4j Issue-ID: SDC-3310 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I63cee67d113f51dbe82a64c69629c62b47918103 Signed-off-by: sebdet <sebastien.determe@intl.att.com>
2020-10-26software version fixtragait2-0/+4
Signed-off-by: tragait <rahul.tyagi@est.tech> Change-Id: I468e1f5fc301e6b2966a514d12f04f769e1ab4b1 Signed-off-by: tragait <rahul.tyagi@est.tech> Issue-ID: SDC-3228
2020-09-23Remove legacy Policy Types no longer usedPamela Dragosh3-486/+0
These were loaded in Dublin as a stop gap solution as we built up the self-serve control loop infrastructure over the last 3 releases. CLAMP does not use these anymore, so cleaning them out of the repo. Issue-ID: SDC-3229 Change-Id: I39e3a8b8146629f4b9dbb02abe7a0acf9166e716 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2020-09-07Make directives options configurablearibeiro1-0/+7
Issue-ID: SDC-3275 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: Ia91655f02c45d033ebae45bd6d9f252c2f6d6f47
2020-09-07Template design (NSSTs) for slice sub-nets (RAN, Core, Transport).hekeguang1-0/+418
Issue-ID: SDC-3086 Change-Id: Ib70da9e03d6dd152d901344c60f8ba47f38450fe Signed-off-by: hekeguang <hekeguang@chinamobile.com>
2020-09-07Adding ETSI NS typesMichaelMorris7-2/+170
Change-Id: I22f644a6b02f4f05ddc951af899463df9b11b7db Issue-ID: SDC-2618 Signed-off-by: MichaelMorris <michael.morris@est.tech>
2020-09-07Create Service category ETSI Network Serviceandre.schmid1-0/+3
Creates a new Service category ETSI Network Service, having the service base type as ETSI NS type tosca.nodes.nfv.NS. Change-Id: I2615a1e1f88330064b97516ed3865a408e1b51b2 Issue-ID: SDC-3250 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-08-16SDC changes for adding helmSithara Nambiar1-0/+7
Issue-ID: REQ-341 Signed-off-by: Sithara Nambiar <sitharav.aredath@huawei.com> Change-Id: I4721f6e8e2690dc5f7c10bb7b1b2f53ec5f318c7
2020-07-15Fix missing referenced node_typesKrupaNagabhushan5-0/+46
Issue-ID: SDC-3153 Signed-off-by: KrupaNagabhushan <krupa.nagabhushan@est.tech> Change-Id: I0b17ac92a49e1f006f5708b20af82a62ee769a9e
2020-07-05Fix sonar issuessebdet1-1/+1
Fix sonar/checkstyle issues in sdc code Issue-ID: SDC-3158 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I004b0f579ff1f273f39a155217972f5efcdcf5cb
2020-06-24Improvement sdc-BE-init python scriptsk.kedron17-83/+247
- Implemented retries when request fail - Moved configuration variables to the Properties file - Extended sdcBeProxy - Implemented script to run import/update (should fix deployment glitch) - Updated the import_Normatives recipes to use new script Issue-ID: SDC-2784 Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com> Change-Id: I83fab898783ad8d3b3d532af43d75bc54d033c33
2020-06-24Refactoring the check backend, create consumersk.kedron7-0/+126
Continue refactoring: - added script for healthCheck, create new consumers - also update chef recipes to use new script Issue-ID: SDC-2784 Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com> Change-Id: I158d816362f91f74b217fe85112cf7c14da8f1ec
2020-06-24Refactoring the sdc-BE-init python scriptsk.kedron64-3361/+1453
Deeper refactoring of python script: - create the python package with init script - support for python 3.x - reuse code - new design - support for .json conf file - update the docker chef script Issue-ID: SDC-2784 Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com> Change-Id: I02169eb7d0e3e90851ba1811536d1712c3b4145f
2020-06-21Toggletalio2-1/+3
Add toggling mechanism to catalog side. The first toggleable feature is healing - this was added to healing flow, in healJanusGraphDao Issue-ID: SDC-2874 Signed-off-by: talio <talio@amdocs.com> Change-Id: If386651cab8304ebaf13497ded3a7a50bd60e477 Signed-off-by: talio <talio@amdocs.com>
2020-05-28Fix interface types creationandre.schmid1-2/+27
Interface types creation logic was not interpreting some allowed TOSCA entries, that, when declared, were breaking the interface type creation. Every entry under the interface type was being considered as an interface operation, but it is possible to have "derived_from", "version", "metadata" and "description". Also it is not considering the Interface Type entries "inputs", "operations" and "notifications". Another thing is that TOSCA 1.3 changes the way operations should be declared, deprecating the previous way. Now there should be an entry "operations" with the operations entries under it, instead of having the operations entries direct under the interface type. The change allows both types, following the TOSCA rule: if operations entry is not present, then the deprecated way is considered. Change-Id: I13218bda60b29d19b9c5565cbfd63ae3250a78bf Issue-ID: SDC-3075 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-05-28Allow global types generationaribeiro1-0/+12
This change allows to configure which global type file will be added to the generated CSAR Issue-ID: SDC-3021 Change-Id: I83c0c3f317c4a4e5e8dbf22cb3dbd47e63562d3a Signed-off-by: aribeiro <anderson.ribeiro@est.tech>
2020-04-20Fix Tosca properties declarationaribeiro3-6/+4
Remove duplicated entries Default value for Boolean type should not be a String According to the description for the keyname 'attachments:' it should be of type List rather than String Issue-ID: SDC-2870 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: Iac2b4f89dac16a6aef9dcabea74def5cacff99a6
2020-04-19Configure a new Artifact Typeandre.schmid1-25/+0
Centralizes artifact configuration in one yaml entry. Allow the configuration of a new artifact type without the need of code changes. The configuration file now is used as a source of artifacts types instead the artifact type enum. The enum will be used as a source of base artifact types and also in hard coded business rules. Change-Id: Id0383d9fca9bce0519a4d52a4ecb3a68c8713f0f Issue-ID: SDC-2754 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-04-05Fix data type properties declarationaribeiro1-36/+36
According to TOSCA Network properties definition the keyname 'ip_version:' should have Integer as valid_values rather than String Where the keyname 'count:' is declared as a String type the default value should be String rather than Integer Fix misspelled ONAP types 'onap.datatypes.monitoring.measurementType' and 'onap.datatypes.monitoring.managedObjectDNsBasic' Fix the keynames 'upstream:' and 'downstream:' as both are declared as a String type the valid_values should be String rather than Integer Issue-ID: SDC-2864 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: I56afdf2818b5f2463fb6088cd8b468fd38ef5086
2020-04-05Fix keyname 'constraints:' according to TOSCA property definitionaribeiro1-1/+1
Issue-ID: SDC-2863 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: I955af393b4f10ca56a01bfcb2f62c37496c484d6
2020-04-05Remove keyname 'required' from Schema definitionaribeiro1-4/+4
The Schema definitions does not have keyname 'required'. The keyname 'required' is a TOSCA property definition. Issue-ID: SDC-2866 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: I0a827d30c8790ec63c20a9da6cd0758eb024c491
2020-03-23Fixed import in sdc-BE-init python scriptsk.kedron4-12/+4
Issue-ID: SDC-2784 Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com> Change-Id: I72eb129c5c4cb63fdf0ab13a6128d555b49b6d0c
2020-03-23Refactoring the sdc-BE-init python scriptsk.kedron27-2042/+1974
Adjust to the correct python syntax. Remove not used imports. Also fixed:  - the indents  - checking that all normative imported correctly logic Issue-ID: SDC-2784 Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com> Change-Id: If7edc867f3cb591be157073fbc12b9842b200023
2020-03-16Fix SDC-BE SwaggerDmitry Puzikov37-26881/+0
General reorganisation of APIs rendering done. Fixed mix of swagger.v2 and new swagger.v3 conflicting annotatons. Moved to newer version of swagger-ui. Removed unused/inconsistent parts of pom.xml. Change-Id: Id1356b766caff6bf5817768c1a0f9b80541b85e8 Issue-ID: SDC-2718 Signed-off-by: Dmitry Puzikov <d.puzikov2@partner.samsung.com>
2020-03-16Remove hardcoded timeoutk.kedron1-0/+1
Added configuration for wait seconds for Cassandra connector. Also, increase the timeout value to prevent tests failed. Issue-ID: SDC-2759 Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com> Change-Id: I1008ecce98efdd8627ac3232b35fecd2a41a9c79
2020-03-16Run pods as non-root userMichaelMorris3-10/+10
Summary of changes: sdc-cassandra-init Added user sdc (in base image base_sdc-cqlsh - https://gerrit.onap.org/r/103436) Run entrypoint as user sdc Moved relevant files from /root/ to /home/sdc/ sdc-backend-init Added user sdc (in base image base_sdc-python - https://gerrit.onap.org/r/103436) Run entrypoint as user sdc Moved relevant files from /root/ to /home/sdc/ sdc-backend Run entrypoint as user jetty Moved relevant files from /root/ to /var/lib/jetty/ Moved cadi & cert files from /opt/app/jetty to /var/lib/jetty/ Moved ready_probe from /var/lib/read-probe.sh to /var/lib/jetty/read-probe.sh sdc-frontend Run entrypoint as user jetty Moved relevant files from /root/ to /var/lib/jetty/ Moved ready_probe from /var/lib/read-probe.sh to /var/lib/jetty/read-probe.sh sdc-onboard-backend-docker Run entrypoint as user jetty Moved relevant files from /root/ to /var/lib/jetty/ Moved ready_probe from /var/lib/read-probe.sh to /var/lib/jetty/read-probe.sh sdc-onboard-db-init-docker Run entrypoint as user sdc Added user sdc (in base image base_sdc-cqlsh - https://gerrit.onap.org/r/103436) Moved relevant files from /root/ to /home/sdc/ Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-2798 Change-Id: I85be320a4a5e1cc5aeebbb98c4484d5d6fd06dfc