X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=POLICY-SDK-APP%2Fsrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fpolicy%2Fcontroller%2FCreateFirewallController.java;h=1326aba7d05e9a3c285ff06f7e05be6ff949bb98;hb=7e547eaa55920dfbc9691eab33bb728395b50cf2;hp=ecc39cdb612995e58bc23a0e5cb5d211bd334402;hpb=e0addf5b588a1244f9679becd90999dfcb4c3a94;p=policy%2Fengine.git

diff --git a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/CreateFirewallController.java b/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/CreateFirewallController.java
index ecc39cdb6..1326aba7d 100644
--- a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/CreateFirewallController.java
+++ b/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/CreateFirewallController.java
@@ -19,8 +19,6 @@
  */
 
 package org.openecomp.policy.controller;
-
-
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.ArrayList;
@@ -78,6 +76,7 @@ import com.fasterxml.jackson.databind.ObjectWriter;
 
 import oasis.names.tc.xacml._3_0.core.schema.wd_17.AllOfType;
 import oasis.names.tc.xacml._3_0.core.schema.wd_17.AnyOfType;
+import oasis.names.tc.xacml._3_0.core.schema.wd_17.AttributeDesignatorType;
 import oasis.names.tc.xacml._3_0.core.schema.wd_17.AttributeValueType;
 import oasis.names.tc.xacml._3_0.core.schema.wd_17.MatchType;
 import oasis.names.tc.xacml._3_0.core.schema.wd_17.PolicyType;
@@ -249,7 +248,6 @@ public class CreateFirewallController extends RestrictedBaseController {
 				// Under target we have AnyOFType
 				List<AnyOfType> anyOfList = target.getAnyOf();
 				if (anyOfList != null) {
-					int index = 0;
 					Iterator<AnyOfType> iterAnyOf = anyOfList.iterator();
 					while (iterAnyOf.hasNext()) {
 						AnyOfType anyOf = iterAnyOf.next();
@@ -272,25 +270,24 @@ public class CreateFirewallController extends RestrictedBaseController {
 										//
 										AttributeValueType attributeValue = match.getAttributeValue();
 										String value = (String) attributeValue.getContent().get(0);
-										if (index == 1) {
+										AttributeDesignatorType designator = match.getAttributeDesignator();
+										String attributeId = designator.getAttributeId();
+										if (attributeId.equals("ConfigName")) {
 											policyAdapter.setConfigName(value);
 										}
-										if (index ==  2){
+										if (attributeId.equals("RiskType")){
 											policyAdapter.setRiskType(value);
 										}
-	
-										if (index ==  3){
+										if (attributeId.equals("RiskLevel")){
 											policyAdapter.setRiskLevel(value);
 										}
-										
-										if (index ==  4){
+										if (attributeId.equals("guard")){
 											policyAdapter.setGuard(value);
 										}
-										if (index == 5 && !value.contains("NA")){
+										if (attributeId.equals("TTLDate") && !value.contains("NA")){
 											String newDate = convertDate(value, true);
 											policyAdapter.setTtlDate(newDate);
 										}
-										index++;
 									}
 								}
 							}
@@ -514,7 +511,7 @@ public class CreateFirewallController extends RestrictedBaseController {
 		ServiceListJson targetSl=null;
 		int i=0;
 		try{
-			
+			String networkRole="";
 			for(String tag:tagCollectorList){
 				tags= new Tags();
 				List<Object> tagListData = commonClassDao.getData(FWTagPicker.class);
@@ -535,12 +532,14 @@ public class CreateFirewallController extends RestrictedBaseController {
 							tagList.add(tagDefine);
 							
 						}
-						
+						networkRole=jpaTagPickerList.getNetworkRole();
+						break;
 					}
 				}	
 				tags.setTags(tagList);
 				tags.setTagPickerName(tag);
 				tags.setRuleName(termCollectorList.get(i));
+				tags.setNetworkRole(networkRole);
 				tagsList.add(tags);
 				i++;
 			}
@@ -915,15 +914,15 @@ public class CreateFirewallController extends RestrictedBaseController {
 			try {
 				json = om.writeValueAsString(tc);
 			} catch (JsonGenerationException e) {
-				e.printStackTrace();
+				logger.error("Exception Occured"+e);
 			} catch (JsonMappingException e) {
-				e.printStackTrace();
+				logger.error("Exception Occured"+e);
 			} catch (IOException e) {
-				e.printStackTrace();
+				logger.error("Exception Occured"+e);
 			}	
 
 		}catch (Exception e) {
-			e.printStackTrace();
+			logger.error("Exception Occured"+e);
 		}
 
 		return json;