Code Review
/
policy
/
engine.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
New Optimization Policy
[policy/engine.git]
/
ONAP-PAP-REST
/
src
/
main
/
java
/
org
/
onap
/
policy
/
pap
/
xacml
/
rest
/
handler
/
DictionaryHandlerImpl.java
diff --git
a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/DictionaryHandlerImpl.java
b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/DictionaryHandlerImpl.java
index
e0304d0
..
d0cd985
100644
(file)
--- a/
ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/DictionaryHandlerImpl.java
+++ b/
ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/handler/DictionaryHandlerImpl.java
@@
-2,7
+2,7
@@
* ============LICENSE_START=======================================================
* ONAP-PAP-REST
* ================================================================================
* ============LICENSE_START=======================================================
* ONAP-PAP-REST
* ================================================================================
- * 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.
@@
-37,109
+37,112
@@
public class DictionaryHandlerImpl implements DictionaryHandler{
DictionaryService dictionary = new DictionaryService();
switch (dictionaryType) {
case "OnapName":
DictionaryService dictionary = new DictionaryService();
switch (dictionaryType) {
case "OnapName":
- dictionary.getOnapDictionary(re
quest, re
sponse);
+ dictionary.getOnapDictionary(response);
break;
case "Attribute":
break;
case "Attribute":
- dictionary.getAttributeDictionary(re
quest, re
sponse);
+ dictionary.getAttributeDictionary(response);
break;
case "Action":
break;
case "Action":
- dictionary.getActionPolicyDictionary(re
quest, re
sponse);
+ dictionary.getActionPolicyDictionary(response);
break;
case "BRMSParamTemplate":
break;
case "BRMSParamTemplate":
- dictionary.getBRMSParamDictionary(re
quest, re
sponse);
+ dictionary.getBRMSParamDictionary(response);
break;
case "VSCLAction":
break;
case "VSCLAction":
- dictionary.getVSCLAction(re
quest, re
sponse);
+ dictionary.getVSCLAction(response);
break;
case "VNFType":
break;
case "VNFType":
- dictionary.getVnfType(re
quest, re
sponse);
+ dictionary.getVnfType(response);
break;
case "PEPOptions":
break;
case "PEPOptions":
- dictionary.getPEPOptions(re
quest, re
sponse);
+ dictionary.getPEPOptions(response);
break;
case "Varbind":
break;
case "Varbind":
- dictionary.getVarbind(re
quest, re
sponse);
+ dictionary.getVarbind(response);
break;
case "Service":
break;
case "Service":
- dictionary.getServiceType(re
quest, re
sponse);
+ dictionary.getServiceType(response);
break;
case "Site":
break;
case "Site":
- dictionary.getSiteType(re
quest, re
sponse);
+ dictionary.getSiteType(response);
break;
case "Settings":
break;
case "Settings":
- dictionary.getSettingsDictionary(re
quest, re
sponse);
+ dictionary.getSettingsDictionary(response);
break;
break;
- case "
DescriptiveScope
":
- dictionary.get
DescriptiveDictionary(request,
response);
+ case "
RainyDayTreatments
":
+ dictionary.get
RainyDayDictionary(
response);
break;
break;
- case "
Enforcer
":
- dictionary.get
EnforcerDictionary(request,
response);
+ case "
DescriptiveScope
":
+ dictionary.get
DescriptiveDictionary(
response);
break;
case "ActionList":
break;
case "ActionList":
- dictionary.getActionListDictionary(re
quest, re
sponse);
+ dictionary.getActionListDictionary(response);
break;
case "ProtocolList":
break;
case "ProtocolList":
- dictionary.getProtocolListDictionary(re
quest, re
sponse);
+ dictionary.getProtocolListDictionary(response);
break;
case "Zone":
break;
case "Zone":
- dictionary.getZoneDictionary(re
quest, re
sponse);
+ dictionary.getZoneDictionary(response);
break;
case "SecurityZone":
break;
case "SecurityZone":
- dictionary.getSecurityZoneDictionary(re
quest, re
sponse);
+ dictionary.getSecurityZoneDictionary(response);
break;
case "PrefixList":
break;
case "PrefixList":
- dictionary.getPrefixListDictionary(re
quest, re
sponse);
+ dictionary.getPrefixListDictionary(response);
break;
case "AddressGroup":
break;
case "AddressGroup":
- dictionary.getAddressGroupDictionary(re
quest, re
sponse);
+ dictionary.getAddressGroupDictionary(response);
break;
case "ServiceGroup":
break;
case "ServiceGroup":
- dictionary.getServiceGroupDictionary(re
quest, re
sponse);
+ dictionary.getServiceGroupDictionary(response);
break;
case "ServiceList":
break;
case "ServiceList":
- dictionary.getServiceListDictionary(re
quest, re
sponse);
+ dictionary.getServiceListDictionary(response);
break;
case "TermList":
case "RuleList":
case "FirewallRuleList":
case "Term":
break;
case "TermList":
case "RuleList":
case "FirewallRuleList":
case "Term":
- dictionary.getTermListDictionary(re
quest, re
sponse);
+ dictionary.getTermListDictionary(response);
break;
case "MicroServiceLocation":
break;
case "MicroServiceLocation":
- dictionary.getMicroServiceLocationDictionary(re
quest, re
sponse);
+ dictionary.getMicroServiceLocationDictionary(response);
break;
case "MicroServiceConfigName":
break;
case "MicroServiceConfigName":
- dictionary.getMicroServiceConfigNameDictionary(re
quest, re
sponse);
+ dictionary.getMicroServiceConfigNameDictionary(response);
break;
case "DCAEUUID":
break;
case "DCAEUUID":
- dictionary.getDCAEUUIDDictionary(re
quest, re
sponse);
+ dictionary.getDCAEUUIDDictionary(response);
break;
case "MicroServiceModels":
break;
case "MicroServiceModels":
- dictionary.getMicroServiceModelsDictionary(request, response);
+ dictionary.getMicroServiceModelsDictionary(response);
+ break;
+ case "MicroServiceDictionary":
+ dictionary.getMicroServiceDictionary(response);
+ break;
+ case "OptimizationModels":
+ dictionary.getOptimizationModelsDictionary(response);
break;
case "PolicyScopeService":
break;
case "PolicyScopeService":
- dictionary.getPSServiceDictionary(re
quest, re
sponse);
+ dictionary.getPSServiceDictionary(response);
break;
case "PolicyScopeResource":
break;
case "PolicyScopeResource":
- dictionary.getPSResourceDictionary(re
quest, re
sponse);
+ dictionary.getPSResourceDictionary(response);
break;
case "PolicyScopeType":
break;
case "PolicyScopeType":
- dictionary.getPSTypeDictionary(re
quest, re
sponse);
+ dictionary.getPSTypeDictionary(response);
break;
case "PolicyScopeClosedLoop":
break;
case "PolicyScopeClosedLoop":
- dictionary.getPSClosedLoopDictionary(re
quest, re
sponse);
+ dictionary.getPSClosedLoopDictionary(response);
break;
case "GroupPolicyScopeList":
break;
case "GroupPolicyScopeList":
- dictionary.getPSGroupScopeDictionary(re
quest, re
sponse);
+ dictionary.getPSGroupScopeDictionary(response);
break;
case "RiskType":
break;
case "RiskType":
- dictionary.getRiskTypeDictionary(re
quest, re
sponse);
+ dictionary.getRiskTypeDictionary(response);
break;
case "SafePolicyWarning":
break;
case "SafePolicyWarning":
- dictionary.getSafePolicyWarningDictionary(request, response);
- break;
- case "MicroServiceDictionary":
- dictionary.getMicroServiceDictionary(request, response);
+ dictionary.getSafePolicyWarningDictionary(response);
break;
default:
extendedOptions(dictionaryType, request, response, true);
break;
default:
extendedOptions(dictionaryType, request, response, true);
@@
-212,12
+215,12
@@
public class DictionaryHandlerImpl implements DictionaryHandler{
case "Settings":
result = dictionary.saveSettingsDictionary(request, response);
break;
case "Settings":
result = dictionary.saveSettingsDictionary(request, response);
break;
+ case "RainyDayTreatments":
+ result = dictionary.saveRainyDayDictionary(request, response);
+ break;
case "DescriptiveScope":
result = dictionary.saveDescriptiveDictionary(request, response);
break;
case "DescriptiveScope":
result = dictionary.saveDescriptiveDictionary(request, response);
break;
- case "Enforcer":
- result = dictionary.saveEnforcerDictionary(request, response);
- break;
case "ActionList":
result = dictionary.saveActionListDictionary(request, response);
break;
case "ActionList":
result = dictionary.saveActionListDictionary(request, response);
break;
@@
-260,6
+263,12
@@
public class DictionaryHandlerImpl implements DictionaryHandler{
case "MicroServiceModels":
result = dictionary.saveMicroServiceModelsDictionary(request, response);
break;
case "MicroServiceModels":
result = dictionary.saveMicroServiceModelsDictionary(request, response);
break;
+ case "MicroServiceDictionary":
+ result = dictionary.saveMicroServiceDictionary(request, response);
+ break;
+ case "OptimizationModels":
+ result = dictionary.saveOptimizationModelsDictionary(request, response);
+ break;
case "PolicyScopeService":
result = dictionary.savePSServiceDictionary(request, response);
break;
case "PolicyScopeService":
result = dictionary.savePSServiceDictionary(request, response);
break;
@@
-281,9
+290,6
@@
public class DictionaryHandlerImpl implements DictionaryHandler{
case "SafePolicyWarning":
result = dictionary.saveSafePolicyWarningDictionary(request, response);
break;
case "SafePolicyWarning":
result = dictionary.saveSafePolicyWarningDictionary(request, response);
break;
- case "MicroServiceDictionary":
- result = dictionary.saveMicroServiceDictionary(request, response);
- break;
default:
result = extendedOptions(dictionaryType, request, response, false);
if(result==null){
default:
result = extendedOptions(dictionaryType, request, response, false);
if(result==null){