diff options
Diffstat (limited to 'packages')
-rwxr-xr-x | packages/base/pom.xml | 7 | ||||
-rw-r--r-- | packages/base/src/files/install/mysql/data/181030_downgrade_script.sql | 21 | ||||
-rw-r--r-- | packages/base/src/files/install/mysql/data/181030_upgrade_script.sql | 21 | ||||
-rw-r--r-- | packages/base/src/files/install/servers/pdp/bin/xacml.pdp.properties | 3 | ||||
-rw-r--r-- | packages/docker/pom.xml | 5 | ||||
-rw-r--r-- | packages/install/pom.xml | 5 | ||||
-rw-r--r-- | packages/pom.xml | 5 |
7 files changed, 54 insertions, 13 deletions
diff --git a/packages/base/pom.xml b/packages/base/pom.xml index fb95511d1..f5b936b44 100755 --- a/packages/base/pom.xml +++ b/packages/base/pom.xml @@ -18,15 +18,14 @@ ============LICENSE_END========================================================= --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.policy.engine</groupId> <artifactId>packages</artifactId> - <version>1.3.1-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </parent> <artifactId>base</artifactId> @@ -221,7 +220,7 @@ <executable>/bin/bash</executable> <arguments> <argument>-c</argument> - <argument>mkdir -p target ; echo -e 'version="${project.version}"\ndescription="Open ONAP Policy Engine"\nbuildTag="'"${BUILD_TAG}"'"\ncommit="'"${GIT_COMMIT}"'"\ntimestamp="${maven.build.timestamp}"' >target/build.info</argument> + <argument>mkdir -p target ; echo -e 'version="${project.version}"\ndescription="Open ONAP Policy Engine"\nbuildTag="'"${BUILD_TAG}"'"\ncommit="'"${GIT_COMMIT}"'"\ntimestamp="${maven.build.timestamp}"' >target/build.info</argument> </arguments> </configuration> </execution> diff --git a/packages/base/src/files/install/mysql/data/181030_downgrade_script.sql b/packages/base/src/files/install/mysql/data/181030_downgrade_script.sql new file mode 100644 index 000000000..678486779 --- /dev/null +++ b/packages/base/src/files/install/mysql/data/181030_downgrade_script.sql @@ -0,0 +1,21 @@ +-- ============LICENSE_START======================================================= +-- ONAP Policy Engine +-- ================================================================================ +-- Copyright (C) 2018 Intel. 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. +-- You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. +-- ============LICENSE_END========================================================= + +use onap_sdk; +delete from optimizationmodels where version='1.0' and modelname='hpaPolicy'; + diff --git a/packages/base/src/files/install/mysql/data/181030_upgrade_script.sql b/packages/base/src/files/install/mysql/data/181030_upgrade_script.sql new file mode 100644 index 000000000..4c31c293b --- /dev/null +++ b/packages/base/src/files/install/mysql/data/181030_upgrade_script.sql @@ -0,0 +1,21 @@ +-- ============LICENSE_START======================================================= +-- ONAP Policy Engine +-- ================================================================================ +-- Copyright (C) 2018 Intel. 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. +-- You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. +-- ============LICENSE_END========================================================= + +use onap_sdk; + +INSERT INTO `onap_sdk`.`optimizationmodels` (`modelname`, `description`, `dependency`, `imported_by`, `attributes`, `ref_attributes`, `sub_attributes`, `version`, `annotation`, `enumValues`, `dataOrderInfo`) VALUES ('hpaPolicy', 'HPA Tests Model', '[]', 'demo', 'identity=string:defaultValue-null:required-true:MANY-false,resources=string:defaultValue-null:required-true:MANY-false', 'policyScope=MANY-true,policyType=POLICYTYPE1:MANY-false,flavorFeatures=flavorFeatures-properties:MANY-true', '{\"flavorProperties-properties\":{\"hpa-feature-attributes\":\"hpa-feature-attributes-properties:required-false:MANY-true\",\"mandatory\":\"string:defaultValue-null:required-true:MANY-false\",\"hpa-feature\":\"string:defaultValue-null:required-true:MANY-false\",\"hpa-version\":\"string:defaultValue-null:required-true:MANY-false\",\"architecture\":\"string:defaultValue-null:required-true:MANY-false\",\"directives\":\"directives-properties:required-false:MANY-true\"},\"directives-properties\":{\"type\":\"string:defaultValue-flavor_directives:required-false:MANY-false\",\"attributes\":\"directives-attributes-properties:MANY-false\"},\"directives-attributes-properties\":{\"attribute_name":\"MANY-false\",\"attribute_value\":\"MANY-false\"},\"flavorFeatures-properties\":{\"flavorProperties\":\"flavorProperties-properties:required-false:MANY-true\",\"id\":\"string:defaultValue-null:required-true:MANY-false\",\"type\":\"string:defaultValue-tosca.nodes.nfv.Vdu.Compute:required-true:MANY-false\"},\"hpa-feature-attributes-properties\":{\"unit\":\"string:defaultValue-null:required-false:MANY-false\",\"hpa-attribute-key\":\"string:defaultValue-null:required-false:MANY-false\",\"hpa-attribute-value\":\"string:defaultValue-null:required-true:MANY-false\",\"operator\":\"OPERATOR:required-false:MANY-false\"}}\n', '1.0', 'policyScope=matching-true', 'OPERATOR=[<,<equal-sign,>,>equal-sign,equal-sign,!equal-sign,any,all,subset,], POLICYTYPE1=[hpaPolicy]', '\"[resources,identity,policyScope,policyType,flavorFeatures,id,type,flavorProperties,hpa-feature,mandatory,architecture,hpa-version,directives,type,attributes,attribute_name,attribute_value,hpa-feature-attributes,hpa-attribute-key,operator,unit,hpa-attribute-value]\"'); diff --git a/packages/base/src/files/install/servers/pdp/bin/xacml.pdp.properties b/packages/base/src/files/install/servers/pdp/bin/xacml.pdp.properties index ad27cd09e..315fb4d67 100644 --- a/packages/base/src/files/install/servers/pdp/bin/xacml.pdp.properties +++ b/packages/base/src/files/install/servers/pdp/bin/xacml.pdp.properties @@ -137,6 +137,7 @@ ENVIRONMENT=${{ENVIRONMENT}} xacml.rest.pep.idfile = client.properties #AAF cadi properties +enable_aaf=false policy.aaf.namespace = ${{AAF_NAMESPACE}} policy.aaf.root.permission=${{AAF_NAMESPACE}}.pdpx cm_url=https://${{AAF_HOST}}:8095/AAF_NS.cm:2.1 @@ -150,6 +151,8 @@ cadi_x509_issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_ cadi_keystore=${{POLICY_HOME}}/etc/ssl/policy-keystore cadi_keystore_password=${{KEYSTORE_PASSWD}} cadi_key_password=${{KEYSTORE_PASSWD}} +cadi_truststore=${{POLICY_HOME}}/etc/ssl/policy-truststore +cadi_truststore_password=${{TRUSTSTORE_PASSWD}} aaf_env=DEV aaf_url=https://${{AAF_HOST}}:8095/AAF_NS.service:2.1 aaf_fqdn=${{AAF_HOST}} diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml index 6d88647ef..04a65adcb 100644 --- a/packages/docker/pom.xml +++ b/packages/docker/pom.xml @@ -18,15 +18,14 @@ ============LICENSE_END========================================================= --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.policy.engine</groupId> <artifactId>packages</artifactId> - <version>1.3.1-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </parent> <artifactId>docker</artifactId> diff --git a/packages/install/pom.xml b/packages/install/pom.xml index 4c66e808e..72a978de9 100644 --- a/packages/install/pom.xml +++ b/packages/install/pom.xml @@ -18,15 +18,14 @@ ============LICENSE_END========================================================= --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.policy.engine</groupId> <artifactId>packages</artifactId> - <version>1.3.1-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </parent> <artifactId>install</artifactId> diff --git a/packages/pom.xml b/packages/pom.xml index faca69272..a1dc9854f 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -18,13 +18,12 @@ ============LICENSE_END========================================================= --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.policy.engine</groupId> <artifactId>PolicyEngineSuite</artifactId> - <version>1.3.1-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </parent> <artifactId>packages</artifactId> <packaging>pom</packaging> |