diff options
| author |   aribeiro <anderson.ribeiro@est.tech> | 2021-09-09 08:54:17 +0100 |
|---|---|---|
| committer |   Michael Morris <michael.morris@est.tech> | 2021-09-10 08:57:41 +0000 |
| commit | 10a832ed3dea1924bfa555ab3b85b1cf1b228b2f (patch) | |
| tree | d95ad877a06b0cb7a7d651c27e2252ebefc471b3 /catalog-be/src/main | |
| parent | c03a82e3af8ae60c1200a252aac8dadb1c8da0b8 (diff) | |
Fix model init
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
Diffstat (limited to 'catalog-be/src/main')
| -rw-r--r-- | catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ModelServlet.java | 3 | ||||
| -rw-r--r-- | catalog-be/src/main/resources/import/tosca/models/init/etsi-SOL001-v2.5.1/payload.json | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ModelServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ModelServlet.java index 6449a91112..f52277f3ef 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ModelServlet.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ModelServlet.java @@ -112,9 +112,6 @@ public class ModelServlet extends AbstractValidationsServlet { validateUser(ValidationUtils.sanitizeInputString(userId)); final var modelName = ValidationUtils.sanitizeInputString(modelCreateRequest.getName().trim()); try { - if (modelCreateRequest.getModelType() == null){ - modelCreateRequest.setModelType(ModelTypeEnum.NORMATIVE); - } final Model createdModel = modelBusinessLogic .createModel(new JMapper<>(Model.class, ModelCreateRequest.class).getDestination(modelCreateRequest)); modelBusinessLogic.createModelImports(modelName, modelImportsZip); diff --git a/catalog-be/src/main/resources/import/tosca/models/init/etsi-SOL001-v2.5.1/payload.json b/catalog-be/src/main/resources/import/tosca/models/init/etsi-SOL001-v2.5.1/payload.json index 565863dfad..9b246eac00 100644 --- a/catalog-be/src/main/resources/import/tosca/models/init/etsi-SOL001-v2.5.1/payload.json +++ b/catalog-be/src/main/resources/import/tosca/models/init/etsi-SOL001-v2.5.1/payload.json @@ -1,3 +1,4 @@ { - "name": "ETSI SOL001 v2.5.1" + "name": "ETSI SOL001 v2.5.1", + "modelType": "NORMATIVE" }
\ No newline at end of file |