aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/platform/deployPDPPAP.rst74
-rw-r--r--docs/platform/feature_healthcheck.rst4
-rw-r--r--packages/base/src/files/install/mysql/data/181030_upgrade_script.sql2
3 files changed, 57 insertions, 23 deletions
diff --git a/docs/platform/deployPDPPAP.rst b/docs/platform/deployPDPPAP.rst
index 2ca7b4989..487bf1d9e 100644
--- a/docs/platform/deployPDPPAP.rst
+++ b/docs/platform/deployPDPPAP.rst
@@ -2,9 +2,9 @@
.. This work is licensed under a Creative Commons Attribution 4.0 International License.
.. http://creativecommons.org/licenses/by/4.0
-********************************************
-Testing, Deploying and Debugging the PDP/PAP
-********************************************
+**********************************************
+Testing, Deploying and Debugging the PDP-X/PAP
+**********************************************
.. contents::
:depth: 3
@@ -27,7 +27,7 @@ Accessing and Starting PAP
.. code-block:: bash
- policy [--debug] status|start|stop
+ policy.sh [--debug] status|start|stop
- To get the current status of Policy use *policy.sh status*
@@ -60,55 +60,89 @@ Accessing and Starting PAP
Healthcheck
-----------
-- To perform Health check on policy components you can follow the generic procedure documented as below.
+- The Healthcheck feature resides in the PDP-D that proxies for PAP, PDP-X, etc. To perform the Healthcheck on policy components you can follow the generic procedure documented as below, these commands must be executed within the PDP-D container.
.. code-block:: bash
# Assuming the healthcheck service credentials have not been changed
# post-installation within the drools container
- source /opt/policy/config/drools/feature-healthcheck.conf
+ source /opt/app/policy/config/feature-healthcheck.conf.environment
- curl --silent --user "${HEALTHCHECK_USER}:${HEALTHCHECK_PASSWORD}"
- -X GET http://localhost:6969/healthcheck | python -m json.tool
+ curl -k --silent --user "${HEALTHCHECK_USER}:${HEALTHCHECK_PASSWORD}"
+ -X GET https://localhost:6969/healthcheck | python -m json.tool
- Additional information can be found in the documentation for Testing, Deploying, and debugging on a PDP-D Healthcheck.
Logs
----
-- Logs for PAP are located at *$POLICY_HOME/servers/pap/logs/* location. The main application logs can be found at *$POLICY_HOME/servers/pap/logs/Policy/ONAP-PAP-REST* location.
+- The main application logs for PAP are located at */var/log/onap/policy/pap/* location. The catalina.out can be found at *$POLICY_HOME/servers/pap/logs/* location.
* Policy PAP uses EELF logging framework for logging and if needed to be modified can be modified at *$POLICY_HOME/servers/pap/webapps/pap/WEB-INF/classes/logback.xml*. This change needs a restart of the PAP component in order to be in effect.
-- The Logs are divided into separate files and debug logs can be found in *debug.log* and error logs in *error.log* file which are two different files under application logs directory.
+- The logs are divided into separate files and debug logs can be found in *debug.log* and error logs in *error.log* file which are two different files under application logs directory.
-PDP (Policy Decision Point)
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
+PDP-X (XACML Policy Decision Point)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Accessing and Starting PDP
--------------------------
-- To access the PDP docker :
+- To access the PDP-X docker :
.. code-block:: bash
docker exec -it -u 0 pdp su - policy
-- To start and stop the PDP components the same procedure can be followed as documented for PAP.
+- To start and stop the PDP-X components the same procedure can be followed as documented for PAP.
.. code-block:: bash
- policy [--debug] status|start|stop
+ policy.sh [--debug] status|start|stop
-Healthcheck / Testing
----------------------
-- The Policy PDP health check can be checked using the generic procedure documented above for PAP which applies to all policy components.
+Swagger UI Testing (Only for HEAT installations)
+------------------------------------------------
-- Apart from the above check PDP also provides the swagger UI from which PDP REST APIs which can be tested and used, this also lets us know the PDP Status. In order to access PDP's swagger UI visit ``http://{PDP_URL}:8081/pdp/swagger-ui.html.``
+- The PDP-X provides the swagger UI from which PDP-X REST APIs can be tested and used, this also lets us know the PDP Status.
+- In order to access PDP's swagger UI visit ``https://{PDP_URL}:8081/pdp/swagger-ui.html.``
+- NOTE: This feature is only available for HEAT installation as it is disabled in OOM installations.
-- In order to test the Policy components, the swagger UI provided by PDP can be used to test PDP and PAP.
+Logs
+----
+
+- The main application logs for PDP are located at */var/log/onap/policy/pdpx/* location. The catalina.out can be found at *$POLICY_HOME/servers/pdp/logs/* location.
+
+* Policy PDP uses EELF logging framework for logging and if needed to be modified can be modified at *$POLICY_HOME/servers/pap/webapps/pdp/WEB-INF/classes/logback.xml*. This change needs a restart of the PDP component in order to be in effect.
+
+- The logs are divided into separate files and debug logs can be found in *debug.log* and error logs in *error.log* file which are two different files under application logs directory.
+
+
+BRMSGW (Business Rule Management System Gateway)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Accessing and Starting BRMSGW
+-----------------------------
+
+- To access the BRMSGW docker :
+
+ .. code-block:: bash
+
+ docker exec -it -u 0 brmsgw su - policy
+
+- To start and stop the BRMSGW components the same procedure can be followed as documented for PAP and PDP-X.
+
+ .. code-block:: bash
+
+ policy.sh [--debug] status|start|stop
+
+Logs
+----
+
+- The main application logs for BRMSGW are located at */var/log/onap/policy/policyapi/* location. The logs are divided into separate files; debug logs can be found in *debug.log* and error logs in *error.log* file which are two different files under application logs directory.
+
+* The brmsgw.log can be found at */var/log/onap/policy/brmsgw* location.
End of Document
diff --git a/docs/platform/feature_healthcheck.rst b/docs/platform/feature_healthcheck.rst
index d66a514d7..a0793e92b 100644
--- a/docs/platform/feature_healthcheck.rst
+++ b/docs/platform/feature_healthcheck.rst
@@ -108,8 +108,8 @@ The Healthcheck can also be invoked manually as follows:
# Assuming the healthcheck service credentials have not been changed
# post-installation within the drools container
- source /opt/policy/config/drools/feature-healthcheck.conf
- curl --silent --user "${HEALTHCHECK_USER}:${HEALTHCHECK_PASSWORD}" -X GET http://localhost:6969/healthcheck | python -m json.tool
+ source /opt/app/policy/config/feature-healthcheck.conf.environment
+ curl -k --silent --user "${HEALTHCHECK_USER}:${HEALTHCHECK_PASSWORD}" -X GET https://localhost:6969/healthcheck | python -m json.tool
End of Document
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
index 4c31c293b..ea6f1428d 100644
--- a/packages/base/src/files/install/mysql/data/181030_upgrade_script.sql
+++ b/packages/base/src/files/install/mysql/data/181030_upgrade_script.sql
@@ -18,4 +18,4 @@
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]\"');
+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:description-null', 'policyScope=MANY-true,policyType=POLICYTYPE:MANY-false,resources=MANY-true,flavorFeatures=flavorFeatures_properties:MANY-true:description-null', '{"directives_properties":{"attributes":"directives_attributes_properties:required-false:MANY-true:description-null","type":"string:defaultValue-null:required-false:MANY-false:description-null"},"directives_attributes_properties":{"attribute_name":"string:defaultValue-null:required-false:MANY-false:description-null","attribute_value":"string:defaultValue-null:required-false:MANY-false:description-null"},"flavorProperties_properties":{"score":"string:defaultValue-null:required-false:MANY-false:description-null","hpa-feature-attributes":"hpa-feature-attributes_properties:required-true:MANY-true:description-null","directives":"directives_properties:required-true:MANY-true:description-null","hpa-version":"string:defaultValue-null:required-true:MANY-false:description-null","hpa-feature":"string:defaultValue-null:required-true:MANY-false:description-null","mandatory":"string:defaultValue-null:required-true:MANY-false:description-null","architecture":"string:defaultValue-null:required-true:MANY-false:description-null"},"flavorFeatures_properties":{"directives":"directives_properties:required-true:MANY-true:description-null","flavorProperties":"flavorProperties_properties:required-true:MANY-true:description-null","id":"string:defaultValue-null:required-true:MANY-false:description-null","type":"string:defaultValue-null:required-true:MANY-false:description-null"},"hpa-feature-attributes_properties":{"unit":"string:defaultValue-null:required-false:MANY-false:description-null","hpa-attribute-value":"string:defaultValue-null:required-true:MANY-false:description-null","hpa-attribute-key":"string:defaultValue-null:required-true:MANY-false:description-null","operator":"OPERATOR:defaultValue-null:required-false:MANY-false:description-null"}}', '1.0', 'policyScope=matching-true, policyType=matching-true', 'OPERATOR=[<,<equal-sign,>,>equal-sign,equal-sign,!equal-sign,any,all,subset,], POLICYTYPE=[hpa,]', '""');