Merge "Fixing issue with validation errors"

diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/DCAEMicroServicePolicyTemplate.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/DCAEMicroServicePolicyTemplate.html
index 664157d..6008033 100644 (file)
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/DCAEMicroServicePolicyTemplate.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/DCAEMicroServicePolicyTemplate.html
@@ -94,7 +94,7 @@
                                                title="Select the dropdown value driven from MicroService Models (MicroService Policy)Dictionary."></select>
                                </div>
                                <div class="form-group col-sm-3">
-                                       <label>Micro Service Version:<sup><b>*</b></sup></label> <select
+                                           <label id="msVersion"><span id="msPolicyloader" class = "msloader" style="visibility:hidden;"></span>Micro Service Version: * </label> <select
                                                class="form-control" ng-disabled="temp.policy.readOnly"
                                                ng-model="temp.policy.version"
                                                ng-options="option for option in microServiceModelsDictionaryVersionDatas track by option"

diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml
index f4bb5a0..052d637 100644 (file)
--- a/PolicyEngineUtils/pom.xml
+++ b/PolicyEngineUtils/pom.xml
@@ -99,7 +99,6 @@
         <dependency>
             <groupId>org.onap.aaf.authz</groupId>
             <artifactId>aaf-cadi-aaf</artifactId>
-            <version>2.1.0</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>

diff --git a/PolicyEngineUtils/src/main/java/org/onap/policy/utils/AAFPolicyClientImpl.java b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/AAFPolicyClientImpl.java
index 5c46c76..e65ac27 100644 (file)
--- a/PolicyEngineUtils/src/main/java/org/onap/policy/utils/AAFPolicyClientImpl.java
+++ b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/AAFPolicyClientImpl.java
@@ -190,7 +190,11 @@ public class AAFPolicyClientImpl implements AAFPolicyClient{
             if(aafCon!=null && aafLurPerm !=null){
                 try {
                     aafCon.basicAuth(userName, pass);
-                    AAFPermission perm = new AAFPermission(type, instance, action);
+                    //
+                    // The first parameter is the namespace. At this point we will default
+                    // to null until we are given a namespace to use.
+                    //
+                    AAFPermission perm = new AAFPermission(null, type, instance, action);
                     final Principal p = new UnAuthPrincipal(userName);
                     result = aafLurPerm.fish(p, perm);
                 } catch (CadiException e) {