[Policy-8 ,Policy-23] Updated Matchid for policies 47/5047/5
authorrb7147 <rb7147@att.com>
Thu, 15 Jun 2017 13:42:41 +0000 (09:42 -0400)
committerrb7147 <rb7147@att.com>
Thu, 15 Jun 2017 17:27:54 +0000 (13:27 -0400)
Commit includes Resolved Sonar blokcers
Included the 1707 database scripts.

Change-Id: I2ffdfce57e6dee0892b272b23283bf246204599a
Signed-off-by: rb7147 <rb7147@att.com>
BRMSGateway/src/main/java/org/openecomp/policy/brmsInterface/BRMSHandler.java
ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/XACMLPapServlet.java
ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/PolicyDBDao.java
ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/service/ImportService.java
LogParser/src/main/java/org/openecomp/xacml/parser/ParseLog.java
packages/base/src/files/install/mysql/data/170701_downgrade_script.sql
packages/base/src/files/install/mysql/data/170701_upgrade_script.sql
packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml
packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml
packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vFirewall.1.xml
packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vLoadBalancer.1.xml

index ef990aa..f5f78a9 100644 (file)
@@ -125,7 +125,7 @@ public class BRMSHandler implements BackUpHandler{
                        ArrayList<PolicyConfig> brmsPolicies = addedPolicies(notification);
                        Boolean successFlag = false;
                        for(int i=0; !successFlag && i< bRMSPush.URLListSize(); i++){
-                               if(i!=0 && !successFlag){
+                               if(i!=0){
                                        for(PolicyConfig policyConfig: brmsPolicies){
                                                logger.info("Policy Retry with this Name notified: " + policyConfig.getPolicyName());
                                                bRMSPush.addRule(policyConfig.getPolicyName(),policyConfig.toOther(),policyConfig.getResponseAttributes());
index 4ceae06..c681c93 100644 (file)
@@ -1495,6 +1495,7 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
                                try{
                                        doACPostTransaction.movePdp(pdp, group, "XACMLPapServlet.doACPost");
                                }catch(Exception e){    
+                                       doACPostTransaction.rollbackTransaction();
                                        PolicyLogger.error(MessageCodes.ERROR_PROCESS_FLOW, e, "XACMLPapServlet", 
                                                        " Error while moving pdp in the database: "
                                                                        +"pdp="+pdp.getId()+",to group="+group.getId());
@@ -1520,9 +1521,6 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
                                return;
                        }
                } catch (PAPException e) {
-                       if(doACPostTransaction != null){
-                               doACPostTransaction.rollbackTransaction();
-                       }
                        PolicyLogger.error(MessageCodes.ERROR_PROCESS_FLOW, e, "XACMLPapServlet", " AC POST exception");
                        loggingContext.transactionEnded();
                        PolicyLogger.audit("Transaction Failed - See Error.log");
@@ -1748,11 +1746,11 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
                                        if (papEngine.getPDP(pdpId) == null) {
                                                // this is a request to create a new PDP object
                                                try{
-                                                       acPutTransaction.addPdpToGroup(pdp == null ? "PDP is null" : pdp.getId(), group.getId(), pdp.getName(), 
+                                                       acPutTransaction.addPdpToGroup(pdp.getId(), group.getId(), pdp.getName(), 
                                                                        pdp.getDescription(), pdp.getJmxPort(),"XACMLPapServlet.doACPut");
                                                } catch(Exception e){
                                                        PolicyLogger.error(MessageCodes.ERROR_PROCESS_FLOW, e, "XACMLPapServlet", " Error while adding pdp to group in the database: "
-                                                                       +"pdp="+ (pdp == null ? "PDP is null" : pdp.getId()) +",to group="+group.getId());
+                                                                       +"pdp="+ (pdp.getId()) +",to group="+group.getId());
                                                        throw new PAPException(e.getMessage());
                                                }
                                                papEngine.newPDP(pdp.getId(), group, pdp.getName(), pdp.getDescription(), pdp.getJmxPort());
index 8bf5ad6..2297413 100644 (file)
@@ -978,6 +978,7 @@ public class PolicyDBDao {
                //call command to update
        }
        private void handleIncomingPolicyChange(String url, String policyId,String oldPathString){
+               String policyName = null;
                EntityManager em = emf.createEntityManager();
                Query getPolicyEntityQuery = em.createNamedQuery("PolicyEntity.FindById");
                getPolicyEntityQuery.setParameter("id", Long.valueOf(policyId));
@@ -991,6 +992,7 @@ public class PolicyDBDao {
                String action = "unknown action";
                try {
                        if(policy != null){
+                               policyName = policy.getPolicyName();
                                logger.debug("Deleting Policy: " + policy.getPolicyName());
                                action = "delete";
                                Path subFile = null;
@@ -1011,7 +1013,6 @@ public class PolicyDBDao {
                                }
                        }
                } catch (IOException e1) {
-                       String policyName = policy.getPolicyName();
                        PolicyLogger.error(MessageCodes.EXCEPTION_ERROR, e1, "PolicyDBDao", "Error occurred while performing [" + action + "] of Policy File: " + policyName);
                }       
        }
@@ -2103,89 +2104,93 @@ public class PolicyDBDao {
 
                @Override
                public void createPolicy(Policy policy, String username){
-                       logger.debug("createPolicy(PolicyRestAdapter policy, String username) as createPolicy("+policy+","+username+") called");
-                       String policyScope = policy.policyAdapter.getDomainDir().replace(File.separator, ".");
-                       //Does not need to be XACMLPolicyWriterWithPapNotify since it is already in the PAP
-                       //and this transaction is intercepted up stream.
-                       InputStream policyXmlStream = XACMLPolicyWriter.getXmlAsInputStream((PolicyType)policy.getCorrectPolicyDataObject());
-                       String policyDataString;
-                       try {
-                               policyDataString = IOUtils.toString(policyXmlStream);
-                       } catch (IOException e) {
-                               policyDataString = "could not read";
-                               PolicyLogger.error(MessageCodes.EXCEPTION_ERROR, e, "PolicyDBDao", "Caught IOException on IOUtils.toString("+policyXmlStream+")");
-                               throw new IllegalArgumentException("Cannot parse the policy xml from the PolicyRestAdapter.");
-                       }
-                       IOUtils.closeQuietly(policyXmlStream);
-                       String configPath = "";
-                       if (policy.policyAdapter.getPolicyType().equalsIgnoreCase("Config")) {
-                               configPath = evaluateXPath("/Policy/Rule/AdviceExpressions/AdviceExpression[contains(@AdviceId,'ID')]/AttributeAssignmentExpression[@AttributeId='URLID']/AttributeValue/text()", policyDataString);
-                       } else if (policy.policyAdapter.getPolicyType().equalsIgnoreCase("Action")) {
-                               configPath = evaluateXPath("/Policy/Rule/ObligationExpressions/ObligationExpression[contains(@ObligationId, " +policy.policyAdapter.getActionAttribute()+ ")]/AttributeAssignmentExpression[@AttributeId='body']/AttributeValue/text()", policyDataString);
-                       }
-
-                       String prefix = null;
-                       if (policy.policyAdapter.getPolicyType().equalsIgnoreCase("Config")) {
-
-                               prefix = configPath.substring(configPath.indexOf(policyScope+".")+policyScope.concat(".").length(), configPath.indexOf(policy.policyAdapter.getPolicyName()));
-                               if(isNullOrEmpty(policy.policyAdapter.getConfigBodyData())){
-                                       String configData = "";
-                                       try{
-                                               String newConfigPath = configPath;
+                       InputStream policyXmlStream = null;
+                       try{
+                               logger.debug("createPolicy(PolicyRestAdapter policy, String username) as createPolicy("+policy+","+username+") called");
+                               String policyScope = policy.policyAdapter.getDomainDir().replace(File.separator, ".");
+                               //Does not need to be XACMLPolicyWriterWithPapNotify since it is already in the PAP
+                               //and this transaction is intercepted up stream.
+                               String policyDataString;
+                               try {
+                                       policyXmlStream = XACMLPolicyWriter.getXmlAsInputStream((PolicyType)policy.getCorrectPolicyDataObject());
+                                       policyDataString = IOUtils.toString(policyXmlStream);
+                               } catch (IOException e) {
+                                       policyDataString = "could not read";
+                                       PolicyLogger.error(MessageCodes.EXCEPTION_ERROR, e, "PolicyDBDao", "Caught IOException on IOUtils.toString("+policyXmlStream+")");
+                                       throw new IllegalArgumentException("Cannot parse the policy xml from the PolicyRestAdapter.");
+                               }
+                               IOUtils.closeQuietly(policyXmlStream);
+                               String configPath = "";
+                               if (policy.policyAdapter.getPolicyType().equalsIgnoreCase("Config")) {
+                                       configPath = evaluateXPath("/Policy/Rule/AdviceExpressions/AdviceExpression[contains(@AdviceId,'ID')]/AttributeAssignmentExpression[@AttributeId='URLID']/AttributeValue/text()", policyDataString);
+                               } else if (policy.policyAdapter.getPolicyType().equalsIgnoreCase("Action")) {
+                                       configPath = evaluateXPath("/Policy/Rule/ObligationExpressions/ObligationExpression[contains(@ObligationId, " +policy.policyAdapter.getActionAttribute()+ ")]/AttributeAssignmentExpression[@AttributeId='body']/AttributeValue/text()", policyDataString);
+                               }
+
+                               String prefix = null;
+                               if (policy.policyAdapter.getPolicyType().equalsIgnoreCase("Config")) {
+
+                                       prefix = configPath.substring(configPath.indexOf(policyScope+".")+policyScope.concat(".").length(), configPath.indexOf(policy.policyAdapter.getPolicyName()));
+                                       if(isNullOrEmpty(policy.policyAdapter.getConfigBodyData())){
+                                               String configData = "";
                                                try{
-                                                       newConfigPath = processConfigPath(newConfigPath);                                                       
-                                               }catch(Exception e2){
-                                                       logger.error("Could not process config path: "+newConfigPath,e2);
+                                                       String newConfigPath = configPath;
+                                                       try{
+                                                               newConfigPath = processConfigPath(newConfigPath);                                                       
+                                                       }catch(Exception e2){
+                                                               logger.error("Could not process config path: "+newConfigPath,e2);
+                                                       }
+                                                       configData = readConfigFile(newConfigPath);
+                                               }catch(Exception e){
+                                                       logger.error("Could not read config body data for "+configPath,e);
                                                }
-                                               configData = readConfigFile(newConfigPath);
-                                       }catch(Exception e){
-                                               logger.error("Could not read config body data for "+configPath,e);
+                                               policy.policyAdapter.setConfigBodyData(configData);
                                        }
-                                       policy.policyAdapter.setConfigBodyData(configData);
-                               }
-                       } else if (policy.policyAdapter.getPolicyType().equalsIgnoreCase("Action")) {
-                               prefix = "Action_";
-                       } else if (policy.policyAdapter.getPolicyType().equalsIgnoreCase("Decision")) {
-                               prefix = "Decision_";
-                       }
-
-                       if(!(policy.policyAdapter.getData() instanceof PolicyType)){
-                               PolicyLogger.error("The data field is not an instance of PolicyType");
-                               throw new IllegalArgumentException("The data field is not an instance of PolicyType");
-                       }
-                       String finalName = policyScope + "." + prefix+policy.policyAdapter.getPolicyName()+"."+((PolicyType)policy.policyAdapter.getData()).getVersion()+".xml";
-                       if(policy.policyAdapter.getConfigType() == null || policy.policyAdapter.getConfigType().equals("")){
-                               //get the config file extension
-                               String ext = "";
-                               if (configPath != null) {
-                                       if (!configPath.equalsIgnoreCase("")) {
-                                               ext = configPath.substring(configPath.lastIndexOf('.'), configPath.length());;
+                               } else if (policy.policyAdapter.getPolicyType().equalsIgnoreCase("Action")) {
+                                       prefix = "Action_";
+                               } else if (policy.policyAdapter.getPolicyType().equalsIgnoreCase("Decision")) {
+                                       prefix = "Decision_";
+                               }
+
+                               if(!(policy.policyAdapter.getData() instanceof PolicyType)){
+                                       PolicyLogger.error("The data field is not an instance of PolicyType");
+                                       throw new IllegalArgumentException("The data field is not an instance of PolicyType");
+                               }
+                               String finalName = policyScope + "." + prefix+policy.policyAdapter.getPolicyName()+"."+((PolicyType)policy.policyAdapter.getData()).getVersion()+".xml";
+                               if(policy.policyAdapter.getConfigType() == null || policy.policyAdapter.getConfigType().equals("")){
+                                       //get the config file extension
+                                       String ext = "";
+                                       if (configPath != null) {
+                                               if (!configPath.equalsIgnoreCase("")) {
+                                                       ext = configPath.substring(configPath.lastIndexOf('.'), configPath.length());;
+                                               }
                                        }
-                               }
 
-                               if(ext.contains("txt")){
-                                       policy.policyAdapter.setConfigType(OTHER_CONFIG);
-                               } else if(ext.contains("json")){
-                                       policy.policyAdapter.setConfigType(JSON_CONFIG);
-                               } else if(ext.contains("xml")){
-                                       policy.policyAdapter.setConfigType(XML_CONFIG);
-                               } else if(ext.contains("properties")){
-                                       policy.policyAdapter.setConfigType(PROPERTIES_CONFIG);
-                               } else {
-                                       if (policy.policyAdapter.getPolicyType().equalsIgnoreCase("Action")){
+                                       if(ext.contains("txt")){
+                                               policy.policyAdapter.setConfigType(OTHER_CONFIG);
+                                       } else if(ext.contains("json")){
                                                policy.policyAdapter.setConfigType(JSON_CONFIG);
+                                       } else if(ext.contains("xml")){
+                                               policy.policyAdapter.setConfigType(XML_CONFIG);
+                                       } else if(ext.contains("properties")){
+                                               policy.policyAdapter.setConfigType(PROPERTIES_CONFIG);
+                                       } else {
+                                               if (policy.policyAdapter.getPolicyType().equalsIgnoreCase("Action")){
+                                                       policy.policyAdapter.setConfigType(JSON_CONFIG);
+                                               }
                                        }
                                }
-                       }
-                       if(policyXmlStream != null){
-                               try {
-                                       policyXmlStream.close();
-                               } catch (IOException e) {
-                                       logger.error("Exception Occured while closing input stream"+e);
+
+                               createPolicy(policy.policyAdapter, username, policyScope,finalName,policyDataString);
+                       }finally{
+                               if(policyXmlStream != null){
+                                       try {
+                                               policyXmlStream.close();
+                                       } catch (IOException e) {
+                                               logger.error("Exception Occured while closing input stream"+e);
+                                       }
                                }
                        }
-                       createPolicy(policy.policyAdapter, username, policyScope,finalName,policyDataString);
-
                }
 
                @Override
index d70332e..0b3e313 100644 (file)
@@ -95,10 +95,8 @@ public class ImportService {
                                        }
                                }else{ 
                                        InputStream inputStream = null;
-                                       FileOutputStream outputStream = null;
-                                       try {   
+                                       try(FileOutputStream outputStream = new FileOutputStream("ExtractDir" + File.separator + randomID+".zip")) {    
                                                inputStream = request.getInputStream();
-                                               outputStream = new FileOutputStream("ExtractDir" + File.separator + randomID+".zip"); 
                                                byte[] buffer = new byte[4096];
                                                int bytesRead = -1 ; 
                                                while ((bytesRead = inputStream.read(buffer)) != -1) { 
@@ -112,9 +110,6 @@ public class ImportService {
                                                        if(inputStream != null){
                                                                inputStream.close();
                                                        }
-                                                       if(outputStream != null){
-                                                               outputStream.close();
-                                                       }
                                                } catch (IOException e) {
                                                        PolicyLogger.error("Exception Occured while closing the input/output stream"+e);
                                                }
index 4432673..5ddb623 100644 (file)
@@ -144,7 +144,7 @@ public class ParseLog {
                                                        try (Stream<String> lines = Files.lines(debugfilePath, Charset.defaultCharset()).onClose(() -> log4jlogger.info("Last-"+dataFileName+"-line-Read:" + debuglastNumberRead)).skip(debuglastNumberRead)) {
                                                                
                                                                lines.forEachOrdered(line -> process(line, type, LOGTYPE.DEBUG));
-
+                                                               lines.close();
                                                        } catch (IOException e) {
                                                                logger.error("Error processing line in " + dataFileName + ":" + e);
                                                                logger.error("break the loop.");
@@ -210,7 +210,7 @@ public class ParseLog {
                                                        try (Stream<String> lines = Files.lines(errorfilePath, Charset.defaultCharset()).onClose(() -> log4jlogger.info("Last-"+dataFileName+"-line-Read:" + errorlastNumberRead)).skip(errorlastNumberRead)) {
                                                                
                                                                lines.forEachOrdered(line -> process(line, type, LOGTYPE.ERROR));
-                               
+                                                               lines.close();
                                                        } catch (IOException e) {
                                                                logger.error("Error processing line in " + dataFileName + ":" + e);
                                                                logger.error("break the loop.");
@@ -274,7 +274,7 @@ public class ParseLog {
                                                        try (Stream<String> lines = Files.lines(filePath, Charset.defaultCharset()).onClose(() -> log4jlogger.info("Last-"+dataFileName+"-line-Read:" + lastNumberRead)).skip(lastNumberRead)) {
                                                                
                                                                lines.forEachOrdered(line -> process(line, type, LOGTYPE.INFO));
-                               
+                                                               lines.close();
                                                        } catch (IOException e) {
                                                                logger.error("Error processing line in " + dataFileName + ":" + e);
                                                                logger.error("break the loop.");
index 657abad..d81fa15 100644 (file)
 * ============LICENSE_END=========================================================
 */
 use ecomp_sdk;
-ALTER TABLE fwtagpicker drop networkRole;
\ No newline at end of file
+ALTER TABLE fwtagpicker drop networkRole;
+alter table microservicemodels drop column enumValues, drop column annotation; 
+drop table if exists FWTag; 
+drop table if exists FWTagPicker; 
+drop table if exists brmsdependency;
+drop table if exists brmscontroller;
+drop table if exists microserviceattribute; 
\ No newline at end of file
index 7d990b4..45b4361 100644 (file)
@@ -21,3 +21,70 @@ use ecomp_sdk;
 ALTER TABLE fwtagpicker add networkRole varchar(64);
 
 INSERT INTO policyeditorscopes (`id`, `scopename`, `created_date`, `created_by`, `modified_date`, `modified_by`) VALUES ('1', 'com', '2017-06-01 11:45:36', 'demo', '2017-06-01 11:45:36', 'demo');
+
+alter table IntegrityAuditEntity modify jdbcUrl varchar(200) not null; 
+
+alter table `ecomp_sdk`.`microservicemodels` 
+add column `enumValues` longtext null default null after `version`, 
+add column `annotation` longtext null after `enumValues`;
+
+drop table if exists FWTag; 
+CREATE TABLE FWTag(
+Id int NOT NULL AUTO_INCREMENT,
+tagName VARCHAR(45) NOT NULL,
+description VARCHAR(1024),
+tagValues VARCHAR(1024) NOT NULL,
+CREATED_DATE TIMESTAMP NOT NULL default current_timestamp,
+CREATED_BY VARCHAR(45) NOT NULL,
+MODIFIED_DATE TIMESTAMP NOT NULL,
+MODIFIED_BY VARCHAR(45) NOT NULL,
+PRIMARY KEY(ID)
+);
+
+drop table if exists FWTagPicker; 
+CREATE TABLE FWTagPicker(
+ID INT NOT NULL AUTO_INCREMENT,
+tagPickerName VARCHAR(45) NOT NULL,
+DESCRIPTION VARCHAR(1024),
+tags VARCHAR(1024) NOT NULL,
+CREATED_DATE TIMESTAMP NOT NULL default current_timestamp,
+CREATED_BY VARCHAR(45) NOT NULL,
+MODIFIED_DATE TIMESTAMP NOT NULL,
+MODIFIED_BY VARCHAR(45) NOT NULL,
+PRIMARY KEY(ID)
+);
+
+drop table if exists brmsdependency;
+CREATE TABLE brmsdependency (
+id int not null auto_increment,
+dependency_name varchar(1024) not null,
+description varchar(1024),
+created_by varchar(45) not null,
+created_date timestamp not null default current_timestamp,
+modified_by varchar(45),
+modified_date timestamp,
+dependency longtext not null,
+primary key(id)
+);
+
+drop table if exists brmscontroller;
+CREATE TABLE brmscontroller (
+id int not null auto_increment,
+controller_name varchar(1024) not null,
+description varchar(1024),
+created_by varchar(45) not null,
+created_date timestamp not null default current_timestamp,
+modified_by varchar(45),
+modified_date timestamp,
+controller longtext not null,
+primary key(id)
+);
+
+drop table if exists microserviceattribute; 
+CREATE TABLE microserviceattribute(
+ID INT NOT NULL AUTO_INCREMENT,
+name VARCHAR(255) NOT NULL,
+value VARCHAR(1024),
+modelName VARCHAR(1024) NOT NULL,
+PRIMARY KEY(ID)
+);
\ No newline at end of file
index 141ac47..33c0c4a 100644 (file)
@@ -4,33 +4,33 @@
     <Target>
         <AnyOf>
             <AllOf>
-                <Match MatchId="com.att.labs.ecomp.function.regex-match">
+                <Match MatchId="org.openecomp.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="PolicyName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
             </AllOf>
             <AllOf>
-                <Match MatchId="com.att.labs.ecomp.function.regex-match">
+                <Match MatchId="org.openecomp.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DROOLS</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="com.att.labs.ecomp.function.regex-match">
+                <Match MatchId="org.openecomp.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">BRMS_PARAM_RULE</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ConfigName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="com.att.labs.ecomp.function.regex-match">
+                <Match MatchId="org.openecomp.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleRiskType</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskType" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="com.att.labs.ecomp.function.regex-match">
+                <Match MatchId="org.openecomp.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskLevel" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="com.att.labs.ecomp.function.regex-match">
+                <Match MatchId="org.openecomp.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">False</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="guard" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="com.att.labs.ecomp.function.regex-match">
+                <Match MatchId="org.openecomp.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">NA</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="TTLDate" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
index 28975e7..2901462 100644 (file)
@@ -4,33 +4,33 @@
     <Target>
         <AnyOf>
             <AllOf>
-                <Match MatchId="com.att.labs.ecomp.function.regex-match">
+                <Match MatchId="org.openecomp.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="PolicyName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
             </AllOf>
             <AllOf>
-                <Match MatchId="com.att.labs.ecomp.function.regex-match">
+                <Match MatchId="org.openecomp.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DROOLS</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="com.att.labs.ecomp.function.regex-match">
+                <Match MatchId="org.openecomp.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">BRMS_PARAM_RULE</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ConfigName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="com.att.labs.ecomp.function.regex-match">
+                <Match MatchId="org.openecomp.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleRiskType</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskType" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="com.att.labs.ecomp.function.regex-match">
+                <Match MatchId="org.openecomp.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskLevel" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="com.att.labs.ecomp.function.regex-match">
+                <Match MatchId="org.openecomp.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">False</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="guard" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="com.att.labs.ecomp.function.regex-match">
+                <Match MatchId="org.openecomp.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">NA</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="TTLDate" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
index 19d8c17..a18b59f 100644 (file)
@@ -4,45 +4,45 @@
     <Target>
         <AnyOf>
             <AllOf>
-                <Match MatchId="com.att.labs.ecomp.function.regex-match">
+                <Match MatchId="org.openecomp.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">com.Config_MS_vFirewall.1.xml</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="PolicyName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
             </AllOf>
             <AllOf>
-                <Match MatchId="com.att.labs.ecomp.function.regex-match">
+                <Match MatchId="org.openecomp.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DCAE</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="com.att.labs.ecomp.function.regex-match">
+                <Match MatchId="org.openecomp.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleConfigName</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ConfigName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="com.att.labs.ecomp.function.regex-match">
+                <Match MatchId="org.openecomp.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">TcaMetrics-v1.0.0.5</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="service" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="com.att.labs.ecomp.function.regex-match">
+                <Match MatchId="org.openecomp.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">/services/cdap-tca-hi-lo/instances/demo/configuration/metricsPerFunctionalRole/vFirewall</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="uuid" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="com.att.labs.ecomp.function.regex-match">
+                <Match MatchId="org.openecomp.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleServiceLocation</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="location" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="com.att.labs.ecomp.function.regex-match">
+                <Match MatchId="org.openecomp.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleRiskType</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskType" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="com.att.labs.ecomp.function.regex-match">
+                <Match MatchId="org.openecomp.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskLevel" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="com.att.labs.ecomp.function.regex-match">
+                <Match MatchId="org.openecomp.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">False</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="guard" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="com.att.labs.ecomp.function.regex-match">
+                <Match MatchId="org.openecomp.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">NA</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="TTLDate" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
index 740cd05..03ae3e8 100644 (file)
@@ -4,45 +4,45 @@
     <Target>
         <AnyOf>
             <AllOf>
-                <Match MatchId="com.att.labs.ecomp.function.regex-match">
+                <Match MatchId="org.openecomp.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">com.Config_MS_vLoadBalancer.1.xml</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="PolicyName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
             </AllOf>
             <AllOf>
-                <Match MatchId="com.att.labs.ecomp.function.regex-match">
+                <Match MatchId="org.openecomp.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">DCAE</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ECOMPName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="com.att.labs.ecomp.function.regex-match">
+                <Match MatchId="org.openecomp.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleConfigName</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:1.0:subject-category:access-subject" AttributeId="ConfigName" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="com.att.labs.ecomp.function.regex-match">
+                <Match MatchId="org.openecomp.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">TcaMetrics-v1.0.0.5</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="service" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="com.att.labs.ecomp.function.regex-match">
+                <Match MatchId="org.openecomp.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">/services/cdap-tca-hi-lo/instances/demo/configuration/metricsPerFunctionalRole/vLoadBalancer</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="uuid" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="com.att.labs.ecomp.function.regex-match">
+                <Match MatchId="org.openecomp.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleServiceLocation</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="location" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="com.att.labs.ecomp.function.regex-match">
+                <Match MatchId="org.openecomp.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">SampleRiskType</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskType" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="com.att.labs.ecomp.function.regex-match">
+                <Match MatchId="org.openecomp.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">1</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="RiskLevel" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="com.att.labs.ecomp.function.regex-match">
+                <Match MatchId="org.openecomp.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">False</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="guard" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>
-                <Match MatchId="com.att.labs.ecomp.function.regex-match">
+                <Match MatchId="org.openecomp.function.regex-match">
                     <AttributeValue DataType="http://www.w3.org/2001/XMLSchema#string">NA</AttributeValue>
                     <AttributeDesignator Category="urn:oasis:names:tc:xacml:3.0:attribute-category:resource" AttributeId="TTLDate" DataType="http://www.w3.org/2001/XMLSchema#string" MustBePresent="false"/>
                 </Match>