summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--compose/config/api/apiParameters.yaml3
-rw-r--r--compose/config/api/apiParametersPostgres.yaml3
-rw-r--r--compose/config/clamp/AcRuntimeParameters.yaml1
-rw-r--r--compose/config/pap/papParameters.yaml3
-rw-r--r--compose/config/pap/papParametersPostgres.yaml3
-rw-r--r--csit/resources/tests/api-test.robot4
-rw-r--r--csit/resources/tests/common-library.robot14
-rw-r--r--csit/resources/tests/drools-applications-test.robot6
-rw-r--r--csit/resources/tests/pap-test.robot2
-rw-r--r--csit/resources/tests/xacml-pdp-test.robot4
10 files changed, 15 insertions, 28 deletions
diff --git a/compose/config/api/apiParameters.yaml b/compose/config/api/apiParameters.yaml
index 5758068e..51e7f368 100644
--- a/compose/config/api/apiParameters.yaml
+++ b/compose/config/api/apiParameters.yaml
@@ -17,9 +17,6 @@ spring:
username: policy_user
password: policy_user
jpa:
- properties:
- hibernate:
- dialect: org.hibernate.dialect.MariaDB103Dialect
hibernate:
ddl-auto: none
naming:
diff --git a/compose/config/api/apiParametersPostgres.yaml b/compose/config/api/apiParametersPostgres.yaml
index 51635074..c0b23e94 100644
--- a/compose/config/api/apiParametersPostgres.yaml
+++ b/compose/config/api/apiParametersPostgres.yaml
@@ -17,9 +17,6 @@ spring:
username: policy_user
password: policy_user
jpa:
- properties:
- hibernate:
- dialect: org.hibernate.dialect.PostgreSQLDialect
hibernate:
ddl-auto: none
naming:
diff --git a/compose/config/clamp/AcRuntimeParameters.yaml b/compose/config/clamp/AcRuntimeParameters.yaml
index b800e4b0..262f10c6 100644
--- a/compose/config/clamp/AcRuntimeParameters.yaml
+++ b/compose/config/clamp/AcRuntimeParameters.yaml
@@ -24,7 +24,6 @@ spring:
implicit-strategy: org.onap.policy.common.spring.utils.CustomImplicitNamingStrategy
properties:
hibernate:
- dialect: org.hibernate.dialect.MariaDB103Dialect
format_sql: true
security:
diff --git a/compose/config/pap/papParameters.yaml b/compose/config/pap/papParameters.yaml
index 1f42a575..51aaec38 100644
--- a/compose/config/pap/papParameters.yaml
+++ b/compose/config/pap/papParameters.yaml
@@ -12,9 +12,6 @@ spring:
username: policy_user
password: policy_user
jpa:
- properties:
- hibernate:
- dialect: org.hibernate.dialect.MariaDB103Dialect
hibernate:
ddl-auto: none
naming:
diff --git a/compose/config/pap/papParametersPostgres.yaml b/compose/config/pap/papParametersPostgres.yaml
index 15e77f14..30ef7751 100644
--- a/compose/config/pap/papParametersPostgres.yaml
+++ b/compose/config/pap/papParametersPostgres.yaml
@@ -12,9 +12,6 @@ spring:
username: policy_user
password: policy_user
jpa:
- properties:
- hibernate:
- dialect: org.hibernate.dialect.PostgreSQLDialect
hibernate:
ddl-auto: none
naming:
diff --git a/csit/resources/tests/api-test.robot b/csit/resources/tests/api-test.robot
index 9bb2254e..bce58231 100644
--- a/csit/resources/tests/api-test.robot
+++ b/csit/resources/tests/api-test.robot
@@ -131,13 +131,13 @@ GetReq
[Arguments] ${url}
${auth}= PolicyAdminAuth
${resp}= PerformGetRequest ${POLICY_API_IP} ${url} 200 null ${auth}
- [return] ${resp}
+ RETURN ${resp}
DeleteReq
[Arguments] ${url} ${expectedstatus}
${auth}= PolicyAdminAuth
${resp}= PerformDeleteRequest ${POLICY_API_IP} ${url} ${expectedstatus} ${auth}
- [return] ${resp}
+ RETURN ${resp}
CreatePolicyType
[Arguments] ${url} ${expectedstatus} ${jsonfile} ${policytypename} ${policytypeversion}
diff --git a/csit/resources/tests/common-library.robot b/csit/resources/tests/common-library.robot
index bc140897..18bfab99 100644
--- a/csit/resources/tests/common-library.robot
+++ b/csit/resources/tests/common-library.robot
@@ -8,7 +8,7 @@ Library json
PolicyAdminAuth
${policyadmin}= Create list policyadmin zb!XztG34
- [return] ${policyadmin}
+ RETURN ${policyadmin}
PerformPostRequest
[Arguments] ${domain} ${url} ${expectedstatus} ${postjson} ${params} ${auth}
@@ -17,7 +17,7 @@ PerformPostRequest
${headers}= Create Dictionary Accept=application/json Content-Type=application/json
${resp}= POST On Session policy ${url} data=${postjson} params=${params} headers=${headers} expected_status=${expectedstatus}
Log Received response from policy ${resp.text}
- [return] ${resp}
+ RETURN ${resp}
PerformPutRequest
[Arguments] ${domain} ${url} ${expectedstatus} ${params} ${auth}
@@ -26,7 +26,7 @@ PerformPutRequest
${headers}= Create Dictionary Accept=application/json Content-Type=application/json
${resp}= PUT On Session policy ${url} params=${params} headers=${headers} expected_status=${expectedstatus}
Log Received response from policy ${resp.text}
- [return] ${resp}
+ RETURN ${resp}
PerformGetRequest
[Arguments] ${domain} ${url} ${expectedstatus} ${params} ${auth}
@@ -35,7 +35,7 @@ PerformGetRequest
${headers}= Create Dictionary Accept=application/json Content-Type=application/json
${resp}= GET On Session policy ${url} params=${params} headers=${headers} expected_status=${expectedstatus}
Log Received response from policy ${resp.text}
- [return] ${resp}
+ RETURN ${resp}
PerformDeleteRequest
[Arguments] ${domain} ${url} ${expectedstatus} ${auth}
@@ -113,7 +113,7 @@ GetMetrics
${session}= Create Session policy http://${domain} auth=${auth}
${resp}= GET On Session policy ${context_path}metrics expected_status=200
Log Received response from policy ${resp.text}
- [return] ${resp}
+ RETURN ${resp}
QueryPrometheus
[Arguments] ${query}
@@ -121,7 +121,7 @@ QueryPrometheus
${resp}= GET http://${PROMETHEUS_IP}/api/v1/query ${params}
Status Should Be OK
Log Received response from Prometheus ${resp.text}
- [return] ${resp.json()}
+ RETURN ${resp.json()}
ValidateResponseTime
[Arguments] ${job} ${uri} ${method} ${timeLimit}
@@ -135,7 +135,7 @@ CheckKafkaTopic
[Arguments] ${topic} ${expected_status}
${resp}= Run Process ${CURDIR}/kafka_consumer.py ${topic} 60 ${expected_status} ${KAFKA_IP}
Should Contain ${resp.stdout} ${expected_status}
- [Return] ${resp.stdout}
+ RETURN ${resp.stdout}
GetKafkaTopic
[Arguments] ${topic}
diff --git a/csit/resources/tests/drools-applications-test.robot b/csit/resources/tests/drools-applications-test.robot
index a43f1422..d9ade3b7 100644
--- a/csit/resources/tests/drools-applications-test.robot
+++ b/csit/resources/tests/drools-applications-test.robot
@@ -154,7 +154,7 @@ PeformGetRequest
${headers}= Create Dictionary Accept=application/json Content-Type=application/json
${resp}= GET On Session policy ${url} headers=${headers} expected_status=${expectedstatus}
Log Received response from policy ${resp.text}
- [return] ${resp}
+ RETURN ${resp}
PerformPostRequest
[Arguments] ${url} ${params} ${domain} ${jsonfile} ${filepath} ${contenttype} ${expectedstatus}
@@ -165,11 +165,11 @@ PerformPostRequest
${headers}= Create Dictionary Accept=application/${contenttype} Content-Type=application/${contenttype}
${resp}= POST On Session policy ${url} params=${params} data=${postjson} headers=${headers} expected_status=${expectedstatus}
Log Received response from policy ${resp.text}
- [return] ${resp}
+ RETURN ${resp}
OnSet
[Arguments] ${file}
${data}= Get File ${file}
${resp}= Run Process ${CURDIR}/kafka_producer.py unauthenticated.dcae_cl_output ${data} ${KAFKA_IP}
Log Response from kafka ${resp.stdout}
- [Return] ${resp.stdout}
+ RETURN ${resp.stdout}
diff --git a/csit/resources/tests/pap-test.robot b/csit/resources/tests/pap-test.robot
index 74d299a5..21a37d3b 100644
--- a/csit/resources/tests/pap-test.robot
+++ b/csit/resources/tests/pap-test.robot
@@ -10,7 +10,7 @@ GetReq
[Arguments] ${url}
${auth}= PolicyAdminAuth
${resp}= PerformGetRequest ${POLICY_PAP_IP} ${url} 200 null ${auth}
- [return] ${resp}
+ RETURN ${resp}
ValidateResponseTimeForPap
[Arguments] ${uri} ${method}
diff --git a/csit/resources/tests/xacml-pdp-test.robot b/csit/resources/tests/xacml-pdp-test.robot
index e500a04c..cddecab9 100644
--- a/csit/resources/tests/xacml-pdp-test.robot
+++ b/csit/resources/tests/xacml-pdp-test.robot
@@ -113,10 +113,10 @@ PdpxGetReq
[Arguments] ${url}
${hcauth}= PolicyAdminAuth
${resp}= PerformGetRequest ${POLICY_PDPX_IP} ${url} 200 null ${hcauth}
- [return] ${resp}
+ RETURN ${resp}
DecisionPostReq
[Arguments] ${postjson} ${abbr}
${hcauth}= PolicyAdminAuth
${resp}= PerformPostRequest ${POLICY_PDPX_IP} /policy/pdpx/v1/decision 200 ${postjson} ${abbr} ${hcauth}
- [return] ${resp}
+ RETURN ${resp}