Remove unused param

Remove unused param from request parameters

Issue-ID: SO-2651
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: I1c9a8e05aa329ee65f9910ab25319a0a61d54675

diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/RequestParameters.java b/common/src/main/java/org/onap/so/serviceinstancebeans/RequestParameters.java
index a72229a..9fceed1 100644 (file)
--- a/common/src/main/java/org/onap/so/serviceinstancebeans/RequestParameters.java
+++ b/common/src/main/java/org/onap/so/serviceinstancebeans/RequestParameters.java
@@ -57,9 +57,6 @@ public class RequestParameters implements Serializable {
     @JsonProperty("rebuildVolumeGroups")
     private Boolean rebuildVolumeGroups;
 
-    @JsonProperty("enforceValidNfValues")
-    private Boolean enforceValidNfValues = false;
-
     @Override
     public String toString() {
         return new ToStringBuilder(this).append("subscriptionServiceType", subscriptionServiceType)
@@ -67,15 +64,7 @@ public class RequestParameters implements Serializable {
                 .append("usePreload", usePreload).append("autoBuildVfModules", autoBuildVfModules)
                 .append("cascadeDelete", cascadeDelete).append("testApi", testApi)
                 .append("retainAssignments", retainAssignments).append("rebuildVolumeGroups", rebuildVolumeGroups)
-                .append("enforceValidNfValues", enforceValidNfValues).toString();
-    }
-
-    public Boolean getEnforceValidNfValues() {
-        return enforceValidNfValues;
-    }
-
-    public void setEnforceValidNfValues(Boolean enforceValidNfValues) {
-        this.enforceValidNfValues = enforceValidNfValues;
+                .toString();
     }
 
     public String getSubscriptionServiceType() {

diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/MsoRequest.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/MsoRequest.java
index e3e840b..c077558 100644 (file)
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/MsoRequest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/MsoRequest.java
@@ -85,6 +85,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -105,6 +106,9 @@ public class MsoRequest {
     @Autowired
     private ResponseBuilder builder;
 
+    @Value("${mso.enforceDLP:false}")
+    private boolean enforceDLP;
+
     private static Logger logger = LoggerFactory.getLogger(MsoRequest.class);
 
     public Response buildServiceErrorResponse(int httpResponseCode, MsoException exceptionType, String errorText,
@@ -179,8 +183,10 @@ public class MsoRequest {
             rules.add(new ModelInfoValidation());
             rules.add(new CloudConfigurationValidation());
             rules.add(new SubscriberInfoValidation());
-            rules.add(new PlatformLOBValidation());
-            rules.add(new ProjectOwningEntityValidation());
+            if (!enforceDLP) {
+                rules.add(new PlatformLOBValidation());
+                rules.add(new ProjectOwningEntityValidation());
+            }
             rules.add(new RelatedInstancesValidation());
             rules.add(new ConfigurationParametersValidation());
         }

diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/validation/PlatformLOBValidation.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/validation/PlatformLOBValidation.java
index 20be2b5..71405b0 100644 (file)
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/validation/PlatformLOBValidation.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/validation/PlatformLOBValidation.java
@@ -43,8 +43,7 @@ public class PlatformLOBValidation implements ValidationRule {
 
         platform = info.getSir().getRequestDetails().getPlatform();
         lineOfBusiness = info.getSir().getRequestDetails().getLineOfBusiness();
-        if (reqVersion >= 5 && requestScope.equalsIgnoreCase(ModelType.vnf.name()) && action == Action.createInstance
-                && !info.getReqParameters().getEnforceValidNfValues()) {
+        if (reqVersion >= 5 && requestScope.equalsIgnoreCase(ModelType.vnf.name()) && action == Action.createInstance) {
             if (reqVersion > 5 && platform == null) {
                 throw new ValidationException("platform");
             }

diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/validation/ProjectOwningEntityValidation.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/validation/ProjectOwningEntityValidation.java
index cebbd63..07641ae 100644 (file)
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/validation/ProjectOwningEntityValidation.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/validation/ProjectOwningEntityValidation.java
@@ -45,8 +45,7 @@ public class ProjectOwningEntityValidation implements ValidationRule {
         project = info.getSir().getRequestDetails().getProject();
         owningEntity = info.getSir().getRequestDetails().getOwningEntity();
         if (reqVersion >= 5 && requestScope.equalsIgnoreCase(ModelType.service.name())
-                && !info.getReqParameters().getEnforceValidNfValues() && action == Action.createInstance
-                || action == Action.assignInstance) {
+                && action == Action.createInstance || action == Action.assignInstance) {
             if (reqVersion > 5 && owningEntity == null) {
                 throw new ValidationException("owningEntity");
             }

diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/infra/VnfLookup.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/infra/VnfLookup.json
index eef0776..25aa8a2 100644 (file)
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/infra/VnfLookup.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/infra/VnfLookup.json
@@ -13,7 +13,7 @@
       "vnfName":"Robot_VNF_For_Volume_Group",
       "vnfType":"Vf zrdm5bpxmc02092017-Service/Vf zrdm5bpxmc02092017-VF 0",
       "tenantId":"0422ffb57ba042c0800a29dc85ca70f8",
-      "requestBody":"{\"requestDetails\": {\"relatedInstanceList\": [{\"relatedInstance\": {\"instanceId\": \"f5435110-b276-4920-9261-a18a5582d357\", \"modelInfo\": {\"modelVersionId\": \"bad955c3-29b2-4a27-932e-28e942cc6480\", \"modelVersion\": \"1\", \"modelName\": \"Vf zrdm5bpxmc02092017-Service\", \"modelInvariantId\": \"b16a9398-ffa3-4041-b78c-2956b8ad9c7b\", \"modelType\": \"service\"}}}], \"requestParameters\": {\"userParams\": [], \"enforceValidNfValues\": false, \"testApi\": \"GR_API\"}, \"lineOfBusiness\": {\"lineOfBusinessName\": \"vSAMP12_14-2XXX-Aug18-9001 - LOB\"}, \"requestInfo\": {\"source\": \"VID\", \"requestorId\": \"az2016\", \"instanceName\": \"Robot_VNF_For_Volume_Group\", \"suppressRollback\": false, \"productFamilyId\": \"06f76284-8710-11e6-ae22-56b6b6499611\"}, \"platform\": {\"platformName\": \"vSAMP12_14-2XXX-Aug18-9001 - Platform\"}, \"modelInfo\": {\"modelName\": \"Vf zrdm5bpxmc02092017-VF\", \"modelVersion\": \"1\", \"modelInvariantId\": \"23122c9b-dd7f-483f-bf0a-e069303db2f7\", \"modelType\": \"vnf\", \"modelCustomizationName\": \"Vf zrdm5bpxmc02092017-VF 0\", \"modelVersionId\": \"d326f424-2312-4dd6-b7fe-364fadbd1ef5\", \"modelCustomizationId\": \"96c23a4a-6887-4b2c-9cce-1e4ea35eaade\"}, \"cloudConfiguration\": {\"cloudOwner\": \"cloudOwner\", \"tenantId\": \"0422ffb57ba042c0800a29dc85ca70f8\", \"lcpCloudRegionId\": \"regionOne\"}}}",
+      "requestBody":"{\"requestDetails\": {\"relatedInstanceList\": [{\"relatedInstance\": {\"instanceId\": \"f5435110-b276-4920-9261-a18a5582d357\", \"modelInfo\": {\"modelVersionId\": \"bad955c3-29b2-4a27-932e-28e942cc6480\", \"modelVersion\": \"1\", \"modelName\": \"Vf zrdm5bpxmc02092017-Service\", \"modelInvariantId\": \"b16a9398-ffa3-4041-b78c-2956b8ad9c7b\", \"modelType\": \"service\"}}}], \"requestParameters\": {\"userParams\": [],\"testApi\": \"GR_API\"}, \"lineOfBusiness\": {\"lineOfBusinessName\": \"vSAMP12_14-2XXX-Aug18-9001 - LOB\"}, \"requestInfo\": {\"source\": \"VID\", \"requestorId\": \"az2016\", \"instanceName\": \"Robot_VNF_For_Volume_Group\", \"suppressRollback\": false, \"productFamilyId\": \"06f76284-8710-11e6-ae22-56b6b6499611\"}, \"platform\": {\"platformName\": \"vSAMP12_14-2XXX-Aug18-9001 - Platform\"}, \"modelInfo\": {\"modelName\": \"Vf zrdm5bpxmc02092017-VF\", \"modelVersion\": \"1\", \"modelInvariantId\": \"23122c9b-dd7f-483f-bf0a-e069303db2f7\", \"modelType\": \"vnf\", \"modelCustomizationName\": \"Vf zrdm5bpxmc02092017-VF 0\", \"modelVersionId\": \"d326f424-2312-4dd6-b7fe-364fadbd1ef5\", \"modelCustomizationId\": \"96c23a4a-6887-4b2c-9cce-1e4ea35eaade\"}, \"cloudConfiguration\": {\"cloudOwner\": \"cloudOwner\", \"tenantId\": \"0422ffb57ba042c0800a29dc85ca70f8\", \"lcpCloudRegionId\": \"regionOne\"}}}",
       "lastModifiedBy":"CamundaBPMN",
       "modifyTime":"2019-11-11T19:29:15.000+0000",
       "cloudRegion":"regionOne",