From: Brittany Plummer (bp896r) <bp896r@att.com>
Date: Fri, 24 Aug 2018 15:19:02 +0000 (-0400)
Subject: Added actions to common APIH package
X-Git-Tag: 1.3.1~231^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F61%2F62361%2F1;p=so.git

Added actions to common APIH package

Added scaleOut to common APIH Action enums

Change-Id: I94f3d6b68d8890dd41aa4bd9ff51e5ecd2253383
Issue-ID: SO-904
Signed-off-by: Brittany Plummer (bp896r) <bp896r@att.com>
---

diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandlerinfra/Action.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandlerinfra/Action.java
index e920db2fd2..8dba63b44b 100644
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandlerinfra/Action.java
+++ b/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandlerinfra/Action.java
@@ -41,5 +41,7 @@ public enum Action {
 	assignInstance, 
 	unassignInstance,
 	compareModel,
-	scaleInstance
+	scaleInstance,
+	deactivateAndCloudDelete,
+	scaleOut
 }
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/validation/ConfigurationParametersValidation.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/validation/ConfigurationParametersValidation.java
index edd1b1a10e..8fdb43f20c 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/validation/ConfigurationParametersValidation.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/validation/ConfigurationParametersValidation.java
@@ -41,7 +41,7 @@ public class ConfigurationParametersValidation implements ValidationRule{
 		String requestScope = info.getRequestScope();
 		Actions action = info.getAction();
 		
-		if(requestScope.equalsIgnoreCase(ModelType.vfModule.name()) && action == Action.scaleOut && configParams.isEmpty()){
+		if(configParams.isEmpty() && requestScope.equalsIgnoreCase(ModelType.vfModule.name()) && action == Action.scaleOut){
 			throw new ValidationException("configuration parameters");
 		}
         return info;