summaryrefslogtreecommitdiffstats
path: root/catalog-be/src
diff options
context:
space:
mode:
authoraribeiro <anderson.ribeiro@est.tech>2021-09-09 08:54:17 +0100
committerMichael Morris <michael.morris@est.tech>2021-09-10 08:57:41 +0000
commit10a832ed3dea1924bfa555ab3b85b1cf1b228b2f (patch)
treed95ad877a06b0cb7a7d651c27e2252ebefc471b3 /catalog-be/src
parentc03a82e3af8ae60c1200a252aac8dadb1c8da0b8 (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')
-rw-r--r--catalog-be/src/main/java/org/openecomp/sdc/be/servlets/ModelServlet.java3
-rw-r--r--catalog-be/src/main/resources/import/tosca/models/init/etsi-SOL001-v2.5.1/payload.json3
-rw-r--r--catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ModelServletTest.java3
3 files changed, 5 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
diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ModelServletTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ModelServletTest.java
index 4e1c0e7945..f96386ded3 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ModelServletTest.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/servlets/ModelServletTest.java
@@ -59,6 +59,7 @@ import org.openecomp.sdc.be.components.validation.UserValidations;
import org.openecomp.sdc.be.config.ConfigurationManager;
import org.openecomp.sdc.be.config.SpringConfig;
import org.openecomp.sdc.be.dao.api.ActionStatus;
+import org.openecomp.sdc.be.datatypes.enums.ModelTypeEnum;
import org.openecomp.sdc.be.exception.BusinessException;
import org.openecomp.sdc.be.impl.ComponentsUtils;
import org.openecomp.sdc.be.impl.ServletUtils;
@@ -157,6 +158,7 @@ class ModelServletTest extends JerseyTest {
model = new Model(modelName);
modelCreateRequest = new ModelCreateRequest();
modelCreateRequest.setName(modelName);
+ modelCreateRequest.setModelType(ModelTypeEnum.NORMATIVE);
}
@Override
@@ -207,6 +209,7 @@ class ModelServletTest extends JerseyTest {
when(modelBusinessLogic.createModel(any(Model.class))).thenReturn(model);
ModelCreateRequest derviedModelCreateRequest = new ModelCreateRequest();
derviedModelCreateRequest.setName("derivedModel");
+ derviedModelCreateRequest.setModelType(ModelTypeEnum.NORMATIVE_EXTENSION);
derviedModelCreateRequest.setDerivedFrom(model.getName());
final FormDataMultiPart formDataMultiPart = buildCreateFormDataMultiPart(new byte[0], parseToJsonString(derviedModelCreateRequest));
final var response = target(rootPath.toString()).request(MediaType.APPLICATION_JSON)