aboutsummaryrefslogtreecommitdiffstats
path: root/common/src/main/resources
diff options
context:
space:
mode:
authorArthur Martella <amartell@research.att.com>2017-09-08 13:27:46 -0400
committerArthur Martella <amartell@research.att.com>2017-09-08 13:32:24 -0400
commit62cd6aaaf74aa91ee0037c0e155c8e7284f07567 (patch)
tree68c0c53c9156f5aa3c6b3599ac940770f986633d /common/src/main/resources
parentfa1a211d28a912892fcd888569df033900eb01ee (diff)
1710 Rebase - Second Attempt
This commit rebases changes from openecomp-mso/internal-staging-1710 up to and including this codecloud commit: 54483fc6606ddb1591a2e9da61bff8712325f924 Wed Sep 6 18:12:56 2017 -0400 Rebasing was done on a branch on top of this commit in so/master in ONAP: 93fbdfbe46104f8859d4754040f979cb7997c157 Thu Sep 7 16:42:59 2017 +0000 Change-Id: I4ad9abf40da32bf5bdca43e868b8fa2dbcd9dc59 Issue-id: SO-107 Signed-off-by: Arthur Martella <amartell@research.att.com>
Diffstat (limited to 'common/src/main/resources')
-rw-r--r--common/src/main/resources/BPMN.properties6
-rw-r--r--common/src/main/resources/Policy.properties6
2 files changed, 9 insertions, 3 deletions
diff --git a/common/src/main/resources/BPMN.properties b/common/src/main/resources/BPMN.properties
index 298268bb92..9e8a7e7189 100644
--- a/common/src/main/resources/BPMN.properties
+++ b/common/src/main/resources/BPMN.properties
@@ -87,8 +87,8 @@ BPMN_GENERAL_EXCEPTION=\
Exception encountered|\
Please check other logs for more information|\
Exception encountered
-BPMN_SDNC_CALLBACK_EXCEPTION=\
+BPMN_CALLBACK_EXCEPTION=\
MSO-BPEL-9102E|\
- {0} Exception occurred during processing of MSO sdncAdapterCallbackService {1}|\
+ {0} Exception occurred processing callback to BPMN process {1}|\
Please check other logs for more information|\
- Exception occurred during processing of MSO sdncAdapterCallbackService
+ Exception occurred processing callback to BPMN process
diff --git a/common/src/main/resources/Policy.properties b/common/src/main/resources/Policy.properties
new file mode 100644
index 0000000000..383aa181bb
--- /dev/null
+++ b/common/src/main/resources/Policy.properties
@@ -0,0 +1,6 @@
+HOST = https://mtanjvsgcvm02.nvp.cip.att.com:8081/pdp/api/getDecision
+CLIENT_AUTH = Basic bTAzNzQzOnBvbGljeVIwY2sk
+AUTHORIZATION = Basic dGVzdHBkcDphbHBoYTEyMw==
+ENVIRONMENT = TEST
+X_ECOMP_REQUESTID = 1234567h
+ECOMP_COMPONENT_NAME = MSO \ No newline at end of file