summaryrefslogtreecommitdiffstats
path: root/packages/base/src
diff options
context:
space:
mode:
Diffstat (limited to 'packages/base/src')
-rw-r--r--packages/base/src/files/install/mysql/data/170701_downgrade_script.sql8
-rw-r--r--packages/base/src/files/install/mysql/data/170701_upgrade_script.sql67
-rw-r--r--packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml14
-rw-r--r--packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml14
-rw-r--r--packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vFirewall.1.xml20
-rw-r--r--packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vLoadBalancer.1.xml20
6 files changed, 108 insertions, 35 deletions
diff --git a/packages/base/src/files/install/mysql/data/170701_downgrade_script.sql b/packages/base/src/files/install/mysql/data/170701_downgrade_script.sql
index 657abadcc..d81fa1535 100644
--- a/packages/base/src/files/install/mysql/data/170701_downgrade_script.sql
+++ b/packages/base/src/files/install/mysql/data/170701_downgrade_script.sql
@@ -18,4 +18,10 @@
* ============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
diff --git a/packages/base/src/files/install/mysql/data/170701_upgrade_script.sql b/packages/base/src/files/install/mysql/data/170701_upgrade_script.sql
index 7d990b42f..45b4361fe 100644
--- a/packages/base/src/files/install/mysql/data/170701_upgrade_script.sql
+++ b/packages/base/src/files/install/mysql/data/170701_upgrade_script.sql
@@ -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
diff --git a/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml b/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml
index 141ac47ff..33c0c4a8d 100644
--- a/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml
+++ b/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvFWDemoPolicy.1.xml
@@ -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>
diff --git a/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml b/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml
index 28975e794..290146240 100644
--- a/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml
+++ b/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_BRMS_Param_BRMSParamvLBDemoPolicy.1.xml
@@ -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>
diff --git a/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vFirewall.1.xml b/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vFirewall.1.xml
index 19d8c176d..a18b59f41 100644
--- a/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vFirewall.1.xml
+++ b/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vFirewall.1.xml
@@ -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>
diff --git a/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vLoadBalancer.1.xml b/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vLoadBalancer.1.xml
index 740cd05e5..03ae3e806 100644
--- a/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vLoadBalancer.1.xml
+++ b/packages/base/src/files/install/servers/pap/bin/pdps/default/com.Config_MS_vLoadBalancer.1.xml
@@ -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>