summaryrefslogtreecommitdiffstats
path: root/catalog-be/src/main
AgeCommit message (Collapse)AuthorFilesLines
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-04-02Increase test coveragevasraz1-1/+1
Change-Id: I0c8ddfb32ae7abc6443007fc5cee72bec6da785b Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2833
2020-04-01Tests added to increase coverageDmitry Puzikov3-86/+23
Change-Id: I16a729385647cb691fb7c94bd8f26a3c19b1b99d Issue-ID: SDC-2861 Signed-off-by: Dmitry Puzikov <d.puzikov2@partner.samsung.com>
2020-03-31Add 'required in runtime' for service inputsSatoshi Fujii1-4/+11
User may want to set required to true for some inputs so that make sure those input values are given at service instantiation time. By this change 'required in runtime' column is introduced into service inputs table in Properties Assignment screen and user can select required true/false for each input. Change-Id: I0d676d2d20e02c975d51c7f4d2bb63c699743d66 Issue-ID: SDC-2659 Signed-off-by: Satoshi Fujii <fujii-satoshi@jp.fujitsu.com>
2020-03-30Increase test coveragevasraz1-2/+2
Change-Id: Ibc6134e5954537258541ff018dc9794191d4e907 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2833
2020-03-30Fix unit testsDmitry Puzikov25-732/+147
Added asserts where required, add tests. Replaced getters-setters with Lombok annotations. Fixed incorect SUT in the tests. Removed default constructors used only for tests. Change-Id: I9be29d9c0d891039952178a3c3e1c3a2062d1382 Issue-ID: SDC-2856 Signed-off-by: Dmitry Puzikov <d.puzikov2@partner.samsung.com>
2020-03-26Increase test coveragevasraz1-1/+1
Change-Id: I90606d768c55ad13aa9df62bc4d3f533206db1bc Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2833
2020-03-25Fix unit testsDmitry Puzikov1-13/+5
Add asserts where required, fix tiny issues. Replace getters-setters with Lombok annotations. Change-Id: Icb1a20f400fd8732a3d0ae23b8fe88bc693df1f5 Issue-ID: SDC-2853 Signed-off-by: Dmitry Puzikov <d.puzikov2@partner.samsung.com>
2020-03-24Import of VFC will maintain interface implementationsMichaelMorris4-10/+103
Issue-ID: SDC-2772 Signed-off-by: MichaelMorris <michael.morris@est.tech> Change-Id: Id387ebd67ff0b136d532df70fe8b2b8760edc433
2020-03-24Fixed updating VFCk.kedron1-5/+8
Added checking that newProperty.path isn't null. Also added refreshing the returned property from the backend. Issue-ID: SDC-2800 Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com> Change-Id: I82449d04f3151b5233cd99fb919b47f6d05a83fa
2020-03-24Fix unit testsDmitry Puzikov9-370/+48
Add asserts where required, fix tiny issues. Replace DTO getters-setters with Lombok anntations. Change-Id: I77c7ff2b1b536e357910ab1820ff27e03a16967a Issue-ID: SDC-2849 Signed-off-by: Dmitry Puzikov <d.puzikov2@partner.samsung.com>
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-22Add support for simple yaml profile 1.2vasraz3-13/+41
Change-Id: I735d25c6b6c3344c4b742f09b3aeaf4d03c2d17c Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2738
2020-03-22Include derived_from types in generated csararibeiro2-95/+275
Issue-ID: SDC-2775 Change-Id: I7b90ff78c389e5680cacafda2065669f6baf1735 Signed-off-by: aribeiro <anderson.ribeiro@est.tech>
2020-03-20Fix unit testsDmitry Puzikov5-81/+23
Add asserts where required, fix tiny issues. Replaced getters-setters with Lombok annotations. Change-Id: I9d75c871870fffe82876e14dd2eb9d3585ecb916 Issue-ID: SDC-2708 Signed-off-by: Dmitry Puzikov <d.puzikov2@partner.samsung.com>
2020-03-16Fix SDC-BE SwaggerDmitry Puzikov85-28288/+1427
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-16Fix broken unit tests in catalog-bevasraz2-9/+1
Change-Id: I9a90a219a6eaec832660e01a359f034060e803c3 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2783
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
2020-03-05portal and cadi properties fixOfir Sonsino1-4/+4
Change-Id: Id83f0ddd1846e4887d1d5a7c3fb5bf8db406186a Issue-ID: SDC-2799 Signed-off-by: Ofir Sonsino <os0695@intl.att.com>
2020-02-25configuration alignmentOfir Sonsino1-10/+10
Change-Id: Ieff9791620f9e7bbebdd7410bc0ab128434228cd Issue-ID: SDC-2724 Signed-off-by: Ofir Sonsino <os0695@intl.att.com>
2020-02-25Policies import when import VSPDmitry Puzikov8-9/+285
Polices import implemented. Error type added for invalid policies. Import tests added. Fix test failures. Got rid of Either in the new code. Change-Id: I3e91cc6d24433c2b3862f407348e71e1e67c3b4e Issue-ID: SDC-2728 Signed-off-by: Dmitry Puzikov <d.puzikov2@partner.samsung.com>
2020-02-25Support import of custom node type namearibeiro3-261/+370
Issue-ID: SDC-2760 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: I3645c737ba367a3576d58afb581c8118eb0f6011
2020-02-24PM_Dictionary Support in GABTomasz Golabek1-3/+41
Generic Artifact Browser is visible for PM_DICTIONARY artifacts Two agreed formats of the artifact are supported (examples in tests) Small fix for searchable fields and introduced new once for PM_DICTIONARY: measType measDescription measObjClass measFamily measInfoId Change-Id: I2cb609bab6405b55e8099da023ae035205dcd1ab Issue-ID: SDC-2095 Signed-off-by: Tomasz Golabek <tomasz.golabek@nokia.com>
2020-02-19Fix typo in PMSH data typedfarrelly1-1/+1
Issue-ID: DCAEGEN2-1940 Change-Id: I50d15f24e015eaac43a175c9bceef80f6d0d5900 Signed-off-by: dfarrelly <david.farrelly@est.tech>
2020-02-18Backend extensibilityMichaelMorris3-0/+54
Issue-ID: SDC-2761 Change-Id: I9287e0255fdda8da61cafc4b761190c8992b9aff Signed-off-by: MichaelMorris <michael.morris@est.tech>
2020-02-18Configuration file runtime reloadandre.schmid2-3/+2
Reloads the backend configuration file when the file listener catches a change. Forces validations errors when the configuration file could not be parsed. Remove not used configurations. Change-Id: Ic6fcb2b557d52ec53074c38ab8e0fcfa96e9be67 Issue-ID: SDC-2758 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-02-13Update PMSH Data Typesdfarrelly1-4/+14
*Update PMSH Data Types to support multiple measurementGroups Issue-ID: DCAEGEN2-1940 Change-Id: Iba6f8c0d88490a554de2b5e079508a3882aa14b8 Signed-off-by: dfarrelly <david.farrelly@est.tech>
2020-02-13Fix PropertyConvertor initialization (use spring)talig13-234/+171
refactor static InterfacesOperationsToscaUtil to be non-static InterfacesOperationsConverter (as it uses PropertyConvertor), move logic from static ToscaExportUtils to ToscaExportHandler (as it uses PropertyConvertor) Change-Id: I917351ca59ee1e792c7b0850d6a8b246b71b4b03 Issue-ID: SDC-2765 Signed-off-by: talig <talig@amdocs.com>
2020-02-13Update to Portal SDK v2.6Ofir Sonsino1-1/+1
Change-Id: I602891d783ce4c80fca6e9da3c765218d19da993 Issue-ID: SDC-2684 Signed-off-by: Ofir Sonsino <os0695@intl.att.com>
2020-02-05Fix sdc-backend-init heat type upgradeandre.schmid4-118/+98
Removes all heat and normative items from typesToUpgrade.json. Add verbose to pycurl if is in debug mode, to print request information. Adjust to upgradeONAPNormative.py to the correct python syntax and removing unused imports. Change-Id: Id4ee601dd70b337c5eeb84965843305300ef7fe3 Issue-ID: SDC-2752, SDC-2753 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-01-30Upgrade to Cassandra 3shrek20001-3/+3
Creating base dockers suitable for Cassandra 3 remove cqlsh version Change-Id: I996bad2341410cdf45c49f191e998acf4781fc5d Issue-ID: SDC-2596 Signed-off-by: shrek2000 <oren.kleks@amdocs.com>
2020-01-22Catalog alignmentys9693341-33612/+35279
Issue-ID: SDC-2724 Signed-off-by: ys9693 <ys9693@att.com> Change-Id: I52b4aacb58cbd432ca0e1ff7ff1f7dd52099c6fe
2019-12-15Add PMSH Modelsdfarrelly3-0/+132
*Add PM Subscription Handler monitoring policy Issue-ID: DCAEGEN2-1940 Change-Id: I82bd1d8d686365e124cd7b4438de583215e9fc0a Signed-off-by: dfarrelly <david.farrelly@est.tech>
2019-12-11Added datatypes for 3rd Party PartnersAtif Husain1-0/+149
Issue-ID: SDC-2385 Change-Id: Iedc5d5b9b30e7cccd3654a1b6e84514643b6d62f Signed-off-by: Atif Husain <atif.husain@team.telstra.com>
2019-12-11Add service creation API as an External APIDivyang Patel3-585/+738
Issue-ID: SDC-2383 Change-Id: I8490163310e892a7ebb6d7e7275edfdeba24045e Signed-off-by: Atif Husain <atif.husain@team.telstra.com>
2019-11-25Fix Sonar issuevasraz1-2/+2
Major SmellCode: Replace StringBuffer with StringBuilder Change-Id: I0283e5160e5c1f23423c66110015f18c8163411e Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2670
2019-11-20Validate non-mano software information artifactandre.schmid4-205/+3
Change-Id: Ie9fabd6af821b830e211ff1068fb287357fd38ee Issue-ID: SDC-2619 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2019-11-20Onboard PNF software versionandre.schmid8-63/+571
Change-Id: Id9e32e01f6c2f4c39c8ff10816d982cbb3063bf7 Issue-ID: SDC-2589 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2019-11-12add SDC Meta Data for CDS IntegrationAhmed Abbas4-1/+43
Issue-ID: SDC-2631 Signed-off-by: Ahmed Abbas <ahmad.helmy@orange.com> Change-Id: Ie691e323f771b786d154c0614d0cd724635a5ec2
2019-11-06Fix sonarqube issues introduced by ZipSlip changeandre.schmid2-18/+17
Fix major and critical sonarqube issues introduced by ZipSlip change id I721f3d44b34fe6d242c9537f5a515ce1bb534c9a Change-Id: I3aa2cd4116936d715baba99a38d43aa40fd62a29 Issue-ID: SDC-1401 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2019-11-03Create new non-mano Artifact Type entry for pnf software informationaribeiro1-0/+7
Issue-ID: SDC-2615 Change-Id: I4dd879d50b1dec58aceeaf0c265901c62d038071 Signed-off-by: aribeiro <anderson.ribeiro@est.tech>
2019-10-30Fix zip slip security flawandre.schmid5-931/+976
Apply zip slip checking in zip operations throughout the system. Centralizes most of the zip logic in one class. Create tests to zip functionalities and zip slip problem. Change-Id: I721f3d44b34fe6d242c9537f5a515ce1bb534c9a Issue-ID: SDC-1401 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2019-10-30add artifacts support in TOSCA exported yml fileLiang Ding6-67/+148
Change-Id: I56f8a6a1ce758876e83a7ee8318b79644ae7d5cb Issue-ID: SDC-1952 Signed-off-by: Liang Ding <liang.ding@intel.com>
2019-10-29Fix for status properties value.aribeiro28-577/+577
These changes were made to align the normative types to the TOSCA property definition requirements. Issue-ID: SDC-322 Change-Id: I32e815dd26990dd6c82c859ad051b271db3c8029 Signed-off-by: aribeiro <anderson.ribeiro@est.tech>
2019-10-16Changes for new service categoryatif husain1-0/+3
Introduced new service category, Partner Domain Service Added logic to disable composition for Partner Domain Service category Issue-ID: SDC-2382 Change-Id: I6ed135733c6f05914e102c037ebe9057ad731e75 Signed-off-by: Atif Husain <atif.husain@team.telstra.com>
2019-10-03Fix for error message.aribeiro2-6/+6
Fixing error message for invalid values across SDC backend API. Issue-ID: SDC-2324 Change-Id: If01307138baf7692e398abf20eb75bbe9a8aa394 Signed-off-by: aribeiro <anderson.ribeiro@est.tech>