Merge "Remove exclusion of dme"

diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/util/MSModelUtils.java b/ONAP-REST/src/main/java/org/onap/policy/rest/util/MSModelUtils.java
index 54713ce..f145f4d 100644 (file)
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/util/MSModelUtils.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/util/MSModelUtils.java
@@ -1214,9 +1214,7 @@ public class MSModelUtils {
                         hm = new LinkedHashMap<>();
                         String keyStr = key.substring(key.lastIndexOf('.') + 1);
                         String valueStr = map.get(key);
-                        if (key.contains(".objective.")) {
-                            throw new ParserException("Attribute objective is a key word. Please use a different name");
-                        }
+
                         if (("type").equals(keyStr)) {
                             if (!key.contains("entry_schema")) {
                                 hm.put(keyStr, valueStr);

diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateDcaeMicroServiceController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateDcaeMicroServiceController.java
index c4c8220..e7ed57a 100644 (file)
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateDcaeMicroServiceController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateDcaeMicroServiceController.java
@@ -582,7 +582,11 @@ public class CreateDcaeMicroServiceController extends RestrictedBaseController {
                
                //Get element order info 
                String dataOrderInfo = returnModel.getDataOrderInfo();
-               
+        if(dataOrderInfo != null && !dataOrderInfo.startsWith("\"")){
+            dataOrderInfo = "\"" + dataOrderInfo + "\"";
+        }
+        LOGGER.info("dataOrderInfo : " + dataOrderInfo);
+        
                String allManyTrueKeys = "";
                if(allkeys != null){
                        allManyTrueKeys = allkeys.toString();

diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateOptimizationController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateOptimizationController.java
index a45bfed..e3ce878 100644 (file)
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateOptimizationController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateOptimizationController.java
@@ -234,6 +234,10 @@ public class CreateOptimizationController extends RestrictedBaseController {
                
                //Get element order info 
                String dataOrderInfo = returnModel.getDataOrderInfo();
+               if(dataOrderInfo != null && !dataOrderInfo.startsWith("\"")){
+                   dataOrderInfo = "\"" + dataOrderInfo + "\"";
+               }
+               
                String nameOfTrueKeys = "";
                if(allkeys != null){
                        nameOfTrueKeys = allkeys.toString();

diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/DCAEMicroServicePolicyController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/DCAEMicroServicePolicyController.js
index d53a919..5a3c62e 100644 (file)
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/DCAEMicroServicePolicyController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/DCAEMicroServicePolicyController.js
@@ -1381,9 +1381,10 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
                        }
                        
                        for (i=0; i < listemunerateValues.length; i += 1) {
-                               if(listemunerateValues[i].includes("equal-sign")){
+                               if(typeof listemunerateValues[i] == "string" && listemunerateValues[i].includes("equal-sign")){
                                        listemunerateValues[i] = listemunerateValues[i].replace('equal-sign','=');
                                }
+                               
                            option = document.createElement('option');
                            option.setAttribute('value', listemunerateValues[i]);
                            option.appendChild(document.createTextNode(listemunerateValues[i]));

diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/OptimizationPolicyController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/OptimizationPolicyController.js
index cbd011f..cdeaefd 100644 (file)
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/OptimizationPolicyController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/OptimizationPolicyController.js
@@ -1159,11 +1159,11 @@ angular.module('abs').controller('optimizationController', ['$scope', '$window',
                        listField.appendChild(optionFirst);     
                }
                
-               for (i=0; i < listemunerateValues.length; i += 1) {
-                       if(listemunerateValues[i].includes("equal-sign")){
+               for (var i=0; i < listemunerateValues.length; i += 1) {
+                       if(typeof listemunerateValues[i] == "string" && listemunerateValues[i].includes("equal-sign")){
                                listemunerateValues[i] = listemunerateValues[i].replace('equal-sign','=');
                        }
-                   option = document.createElement('option');
+                   var option = document.createElement('option');
                    option.setAttribute('value', listemunerateValues[i]);
                    option.appendChild(document.createTextNode(listemunerateValues[i]));
                    option.setAttribute('value', listemunerateValues[i]);