summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
4071a05)
Changed the incorrect column 'dataorder' to 'dataorderinfo'
Made changes to pom and AAF client code per AAF API changes in new
depedency.
Change-Id: Ic9bf0edec8282cc0f96d6fedd62fa9253d52070f
Issue-ID: POLICY-731
Signed-off-by: Michael Mokry <mm117s@att.com>
</exclusions>
</dependency>
<dependency>
</exclusions>
</dependency>
<dependency>
- <groupId>org.onap.aaf.cadi</groupId>
- <artifactId>cadi-aaf</artifactId>
- <version>1.0.0</version>
+ <groupId>org.onap.aaf.authz</groupId>
+ <artifactId>aaf-cadi-aaf</artifactId>
+ <version>2.1.0</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
* ============LICENSE_START=======================================================
* PolicyEngineUtils
* ================================================================================
* ============LICENSE_START=======================================================
* PolicyEngineUtils
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* limitations under the License.
* ============LICENSE_END=========================================================
*/
* limitations under the License.
* ============LICENSE_END=========================================================
*/
package org.onap.policy.utils;
package org.onap.policy.utils;
+import java.security.Principal;
import java.util.Properties;
import org.apache.log4j.Logger;
import java.util.Properties;
import org.apache.log4j.Logger;
import org.onap.aaf.cadi.aaf.AAFPermission;
import org.onap.aaf.cadi.aaf.v2_0.AAFAuthn;
import org.onap.aaf.cadi.aaf.v2_0.AAFCon;
import org.onap.aaf.cadi.aaf.AAFPermission;
import org.onap.aaf.cadi.aaf.v2_0.AAFAuthn;
import org.onap.aaf.cadi.aaf.v2_0.AAFCon;
-import org.onap.aaf.cadi.aaf.v2_0.AAFConDME2;
+import org.onap.aaf.cadi.aaf.v2_0.AAFConHttp;
import org.onap.aaf.cadi.aaf.v2_0.AAFLurPerm;
import org.onap.aaf.cadi.config.Config;
import org.onap.aaf.cadi.aaf.v2_0.AAFLurPerm;
import org.onap.aaf.cadi.config.Config;
+import org.onap.aaf.cadi.locator.PropertyLocator;
+import org.onap.aaf.cadi.principal.UnAuthPrincipal;
try {
aafCon.basicAuth(userName, pass);
AAFPermission perm = new AAFPermission(type, instance, action);
try {
aafCon.basicAuth(userName, pass);
AAFPermission perm = new AAFPermission(type, instance, action);
- result = aafLurPerm.fish(userName, perm);
+ final Principal p = new UnAuthPrincipal(userName);
+ result = aafLurPerm.fish(p, perm);
} catch (CadiException e) {
logger.error(e.getMessage() + e);
aafLurPerm.destroy();
} catch (CadiException e) {
logger.error(e.getMessage() + e);
aafLurPerm.destroy();
private static boolean setUpAAF(){
try {
private static boolean setUpAAF(){
try {
- aafCon = new AAFConDME2(access);
+ aafCon = new AAFConHttp(access,new PropertyLocator("https://aaf-onap-beijing-test.osaaf.org:8100"));
aafLurPerm = aafCon.newLur();
aafAuthn = aafCon.newAuthn(aafLurPerm);
return true;
aafLurPerm = aafCon.newLur();
aafAuthn = aafCon.newAuthn(aafLurPerm);
return true;
`version` varchar(45) default null,
`annotation` longtext,
`enumValues` longtext,
`version` varchar(45) default null,
`annotation` longtext,
`enumValues` longtext,
-`dataOrder` varchar(2000) DEFAULT NULL,
+`dataOrderInfo` varchar(2000) DEFAULT NULL,
primary key (`id`),
unique key `optimizationmodels_uniq` (`modelname`,`version`)
);
primary key (`id`),
unique key `optimizationmodels_uniq` (`modelname`,`version`)
);