Convert CSIT tests to use HTTP rather than HTTPS
This commit converts the CSITs from HTTPS to HTTP. It also does some
refactoring and didying up on the CSIT environment.
Issue-ID: POLICY-4338
Change-Id: Ie19908a8d2a457df3ae5f4e490d5528889f395c8
Signed-off-by: liamfallon <liam.fallon@est.tech>
diff --git a/csit/apex-pdp/tests/apex-pdp-test.robot b/csit/apex-pdp/tests/apex-pdp-test.robot
index b0e4c72..7739327 100644
--- a/csit/apex-pdp/tests/apex-pdp-test.robot
+++ b/csit/apex-pdp/tests/apex-pdp-test.robot
@@ -100,7 +100,7 @@
TriggerAndVerifyTestPnfPolicy
[Documentation] Send TestPnf policy trigger event to DMaaP and read notifications to verify policy execution
- Create Session apexSession https://${DMAAP_IP}:3905 max_retries=1
+ Create Session apexSession http://${DMAAP_IP}:3904 max_retries=1
${data}= Get Binary File ${CURDIR}/data/VesEventForPnfPolicy.json
&{headers}= Create Dictionary Content-Type=application/json Accept=application/json
${resp}= POST On Session apexSession /events/unauthenticated.DCAE_CL_OUTPUT data=${data} headers=${headers}
@@ -111,7 +111,7 @@
TriggerAndVerifyTestVnfPolicy
[Documentation] Send TestVnf policy trigger event to DMaaP and read notifications to verify policy execution
- Create Session apexSession https://${DMAAP_IP}:3905 max_retries=1
+ Create Session apexSession http://${DMAAP_IP}:3904 max_retries=1
${data}= Get Binary File ${CURDIR}/data/VesEventForVnfPolicy.json
&{headers}= Create Dictionary Content-Type=application/json Accept=application/json
${resp}= POST On Session apexSession /events/unauthenticated.DCAE_POLICY_EXAMPLE_OUTPUT data=${data} headers=${headers}
diff --git a/csit/apex-pdp/tests/data/onap.policies.apex.pnf.Test.json b/csit/apex-pdp/tests/data/onap.policies.apex.pnf.Test.json
index 5d9cbf9..0552293 100644
--- a/csit/apex-pdp/tests/data/onap.policies.apex.pnf.Test.json
+++ b/csit/apex-pdp/tests/data/onap.policies.apex.pnf.Test.json
@@ -32,7 +32,7 @@
"taskParameters": [
{
"key": "logUrl",
- "value": "https://message-router:3905/events/APEX-CL-MGT"
+ "value": "http://message-router:3904/events/APEX-CL-MGT"
}
]
},
@@ -2778,7 +2778,7 @@
"carrierTechnology": "RESTCLIENT",
"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters",
"parameters": {
- "url": "https://message-router:3905/events/unauthenticated.DCAE_CL_OUTPUT/cl/apex?timeout=30000"
+ "url": "http://message-router:3904/events/unauthenticated.DCAE_CL_OUTPUT/cl/apex?timeout=30000"
}
},
"eventProtocolParameters": {
@@ -2791,7 +2791,7 @@
"carrierTechnology": "RESTREQUESTOR",
"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters",
"parameters": {
- "url": "https://aai-sim:6666/aai/v16/network/pnfs/pnf/{pnfName}",
+ "url": "http://aai-sim:6666/aai/v16/network/pnfs/pnf/{pnfName}",
"httpMethod": "GET",
"httpCodeFilter": "[2-5][0-1][0-9]",
"httpHeaders": [
@@ -2879,7 +2879,7 @@
"carrierTechnology": "RESTCLIENT",
"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters",
"parameters": {
- "url": "https://message-router:3905/events/APEX-CL-MGT"
+ "url": "http://message-router:3904/events/APEX-CL-MGT"
}
},
"eventProtocolParameters": {
diff --git a/csit/apex-pdp/tests/data/onap.policies.apex.pnf.metadataSet.Test.json b/csit/apex-pdp/tests/data/onap.policies.apex.pnf.metadataSet.Test.json
index 767adf1..20338ff 100644
--- a/csit/apex-pdp/tests/data/onap.policies.apex.pnf.metadataSet.Test.json
+++ b/csit/apex-pdp/tests/data/onap.policies.apex.pnf.metadataSet.Test.json
@@ -36,7 +36,7 @@
"taskParameters": [
{
"key": "logUrl",
- "value": "https://message-router:3905/events/APEX-CL-MGT2"
+ "value": "http://message-router:3904/events/APEX-CL-MGT2"
}
]
}
@@ -47,7 +47,7 @@
"carrierTechnology": "RESTCLIENT",
"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters",
"parameters": {
- "url": "https://message-router:3905/events/unauthenticated.DCAE_CL_OUTPUT/cl/apex?timeout=30000"
+ "url": "http://message-router:3904/events/unauthenticated.DCAE_CL_OUTPUT/cl/apex?timeout=30000"
}
},
"eventProtocolParameters": {
@@ -60,7 +60,7 @@
"carrierTechnology": "RESTREQUESTOR",
"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters",
"parameters": {
- "url": "https://aai-sim:6666/aai/v16/network/pnfs/pnf/{pnfName}",
+ "url": "http://aai-sim:6666/aai/v16/network/pnfs/pnf/{pnfName}",
"httpMethod": "GET",
"httpCodeFilter": "[2-5][0-1][0-9]",
"httpHeaders": [
@@ -148,7 +148,7 @@
"carrierTechnology": "RESTCLIENT",
"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters",
"parameters": {
- "url": "https://message-router:3905/events/APEX-CL-MGT2"
+ "url": "http://message-router:3904/events/APEX-CL-MGT2"
}
},
"eventProtocolParameters": {
diff --git a/csit/apex-pdp/tests/data/onap.policies.apex.vnf.Test.json b/csit/apex-pdp/tests/data/onap.policies.apex.vnf.Test.json
index d000de7..7886f84 100644
--- a/csit/apex-pdp/tests/data/onap.policies.apex.vnf.Test.json
+++ b/csit/apex-pdp/tests/data/onap.policies.apex.vnf.Test.json
@@ -32,7 +32,7 @@
"taskParameters": [
{
"key": "logUrl",
- "value": "https://message-router:3905/events/APEX-CL-MGT"
+ "value": "http://message-router:3904/events/APEX-CL-MGT"
}
]
},
@@ -3060,7 +3060,7 @@
"carrierTechnology": "RESTCLIENT",
"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters",
"parameters": {
- "url": "https://message-router:3905/events/unauthenticated.DCAE_POLICY_EXAMPLE_OUTPUT/ApexExampleCG1/1?timeout=30000"
+ "url": "http://message-router:3904/events/unauthenticated.DCAE_POLICY_EXAMPLE_OUTPUT/ApexExampleCG1/1?timeout=30000"
}
},
"eventProtocolParameters": {
@@ -3073,7 +3073,7 @@
"carrierTechnology": "RESTREQUESTOR",
"parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters",
"parameters": {
- "url": "https://aai-sim:6666/aai/v16/network/generic-vnfs/generic-vnf?vnf-name={vnf-name}",
+ "url": "http://aai-sim:6666/aai/v16/network/generic-vnfs/generic-vnf?vnf-name={vnf-name}",
"httpMethod": "GET",
"httpCodeFilter": "[245][0-9][0-9]",
"httpHeaders": [
diff --git a/csit/clamp/tests/policy-clamp-test.robot b/csit/clamp/tests/policy-clamp-test.robot
index fe24133..f819d2d 100644
--- a/csit/clamp/tests/policy-clamp-test.robot
+++ b/csit/clamp/tests/policy-clamp-test.robot
@@ -9,9 +9,9 @@
CommissionAutomationCompositionV1
[Documentation] Commission automation composition.
${auth}= Create List runtimeUser zb!XztG34
- Log Creating session https://${POLICY_RUNTIME_ACM_IP}:6969
+ Log Creating session http://${POLICY_RUNTIME_ACM_IP}:6969
${postyaml}= Get file ${CURDIR}/data/PMSHMultipleACTosca.yaml
- ${session}= Create Session policy https://${POLICY_RUNTIME_ACM_IP}:6969 auth=${auth}
+ ${session}= Create Session policy http://${POLICY_RUNTIME_ACM_IP}:6969 auth=${auth}
${headers}= Create Dictionary Accept=application/yaml Content-Type=application/yaml
${resp}= POST On Session policy /onap/policy/clamp/acm/v2/commission data=${postyaml} headers=${headers}
Log Received response from runtime acm ${resp.text}
@@ -20,9 +20,9 @@
InstantiateAutomationCompositionV1
[Documentation] Instantiate automation composition.
${auth}= Create List runtimeUser zb!XztG34
- Log Creating session https://${POLICY_RUNTIME_ACM_IP}:6969
+ Log Creating session http://${POLICY_RUNTIME_ACM_IP}:6969
${postjson}= Get file ${CURDIR}/data/InstantiateAC.json
- ${session}= Create Session policy https://${POLICY_RUNTIME_ACM_IP}:6969 auth=${auth}
+ ${session}= Create Session policy http://${POLICY_RUNTIME_ACM_IP}:6969 auth=${auth}
${headers}= Create Dictionary Accept=application/json Content-Type=application/json
${resp}= POST On Session policy /onap/policy/clamp/acm/v2/instantiation data=${postjson} headers=${headers}
Log Received response from runtime acm ${resp.text}
@@ -31,9 +31,9 @@
PassivateAutomationComposition
[Documentation] Passivate automation composition.
${auth}= Create List runtimeUser zb!XztG34
- Log Creating session https://${POLICY_RUNTIME_ACM_IP}:6969
+ Log Creating session http://${POLICY_RUNTIME_ACM_IP}:6969
${postjson}= Get file ${CURDIR}/data/PassivateAC.json
- ${session}= Create Session policy https://${POLICY_RUNTIME_ACM_IP}:6969 auth=${auth}
+ ${session}= Create Session policy http://${POLICY_RUNTIME_ACM_IP}:6969 auth=${auth}
${headers}= Create Dictionary Accept=application/json Content-Type=application/json
${resp}= PUT On Session policy /onap/policy/clamp/acm/v2/instantiation/command data=${postjson} headers=${headers}
Log Received response from runtime acm ${resp.text}
@@ -42,8 +42,8 @@
QueryPolicies
[Documentation] Runs Policy Participant Query New Policies
${auth}= Create List policyadmin zb!XztG34
- Log Creating session https://${POLICY_API_IP}:6969
- ${session}= Create Session policy https://${POLICY_API_IP}:6969 auth=${auth}
+ Log Creating session http://${POLICY_API_IP}:6969
+ ${session}= Create Session policy http://${POLICY_API_IP}:6969 auth=${auth}
${headers}= Create Dictionary Accept=application/json Content-Type=application/json
${resp}= GET On Session policy /policy/api/v1/policies headers=${headers}
Log Received response from policy-api {resp.text}
@@ -52,8 +52,8 @@
QueryPolicyTypes
[Documentation] Runs Policy Participant Query New Policy Types
${auth}= Create List policyadmin zb!XztG34
- Log Creating session https://${POLICY_API_IP}:6969
- ${session}= Create Session policy https://${POLICY_API_IP}:6969 auth=${auth}
+ Log Creating session http://${POLICY_API_IP}:6969
+ ${session}= Create Session policy http://${POLICY_API_IP}:6969 auth=${auth}
${headers}= Create Dictionary Accept=application/json Content-Type=application/json
${resp}= GET On Session policy /policy/api/v1/policytypes headers=${headers}
Log Received response from policy-api ${resp.text}
@@ -62,9 +62,9 @@
StateChangeRunningAutomationComposition
[Documentation] AutomationComposition State Change to RUNNING.
${auth}= Create List runtimeUser zb!XztG34
- Log Creating session https://${POLICY_RUNTIME_ACM_IP}:6969
+ Log Creating session http://${POLICY_RUNTIME_ACM_IP}:6969
${postjson}= Get file ${CURDIR}/data/StateChangeRunningAC.json
- ${session}= Create Session policy https://${POLICY_RUNTIME_ACM_IP}:6969 auth=${auth}
+ ${session}= Create Session policy http://${POLICY_RUNTIME_ACM_IP}:6969 auth=${auth}
${headers}= Create Dictionary Accept=application/json Content-Type=application/json
${resp}= PUT On Session policy /onap/policy/clamp/acm/v2/instantiation/command data=${postjson} headers=${headers} expected_status=406
Log Received response from runtime acm ${resp.text}
@@ -72,8 +72,8 @@
QueryInstantiatedACs
[Documentation] Get Instantiated AutomationCompositions
${auth}= Create List runtimeUser zb!XztG34
- Log Creating session https://${POLICY_RUNTIME_ACM_IP}:6969
- ${session}= Create Session policy https://${POLICY_RUNTIME_ACM_IP}:6969 auth=${auth}
+ Log Creating session http://${POLICY_RUNTIME_ACM_IP}:6969
+ ${session}= Create Session policy http://${POLICY_RUNTIME_ACM_IP}:6969 auth=${auth}
${headers}= Create Dictionary Accept=application/json Content-Type=application/json
${resp}= GET On Session policy /onap/policy/clamp/acm/v2/instantiation headers=${headers}
Log Received response from runtime acm ${resp.text}
diff --git a/csit/common-library.robot b/csit/common-library.robot
index aa737a0..b90f854 100644
--- a/csit/common-library.robot
+++ b/csit/common-library.robot
@@ -16,8 +16,8 @@
PerformPostRequest
[Arguments] ${hostname} ${url} ${expectedstatus} ${postjson} ${params} ${auth}
- Log Creating session https://${hostname}:6969
- ${session}= Create Session policy https://${hostname}:6969 auth=${auth}
+ Log Creating session http://${hostname}:6969
+ ${session}= Create Session policy http://${hostname}:6969 auth=${auth}
${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}
@@ -25,8 +25,8 @@
PerformPutRequest
[Arguments] ${hostname} ${url} ${expectedstatus} ${params} ${auth}
- Log Creating session https://${hostname}:6969
- ${session}= Create Session policy https://${hostname}:6969 auth=${auth}
+ Log Creating session http://${hostname}:6969
+ ${session}= Create Session policy http://${hostname}:6969 auth=${auth}
${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}
@@ -34,8 +34,8 @@
PerformGetRequest
[Arguments] ${hostname} ${url} ${expectedstatus} ${params} ${auth}
- Log Creating session https://${hostname}:6969
- ${session}= Create Session policy https://${hostname}:6969 auth=${auth}
+ Log Creating session http://${hostname}:6969
+ ${session}= Create Session policy http://${hostname}:6969 auth=${auth}
${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}
@@ -43,8 +43,8 @@
PerformDeleteRequest
[Arguments] ${hostname} ${url} ${expectedstatus} ${auth}
- Log Creating session https://${hostname}:6969
- ${session}= Create Session policy https://${hostname}:6969 auth=${auth}
+ Log Creating session http://${hostname}:6969
+ ${session}= Create Session policy http://${hostname}:6969 auth=${auth}
${headers}= Create Dictionary Accept=application/json Content-Type=application/json
${resp}= DELETE On Session policy ${url} headers=${headers} expected_status=${expectedstatus}
Log Received response from policy ${resp.text}
@@ -114,8 +114,8 @@
GetMetrics
[Arguments] ${hostname} ${auth}
- Log Creating session https://${hostname}:6969
- ${session}= Create Session policy https://${hostname}:6969 auth=${auth}
+ Log Creating session http://${hostname}:6969
+ ${session}= Create Session policy http://${hostname}:6969 auth=${auth}
${resp}= GET On Session policy /metrics expected_status=200
Log Received response from policy ${resp.text}
[return] ${resp}
diff --git a/csit/config/apex-pdp/OnapPfConfig.json b/csit/config/apex-pdp/OnapPfConfig.json
index 74085a1..5760259 100644
--- a/csit/config/apex-pdp/OnapPfConfig.json
+++ b/csit/config/apex-pdp/OnapPfConfig.json
@@ -5,7 +5,7 @@
"port": 6969,
"userName": "healthcheck",
"password": "zb!XztG34",
- "https": {{HTTPS_ENABLED}},
+ "https": false,
"prometheus": true
},
"pdpStatusParameters":{
@@ -29,13 +29,13 @@
"topic" : "POLICY-PDP-PAP",
"servers" : [ "message-router" ],
"topicCommInfrastructure" : "dmaap",
- "useHttps" : {{HTTPS_ENABLED}}
+ "useHttps" : false
}],
"topicSinks" : [{
"topic" : "POLICY-PDP-PAP",
"servers" : [ "message-router" ],
"topicCommInfrastructure" : "dmaap",
- "useHttps" : {{HTTPS_ENABLED}}
+ "useHttps" : false
}]
}
}
diff --git a/csit/config/api/groups.json b/csit/config/api/groups.json
new file mode 100644
index 0000000..6ee30e1
--- /dev/null
+++ b/csit/config/api/groups.json
@@ -0,0 +1,137 @@
+{
+ "groups": [
+ {
+ "name": "defaultGroup",
+ "version": "1.0.0",
+ "description": "The default group that registers all supported policy types and pdps.",
+ "pdpGroupState": "ACTIVE",
+ "pdpSubgroups": [
+ {
+ "pdpType": "xacml",
+ "supportedPolicyTypes": [
+ {
+ "name": "onap.policies.controlloop.guard.common.FrequencyLimiter",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.common.MinMax",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.common.Blacklist",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.common.Filter",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.coordination.FirstBlocksSecond",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.monitoring.*",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.*",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.AffinityPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.DistancePolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.HpaPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.OptimizationPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.PciPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.service.QueryPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.service.SubscriberPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.Vim_fit",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.VnfPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.Xacml",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.Naming",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.match.*",
+ "version": "1.0.0"
+ }
+ ],
+ "currentInstanceCount": 0,
+ "desiredInstanceCount": 1,
+ "policies": [
+ {
+ "name": "SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP",
+ "version": "1.0.0"
+ }
+ ]
+ },
+ {
+ "pdpType": "drools",
+ "supportedPolicyTypes": [
+ {
+ "name": "onap.policies.controlloop.operational.common.Drools",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.drools.Controller",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.drools.Artifact",
+ "version": "1.0.0"
+ }
+ ],
+ "currentInstanceCount": 0,
+ "desiredInstanceCount": 1,
+ "policies": []
+ },
+ {
+ "pdpType": "apex",
+ "supportedPolicyTypes": [
+ {
+ "name": "onap.policies.controlloop.operational.common.Apex",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.Apex",
+ "version": "1.0.0"
+ }
+ ],
+ "currentInstanceCount": 0,
+ "desiredInstanceCount": 1,
+ "policies": []
+ }
+ ]
+ }
+ ]
+}
diff --git a/csit/config/caserial.txt b/csit/config/caserial.txt
deleted file mode 100644
index 3bdca32..0000000
--- a/csit/config/caserial.txt
+++ /dev/null
@@ -1 +0,0 @@
-1245
diff --git a/csit/config/clamp/AcRuntimeParameters.yaml b/csit/config/clamp/AcRuntimeParameters.yaml
index d70627f..e437dd2 100644
--- a/csit/config/clamp/AcRuntimeParameters.yaml
+++ b/csit/config/clamp/AcRuntimeParameters.yaml
@@ -33,7 +33,7 @@
server:
port: 6969
ssl:
- enabled: {{HTTPS_ENABLED}}
+ enabled: false
error:
path: /error
@@ -52,14 +52,14 @@
- ${topicServer:message-router}
topicCommInfrastructure: dmaap
fetchTimeout: 15000
- useHttps: {{HTTPS_ENABLED}}
+ useHttps: false
topicSinks:
-
topic: POLICY-ACRUNTIME-PARTICIPANT
servers:
- ${topicServer:message-router}
topicCommInfrastructure: dmaap
- useHttps: {{HTTPS_ENABLED}}
+ useHttps: false
management:
endpoints:
diff --git a/csit/config/clamp/HttpParticipantParameters.yaml b/csit/config/clamp/HttpParticipantParameters.yaml
index 62b9dc4..1576888 100644
--- a/csit/config/clamp/HttpParticipantParameters.yaml
+++ b/csit/config/clamp/HttpParticipantParameters.yaml
@@ -22,21 +22,21 @@
- ${topicServer:message-router}
topicCommInfrastructure: dmaap
fetchTimeout: 15000
- useHttps: {{HTTPS_ENABLED}}
+ useHttps: false
topicSinks:
- topic: POLICY-ACRUNTIME-PARTICIPANT
servers:
- ${topicServer:message-router}
topicCommInfrastructure: dmaap
- useHttps: {{HTTPS_ENABLED}}
+ useHttps: false
management:
endpoints:
web:
exposure:
include: health, metrics, prometheus
server:
- port: 8084
+ port: 6969
ssl:
- enabled: {{HTTPS_ENABLED}}
+ enabled: false
servlet:
context-path: /onap/policy/clamp/acm/httpparticipant
diff --git a/csit/config/clamp/KubernetesParticipantParameters.yaml b/csit/config/clamp/KubernetesParticipantParameters.yaml
index 49c568c..c13f815 100644
--- a/csit/config/clamp/KubernetesParticipantParameters.yaml
+++ b/csit/config/clamp/KubernetesParticipantParameters.yaml
@@ -26,14 +26,14 @@
- ${topicServer:message-router}
topicCommInfrastructure: dmaap
fetchTimeout: 15000
- useHttps: {{HTTPS_ENABLED}}
+ useHttps: false
topicSinks:
-
topic: POLICY-ACRUNTIME-PARTICIPANT
servers:
- ${topicServer:message-router}
topicCommInfrastructure: dmaap
- useHttps: {{HTTPS_ENABLED}}
+ useHttps: false
management:
endpoints:
@@ -41,9 +41,9 @@
exposure:
include: health, metrics, prometheus
server:
- port: 8083
+ port: 6969
ssl:
- enabled: {{HTTPS_ENABLED}}
+ enabled: false
servlet:
context-path: /onap/policy/clamp/acm/k8sparticipant
diff --git a/csit/config/clamp/PolicyParticipantParameters.yaml b/csit/config/clamp/PolicyParticipantParameters.yaml
index 73d40d4..acaaebb 100644
--- a/csit/config/clamp/PolicyParticipantParameters.yaml
+++ b/csit/config/clamp/PolicyParticipantParameters.yaml
@@ -13,7 +13,7 @@
port: 6969
userName: policyadmin
password: zb!XztG34
- useHttps: {{HTTPS_ENABLED}}
+ useHttps: false
allowSelfSignedCerts: true
policyPapParameters:
clientName: pap
@@ -21,7 +21,7 @@
port: 6969
userName: policyadmin
password: zb!XztG34
- useHttps: {{HTTPS_ENABLED}}
+ useHttps: false
allowSelfSignedCerts: true
intermediaryParameters:
reportingTimeIntervalMs: 120000
@@ -40,22 +40,22 @@
- ${topicServer:message-router}
topicCommInfrastructure: dmaap
fetchTimeout: 15000
- useHttps: {{HTTPS_ENABLED}}
+ useHttps: false
topicSinks:
-
topic: POLICY-ACRUNTIME-PARTICIPANT
servers:
- ${topicServer:message-router}
topicCommInfrastructure: dmaap
- useHttps: {{HTTPS_ENABLED}}
+ useHttps: false
management:
endpoints:
web:
exposure:
include: health, metrics, prometheus
server:
- port: 8085
+ port: 6969
ssl:
- enabled: {{HTTPS_ENABLED}}
+ enabled: false
servlet:
context-path: /onap/policy/clamp/acm/policyparticipant
diff --git a/csit/config/clamp/application-smoke.properties b/csit/config/clamp/application-smoke.properties
index 4057807..6910b68 100644
--- a/csit/config/clamp/application-smoke.properties
+++ b/csit/config/clamp/application-smoke.properties
@@ -148,10 +148,10 @@
#
# Configuration Settings for Policy Engine Components
-clamp.config.policy.api.url={{PROTOCOL}}${POLICY_API_HOST}:6969
+clamp.config.policy.api.url=http://${POLICY_API_HOST}:6969
clamp.config.policy.api.userName=policyadmin
clamp.config.policy.api.password=zb!XztG34
-clamp.config.policy.pap.url={{PROTOCOL}}${POLICY_PAP_HOST}:6969
+clamp.config.policy.pap.url=http://${POLICY_PAP_HOST}:6969
clamp.config.policy.pap.userName=policyadmin
clamp.config.policy.pap.password=zb!XztG34
@@ -160,12 +160,12 @@
clamp.config.sdc.csarFolder = /tmp/sdc-controllers
#DCAE Inventory Url Properties
-clamp.config.dcae.inventory.url={{PROTOCOL}}localhost:8085
+clamp.config.dcae.inventory.url=http://localhost:8085
clamp.config.dcae.intentory.retry.interval=10000
clamp.config.dcae.intentory.retry.limit=5
#DCAE Deployment Url Properties
-clamp.config.dcae.deployment.url={{PROTOCOL}}localhost:8085
+clamp.config.dcae.deployment.url=http://localhost:8085
clamp.config.dcae.deployment.userName=test
clamp.config.dcae.deployment.password=test
@@ -187,11 +187,11 @@
clamp.config.tosca.converter.dictionary.support.enabled=true
# Configuration settings for CDS
-clamp.config.cds.url={{PROTOCOL}}cds-blueprints-processor-http:8080
+clamp.config.cds.url=http://cds-blueprints-processor-http:8080
clamp.config.cds.userName=ccsdkapps
clamp.config.cds.password=ccsdkapps
# Configuration settings for ControlLoop Runtime Rest API
-clamp.config.acm.runtime.url={{PROTOCOL}}${RUNTIME_HOST}:6969
+clamp.config.acm.runtime.url=http://${RUNTIME_HOST}:6969
clamp.config.acm.runtime.userName=runtimeUser
clamp.config.acm.runtime.password=zb!XztG34
diff --git a/csit/config/clamp/groups.json b/csit/config/clamp/groups.json
new file mode 100644
index 0000000..6ee30e1
--- /dev/null
+++ b/csit/config/clamp/groups.json
@@ -0,0 +1,137 @@
+{
+ "groups": [
+ {
+ "name": "defaultGroup",
+ "version": "1.0.0",
+ "description": "The default group that registers all supported policy types and pdps.",
+ "pdpGroupState": "ACTIVE",
+ "pdpSubgroups": [
+ {
+ "pdpType": "xacml",
+ "supportedPolicyTypes": [
+ {
+ "name": "onap.policies.controlloop.guard.common.FrequencyLimiter",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.common.MinMax",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.common.Blacklist",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.common.Filter",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.coordination.FirstBlocksSecond",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.monitoring.*",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.*",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.AffinityPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.DistancePolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.HpaPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.OptimizationPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.PciPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.service.QueryPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.service.SubscriberPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.Vim_fit",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.VnfPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.Xacml",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.Naming",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.match.*",
+ "version": "1.0.0"
+ }
+ ],
+ "currentInstanceCount": 0,
+ "desiredInstanceCount": 1,
+ "policies": [
+ {
+ "name": "SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP",
+ "version": "1.0.0"
+ }
+ ]
+ },
+ {
+ "pdpType": "drools",
+ "supportedPolicyTypes": [
+ {
+ "name": "onap.policies.controlloop.operational.common.Drools",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.drools.Controller",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.drools.Artifact",
+ "version": "1.0.0"
+ }
+ ],
+ "currentInstanceCount": 0,
+ "desiredInstanceCount": 1,
+ "policies": []
+ },
+ {
+ "pdpType": "apex",
+ "supportedPolicyTypes": [
+ {
+ "name": "onap.policies.controlloop.operational.common.Apex",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.Apex",
+ "version": "1.0.0"
+ }
+ ],
+ "currentInstanceCount": 0,
+ "desiredInstanceCount": 1,
+ "policies": []
+ }
+ ]
+ }
+ ]
+}
diff --git a/csit/config/distribution/defaultConfig.json b/csit/config/distribution/defaultConfig.json
index 50cb822..7f09c6b 100644
--- a/csit/config/distribution/defaultConfig.json
+++ b/csit/config/distribution/defaultConfig.json
@@ -5,7 +5,7 @@
"port":6969,
"userName":"healthcheck",
"password":"zb!XztG34",
- "https": {{HTTPS_ENABLED}},
+ "https": false,
"prometheus": true
},
"receptionHandlerParameters":{
@@ -59,7 +59,7 @@
"port": 6969,
"userName": "policyadmin",
"password": "zb!XztG34",
- "useHttps": {{HTTPS_ENABLED}}
+ "useHttps": false
},
"papParameters": {
"clientName": "policy-pap",
@@ -67,7 +67,7 @@
"port": 6969,
"userName": "policyadmin",
"password": "zb!XztG34",
- "useHttps": {{HTTPS_ENABLED}}
+ "useHttps": false
},
"deployPolicies": true
}
diff --git a/csit/config/distribution/groups.json b/csit/config/distribution/groups.json
new file mode 100644
index 0000000..6ee30e1
--- /dev/null
+++ b/csit/config/distribution/groups.json
@@ -0,0 +1,137 @@
+{
+ "groups": [
+ {
+ "name": "defaultGroup",
+ "version": "1.0.0",
+ "description": "The default group that registers all supported policy types and pdps.",
+ "pdpGroupState": "ACTIVE",
+ "pdpSubgroups": [
+ {
+ "pdpType": "xacml",
+ "supportedPolicyTypes": [
+ {
+ "name": "onap.policies.controlloop.guard.common.FrequencyLimiter",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.common.MinMax",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.common.Blacklist",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.common.Filter",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.coordination.FirstBlocksSecond",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.monitoring.*",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.*",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.AffinityPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.DistancePolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.HpaPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.OptimizationPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.PciPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.service.QueryPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.service.SubscriberPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.Vim_fit",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.VnfPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.Xacml",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.Naming",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.match.*",
+ "version": "1.0.0"
+ }
+ ],
+ "currentInstanceCount": 0,
+ "desiredInstanceCount": 1,
+ "policies": [
+ {
+ "name": "SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP",
+ "version": "1.0.0"
+ }
+ ]
+ },
+ {
+ "pdpType": "drools",
+ "supportedPolicyTypes": [
+ {
+ "name": "onap.policies.controlloop.operational.common.Drools",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.drools.Controller",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.drools.Artifact",
+ "version": "1.0.0"
+ }
+ ],
+ "currentInstanceCount": 0,
+ "desiredInstanceCount": 1,
+ "policies": []
+ },
+ {
+ "pdpType": "apex",
+ "supportedPolicyTypes": [
+ {
+ "name": "onap.policies.controlloop.operational.common.Apex",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.Apex",
+ "version": "1.0.0"
+ }
+ ],
+ "currentInstanceCount": 0,
+ "desiredInstanceCount": 1,
+ "policies": []
+ }
+ ]
+ }
+ ]
+}
diff --git a/csit/config/dns_ssl.txt b/csit/config/dns_ssl.txt
deleted file mode 100644
index 9833ed2..0000000
--- a/csit/config/dns_ssl.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-subjectAltName = \
- DNS:policy, \
- DNS:drools, \
- DNS:drools.onap, \
- DNS:policy-apex-pdp, \
- DNS:policy-apex-pdp.onap, \
- DNS:policy-api, \
- DNS:policy-api.onap, \
- DNS:policy-distribution, \
- DNS:policy-distribution.onap, \
- DNS:policy-pap, \
- DNS:policy-pap.onap, \
- DNS:policy-xacml-pdp, \
- DNS:policy-xacml-pdp.onap, \
- DNS:simulator, \
- DNS:aai-sim, \
- DNS:grpc-sim, \
- DNS:sdnc-sim, \
- DNS:so-sim, \
- DNS:vfc-sim, \
- DNS:message-router
diff --git a/csit/config/drools-apps/custom/engine-system.properties b/csit/config/drools-applications/custom/engine-system.properties
similarity index 100%
copy from csit/config/drools-apps/custom/engine-system.properties
copy to csit/config/drools-applications/custom/engine-system.properties
diff --git a/csit/config/drools-apps/custom/feature-lifecycle.properties b/csit/config/drools-applications/custom/feature-lifecycle.properties
similarity index 93%
rename from csit/config/drools-apps/custom/feature-lifecycle.properties
rename to csit/config/drools-applications/custom/feature-lifecycle.properties
index dcbf290..3e86297 100644
--- a/csit/config/drools-apps/custom/feature-lifecycle.properties
+++ b/csit/config/drools-applications/custom/feature-lifecycle.properties
@@ -29,10 +29,10 @@
dmaap.source.topics.POLICY-PDP-PAP.effectiveTopic=${envd:POLICY_PDP_PAP_TOPIC}
dmaap.source.topics.POLICY-PDP-PAP.apiKey=${envd:POLICY_PDP_PAP_API_KEY}
dmaap.source.topics.POLICY-PDP-PAP.apiSecret=${envd:POLICY_PDP_PAP_API_SECRET}
-dmaap.source.topics.POLICY-PDP-PAP.https=${envd:DMAAP_HTTPS:true}
+dmaap.source.topics.POLICY-PDP-PAP.https=${envd:DMAAP_HTTPS:false}
dmaap.sink.topics.POLICY-PDP-PAP.servers=${envd:DMAAP_SERVERS}
dmaap.sink.topics.POLICY-PDP-PAP.effectiveTopic=${envd:POLICY_PDP_PAP_TOPIC}
dmaap.sink.topics.POLICY-PDP-PAP.apiKey=${envd:POLICY_PDP_PAP_API_KEY}
dmaap.sink.topics.POLICY-PDP-PAP.apiSecret=${envd:POLICY_PDP_PAP_API_SECRET}
-dmaap.sink.topics.POLICY-PDP-PAP.https=${envd:DMAAP_HTTPS:true}
+dmaap.sink.topics.POLICY-PDP-PAP.https=${envd:DMAAP_HTTPS:false}
diff --git a/csit/config/drools-apps/custom/features.pre.sh b/csit/config/drools-applications/custom/features.pre.sh
similarity index 100%
rename from csit/config/drools-apps/custom/features.pre.sh
rename to csit/config/drools-applications/custom/features.pre.sh
diff --git a/csit/config/drools-apps/custom/standalone-settings.xml b/csit/config/drools-applications/custom/standalone-settings.xml
similarity index 100%
rename from csit/config/drools-apps/custom/standalone-settings.xml
rename to csit/config/drools-applications/custom/standalone-settings.xml
diff --git a/csit/config/drools-apps/env/base.conf b/csit/config/drools-applications/env/base.conf
similarity index 96%
rename from csit/config/drools-apps/env/base.conf
rename to csit/config/drools-applications/env/base.conf
index 0414225..c3cf80f 100644
--- a/csit/config/drools-apps/env/base.conf
+++ b/csit/config/drools-applications/env/base.conf
@@ -61,7 +61,7 @@
# HTTP Servers
-HTTP_SERVER_HTTPS={{HTTPS_ENABLED}}
+HTTP_SERVER_HTTPS=false
PROMETHEUS=true
# LIVENESS Checks
@@ -97,7 +97,7 @@
PDP_CONTEXT_URI=policy/pdpx/v1/
PDP_USERNAME=healthcheck
PDP_PASSWORD=zb!XztG34
-
+PDP_HTTPS=false
# DCAE DMaaP
@@ -108,7 +108,7 @@
# Open DMaaP
DMAAP_SERVERS=message-router
-DMAAP_HTTPS={{HTTPS_ENABLED}}
+DMAAP_HTTPS=false
# AAI
@@ -117,13 +117,14 @@
AAI_CONTEXT_URI=
AAI_USERNAME=policy@policy.onap.org
AAI_PASSWORD=demo123456!
+AAI_HTTPS=false
# MSO
SO_HOST=so-sim
SO_PORT=6669
SO_CONTEXT_URI=
-SO_URL=https://message-router:6669/
+SO_URL=http://message-router:6669/
SO_USERNAME=InfraPortalClient
SO_PASSWORD=password1$
diff --git a/csit/config/drools-apps/env/feature-healthcheck.conf b/csit/config/drools-applications/env/feature-healthcheck.conf
similarity index 100%
rename from csit/config/drools-apps/env/feature-healthcheck.conf
rename to csit/config/drools-applications/env/feature-healthcheck.conf
diff --git a/csit/config/drools-apps/env/feature-pooling-dmaap.conf b/csit/config/drools-applications/env/feature-pooling-dmaap.conf
similarity index 100%
rename from csit/config/drools-apps/env/feature-pooling-dmaap.conf
rename to csit/config/drools-applications/env/feature-pooling-dmaap.conf
diff --git a/csit/config/drools-applications/groups.json b/csit/config/drools-applications/groups.json
new file mode 100644
index 0000000..6ee30e1
--- /dev/null
+++ b/csit/config/drools-applications/groups.json
@@ -0,0 +1,137 @@
+{
+ "groups": [
+ {
+ "name": "defaultGroup",
+ "version": "1.0.0",
+ "description": "The default group that registers all supported policy types and pdps.",
+ "pdpGroupState": "ACTIVE",
+ "pdpSubgroups": [
+ {
+ "pdpType": "xacml",
+ "supportedPolicyTypes": [
+ {
+ "name": "onap.policies.controlloop.guard.common.FrequencyLimiter",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.common.MinMax",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.common.Blacklist",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.common.Filter",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.coordination.FirstBlocksSecond",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.monitoring.*",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.*",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.AffinityPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.DistancePolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.HpaPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.OptimizationPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.PciPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.service.QueryPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.service.SubscriberPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.Vim_fit",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.VnfPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.Xacml",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.Naming",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.match.*",
+ "version": "1.0.0"
+ }
+ ],
+ "currentInstanceCount": 0,
+ "desiredInstanceCount": 1,
+ "policies": [
+ {
+ "name": "SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP",
+ "version": "1.0.0"
+ }
+ ]
+ },
+ {
+ "pdpType": "drools",
+ "supportedPolicyTypes": [
+ {
+ "name": "onap.policies.controlloop.operational.common.Drools",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.drools.Controller",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.drools.Artifact",
+ "version": "1.0.0"
+ }
+ ],
+ "currentInstanceCount": 0,
+ "desiredInstanceCount": 1,
+ "policies": []
+ },
+ {
+ "pdpType": "apex",
+ "supportedPolicyTypes": [
+ {
+ "name": "onap.policies.controlloop.operational.common.Apex",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.Apex",
+ "version": "1.0.0"
+ }
+ ],
+ "currentInstanceCount": 0,
+ "desiredInstanceCount": 1,
+ "policies": []
+ }
+ ]
+ }
+ ]
+}
diff --git a/csit/config/drools-apps/custom/engine-system.properties b/csit/config/drools-pdp/custom/engine-system.properties
similarity index 100%
rename from csit/config/drools-apps/custom/engine-system.properties
rename to csit/config/drools-pdp/custom/engine-system.properties
diff --git a/csit/config/drools/custom/noop.pre.sh b/csit/config/drools-pdp/custom/noop.pre.sh
similarity index 100%
rename from csit/config/drools/custom/noop.pre.sh
rename to csit/config/drools-pdp/custom/noop.pre.sh
diff --git a/csit/config/drools/env/base.conf b/csit/config/drools-pdp/env/base.conf
similarity index 97%
rename from csit/config/drools/env/base.conf
rename to csit/config/drools-pdp/env/base.conf
index fd4d66f..4bd7632 100644
--- a/csit/config/drools/env/base.conf
+++ b/csit/config/drools-pdp/env/base.conf
@@ -59,7 +59,7 @@
# HTTP Servers
-HTTP_SERVER_HTTPS={{HTTPS_ENABLED}}
+HTTP_SERVER_HTTPS=false
PROMETHEUS=true
# PDP-D DMaaP configuration channel
@@ -104,7 +104,7 @@
# Open DMaaP
DMAAP_SERVERS=mr.api.simpledemo.onap.org
-DMAAP_HTTPS={{HTTPS_ENABLED}}
+DMAAP_HTTPS=false
# AAI
diff --git a/csit/config/drools-pdp/groups.json b/csit/config/drools-pdp/groups.json
new file mode 100644
index 0000000..6ee30e1
--- /dev/null
+++ b/csit/config/drools-pdp/groups.json
@@ -0,0 +1,137 @@
+{
+ "groups": [
+ {
+ "name": "defaultGroup",
+ "version": "1.0.0",
+ "description": "The default group that registers all supported policy types and pdps.",
+ "pdpGroupState": "ACTIVE",
+ "pdpSubgroups": [
+ {
+ "pdpType": "xacml",
+ "supportedPolicyTypes": [
+ {
+ "name": "onap.policies.controlloop.guard.common.FrequencyLimiter",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.common.MinMax",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.common.Blacklist",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.common.Filter",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.coordination.FirstBlocksSecond",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.monitoring.*",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.*",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.AffinityPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.DistancePolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.HpaPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.OptimizationPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.PciPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.service.QueryPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.service.SubscriberPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.Vim_fit",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.VnfPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.Xacml",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.Naming",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.match.*",
+ "version": "1.0.0"
+ }
+ ],
+ "currentInstanceCount": 0,
+ "desiredInstanceCount": 1,
+ "policies": [
+ {
+ "name": "SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP",
+ "version": "1.0.0"
+ }
+ ]
+ },
+ {
+ "pdpType": "drools",
+ "supportedPolicyTypes": [
+ {
+ "name": "onap.policies.controlloop.operational.common.Drools",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.drools.Controller",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.drools.Artifact",
+ "version": "1.0.0"
+ }
+ ],
+ "currentInstanceCount": 0,
+ "desiredInstanceCount": 1,
+ "policies": []
+ },
+ {
+ "pdpType": "apex",
+ "supportedPolicyTypes": [
+ {
+ "name": "onap.policies.controlloop.operational.common.Apex",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.Apex",
+ "version": "1.0.0"
+ }
+ ],
+ "currentInstanceCount": 0,
+ "desiredInstanceCount": 1,
+ "policies": []
+ }
+ ]
+ }
+ ]
+}
diff --git a/csit/config/drools/custom/engine-system.properties b/csit/config/drools/custom/engine-system.properties
deleted file mode 100644
index 19e03b5..0000000
--- a/csit/config/drools/custom/engine-system.properties
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# ============LICENSE_START=======================================================
-# ONAP
-# ================================================================================
-# Copyright (C) 2021 AT&T Intellectual Property. 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=========================================================
-#
-
-# system properties set within the application
-
-java.net.preferIPv4Stack=true
-
-# jmx
-
-com.sun.management.jmxremote.port=9991
-com.sun.management.jmxremote.authenticate=false
-com.sun.management.jmxremote.ssl=false
-
-# certs
-
-javax.net.ssl.trustStore=${envd:TRUSTSTORE:/opt/app/policy/etc/ssl/policy-truststore}
-javax.net.ssl.trustStorePassword=${envd:TRUSTSTORE_PASSWD:Pol1cy_0nap}
-
-javax.net.ssl.keyStore=${envd:KEYSTORE:/opt/app/policy/etc/ssl/policy-keystore}
-javax.net.ssl.keyStorePassword=${envd:KEYSTORE_PASSWD:Pol1cy_0nap}
-
-# kie
-
-kie.maven.offline.force=${envd:REPOSITORY_OFFLINE:false}
-
-# symmetric key for sensitive configuration data
-
-engine.symm.key=${envd:SYMM_KEY}
diff --git a/csit/config/gui/application.yaml b/csit/config/gui/application.yaml
index a0a6c22..12effe2 100644
--- a/csit/config/gui/application.yaml
+++ b/csit/config/gui/application.yaml
@@ -18,7 +18,7 @@
server:
port: 2443
ssl:
- enabled: {{HTTPS_ENABLED}}
+ enabled: false
enabled-protocols: TLSv1.2
client-auth: want
key-store: file:${KEYSTORE}
diff --git a/csit/config/gui/groups.json b/csit/config/gui/groups.json
new file mode 100644
index 0000000..6ee30e1
--- /dev/null
+++ b/csit/config/gui/groups.json
@@ -0,0 +1,137 @@
+{
+ "groups": [
+ {
+ "name": "defaultGroup",
+ "version": "1.0.0",
+ "description": "The default group that registers all supported policy types and pdps.",
+ "pdpGroupState": "ACTIVE",
+ "pdpSubgroups": [
+ {
+ "pdpType": "xacml",
+ "supportedPolicyTypes": [
+ {
+ "name": "onap.policies.controlloop.guard.common.FrequencyLimiter",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.common.MinMax",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.common.Blacklist",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.common.Filter",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.controlloop.guard.coordination.FirstBlocksSecond",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.monitoring.*",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.*",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.AffinityPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.DistancePolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.HpaPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.OptimizationPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.PciPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.service.QueryPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.service.SubscriberPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.Vim_fit",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.optimization.resource.VnfPolicy",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.Xacml",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.Naming",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.match.*",
+ "version": "1.0.0"
+ }
+ ],
+ "currentInstanceCount": 0,
+ "desiredInstanceCount": 1,
+ "policies": [
+ {
+ "name": "SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP",
+ "version": "1.0.0"
+ }
+ ]
+ },
+ {
+ "pdpType": "drools",
+ "supportedPolicyTypes": [
+ {
+ "name": "onap.policies.controlloop.operational.common.Drools",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.drools.Controller",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.drools.Artifact",
+ "version": "1.0.0"
+ }
+ ],
+ "currentInstanceCount": 0,
+ "desiredInstanceCount": 1,
+ "policies": []
+ },
+ {
+ "pdpType": "apex",
+ "supportedPolicyTypes": [
+ {
+ "name": "onap.policies.controlloop.operational.common.Apex",
+ "version": "1.0.0"
+ },
+ {
+ "name": "onap.policies.native.Apex",
+ "version": "1.0.0"
+ }
+ ],
+ "currentInstanceCount": 0,
+ "desiredInstanceCount": 1,
+ "policies": []
+ }
+ ]
+ }
+ ]
+}
diff --git a/csit/config/pap/papParameters.yaml b/csit/config/pap/papParameters.yaml
index 9a57ebb..bb05020 100644
--- a/csit/config/pap/papParameters.yaml
+++ b/csit/config/pap/papParameters.yaml
@@ -24,7 +24,7 @@
server:
port: 6969
ssl:
- enabled: {{HTTPS_ENABLED}}
+ enabled: false
pap:
name: PapGroup
@@ -44,7 +44,7 @@
servers:
- message-router
topicCommInfrastructure: dmaap
- useHttps: {{HTTPS_ENABLED}}
+ useHttps: false
fetchTimeout: 15000
- topic: POLICY-HEARTBEAT
effectiveTopic: POLICY-PDP-PAP
@@ -52,26 +52,26 @@
servers:
- message-router
topicCommInfrastructure: dmaap
- useHttps: {{HTTPS_ENABLED}}
+ useHttps: false
fetchTimeout: 15000
topicSinks:
- topic: POLICY-PDP-PAP
servers:
- message-router
topicCommInfrastructure: dmaap
- useHttps: {{HTTPS_ENABLED}}
+ useHttps: false
- topic: POLICY-NOTIFICATION
servers:
- message-router
topicCommInfrastructure: dmaap
- useHttps: {{HTTPS_ENABLED}}
+ useHttps: false
healthCheckRestClientParameters:
- clientName: api
hostname: policy-api
port: 6969
userName: policyadmin
password: zb!XztG34
- useHttps: {{HTTPS_ENABLED}}
+ useHttps: false
basePath: policy/api/v1/healthcheck
management:
diff --git a/csit/config/policy-truststore b/csit/config/policy-truststore
deleted file mode 100644
index 883e0a9..0000000
--- a/csit/config/policy-truststore
+++ /dev/null
Binary files differ
diff --git a/csit/config/sim-all/simParameters.json b/csit/config/sim-all/simParameters.json
index 3d34812..41fc905 100644
--- a/csit/config/sim-all/simParameters.json
+++ b/csit/config/sim-all/simParameters.json
@@ -8,15 +8,15 @@
"name": "DMaaP simulator",
"providerClass": "org.onap.policy.models.sim.dmaap.rest.DmaapSimRestControllerV1",
"host": "0.0.0.0",
- "port": {{MESSAGE_ROUTER_PORT}},
- "https": {{HTTPS_ENABLED}}
+ "port": 3904,
+ "https": false
},
{
"name": "A&AI simulator",
"providerClass": "org.onap.policy.simulators.AaiSimulatorJaxRs",
"host": "0.0.0.0",
"port": 6666,
- "https": {{HTTPS_ENABLED}},
+ "https": false,
"userName": "policy@policy.onap.org",
"password": "demo123456!",
"resourceLocation": "/opt/app/policy/simulators/etc/mounted/aairesponse/"
@@ -26,7 +26,7 @@
"providerClass": "org.onap.policy.simulators.SdncSimulatorJaxRs",
"host": "0.0.0.0",
"port": 6668,
- "https": {{HTTPS_ENABLED}}
+ "https": false
},
{
"name": "SO simulator",
@@ -42,7 +42,7 @@
"providerClass": "org.onap.policy.simulators.VfcSimulatorJaxRs",
"host": "0.0.0.0",
"port": 6670,
- "https": {{HTTPS_ENABLED}}
+ "https": false
}
],
"topicSinks": [
@@ -50,7 +50,7 @@
"topic": "APPC-CL",
"servers": ["${HOST_NAME}"],
"topicCommInfrastructure": "DMAAP",
- "useHttps": {{HTTPS_ENABLED}},
+ "useHttps": false,
"apiKey": "some-key",
"apiSecret": "some-secret"
},
@@ -58,7 +58,7 @@
"topic": "APPC-LCM-WRITE",
"servers": ["${HOST_NAME}"],
"topicCommInfrastructure": "DMAAP",
- "useHttps": {{HTTPS_ENABLED}},
+ "useHttps": false,
"apiKey": "some-key",
"apiSecret": "some-secret"
}
@@ -68,7 +68,7 @@
"topic": "APPC-CL",
"servers": ["${HOST_NAME}"],
"topicCommInfrastructure": "DMAAP",
- "useHttps": {{HTTPS_ENABLED}},
+ "useHttps": false,
"apiKey": "some-key",
"apiSecret": "some-secret"
},
@@ -76,7 +76,7 @@
"topic": "APPC-LCM-READ",
"servers": ["${HOST_NAME}"],
"topicCommInfrastructure": "DMAAP",
- "useHttps": {{HTTPS_ENABLED}},
+ "useHttps": false,
"apiKey": "some-key",
"apiSecret": "some-secret"
}
diff --git a/csit/config/xacml-pdp/defaultConfig.json b/csit/config/xacml-pdp/defaultConfig.json
index 6ee0769..a4bcc5e 100644
--- a/csit/config/xacml-pdp/defaultConfig.json
+++ b/csit/config/xacml-pdp/defaultConfig.json
@@ -7,7 +7,7 @@
"port": 6969,
"userName": "healthcheck",
"password": "zb!XztG34",
- "https": {{HTTPS_ENABLED}},
+ "https": false,
"aaf": false,
"prometheus": true
},
@@ -16,7 +16,7 @@
"port": 6969,
"userName": "policyadmin",
"password": "zb!XztG34",
- "useHttps": {{HTTPS_ENABLED}},
+ "useHttps": false,
"aaf": false
},
"applicationParameters": {
@@ -27,13 +27,13 @@
"topic" : "POLICY-PDP-PAP",
"servers" : [ "message-router" ],
"topicCommInfrastructure" : "dmaap",
- "useHttps" : {{HTTPS_ENABLED}}
+ "useHttps" : false
}],
"topicSinks" : [{
"topic" : "POLICY-PDP-PAP",
"servers" : [ "message-router" ],
"topicCommInfrastructure" : "dmaap",
- "useHttps" : {{HTTPS_ENABLED}}
+ "useHttps" : false
}]
}
}
diff --git a/csit/docker-compose-all.yml b/csit/docker-compose-all.yml
index ef4bebd..577d048 100644
--- a/csit/docker-compose-all.yml
+++ b/csit/docker-compose-all.yml
@@ -20,7 +20,7 @@
version: '2'
services:
mariadb:
- image: nexus3.onap.org:10001/mariadb:${POLICY_MARIADB_VER}
+ image: ${CONTAINER_LOCATION}mariadb:${POLICY_MARIADB_VER}
container_name: mariadb
hostname: mariadb
command: ['--lower-case-table-names=1', '--wait_timeout=28800']
@@ -31,7 +31,7 @@
expose:
- 3306
policy-db-migrator:
- image: nexus3.onap.org:10001/onap/policy-db-migrator:${POLICY_DOCKER_VERSION}
+ image: ${CONTAINER_LOCATION}onap/policy-db-migrator:${POLICY_DOCKER_VERSION}
container_name: policy-db-migrator
hostname: policy-db-migrator
depends_on:
@@ -52,7 +52,7 @@
'mariadb', '3306'
]
simulator:
- image: nexus3.onap.org:10001/onap/policy-models-simulator:${POLICY_MODELS_VERSION}
+ image: ${CONTAINER_LOCATION}onap/policy-models-simulator:${POLICY_MODELS_VERSION}
container_name: simulator
hostname: simulator
networks:
@@ -66,26 +66,23 @@
- vfc-sim
volumes:
- ./config/sim-all:/opt/app/policy/simulators/etc/mounted:ro
- - ./config/ks.jks:/opt/app/policy/simulators/etc/ssl/policy-keystore:ro
- - ./config/policy-truststore:/opt/app/policy/simulators/etc/ssl/policy-truststore:ro
expose:
- 6666
- 6668
- 6669
- 6670
- - 3905
+ - 3904
- 6680
api:
- image: nexus3.onap.org:10001/onap/policy-api:${POLICY_API_VERSION}
+ image: ${CONTAINER_LOCATION}onap/policy-api:${POLICY_API_VERSION}
container_name: policy-api
depends_on:
- policy-db-migrator
hostname: policy-api
- expose:
- - 6969
+ ports:
+ - 30440:6969
volumes:
- - ./config/ks.jks:/opt/app/policy/api/etc/ssl/policy-keystore:ro
- - ./config/policy-truststore:/opt/app/policy/api/etc/ssl/policy-truststore:ro
+ - ./config/api/apiParameters.yaml:/opt/app/policy/api/etc/apiParameters.yaml:ro
- ./wait_for_port.sh:/opt/app/policy/api/bin/wait_for_port.sh:ro
entrypoint: ./wait_for_port.sh
command: [
@@ -94,74 +91,71 @@
'policy-db-migrator', '6824'
]
pap:
- image: nexus3.onap.org:10001/onap/policy-pap:${POLICY_PAP_VERSION}
+ image: ${CONTAINER_LOCATION}onap/policy-pap:${POLICY_PAP_VERSION}
container_name: policy-pap
depends_on:
- mariadb
- simulator
- api
hostname: policy-pap
- expose:
- - 6969
+ ports:
+ - 30442:6969
volumes:
- ./config/pap/papParameters.yaml:/opt/app/policy/pap/etc/papParameters.yaml:ro
- ./config/${PROJECT}/groups.json:/opt/app/policy/pap/etc/mounted/groups.json:ro
- - ./config/ks.jks:/opt/app/policy/pap/etc/ssl/policy-keystore:ro
- - ./config/policy-truststore:/opt/app/policy/pap/etc/ssl/policy-truststore:ro
- ./wait_for_port.sh:/opt/app/policy/pap/bin/wait_for_port.sh:ro
entrypoint: ./wait_for_port.sh
command: [
'-c', './policy-pap.sh',
'mariadb', '3306',
- 'message-router', '3905',
+ 'message-router', '3904',
'api', '6969'
]
xacml-pdp:
- image: nexus3.onap.org:10001/onap/policy-xacml-pdp:${POLICY_XACML_PDP_VERSION}
+ image: ${CONTAINER_LOCATION}onap/policy-xacml-pdp:${POLICY_XACML_PDP_VERSION}
container_name: policy-xacml-pdp
depends_on:
- mariadb
- simulator
- pap
hostname: policy-xacml-pdp
- expose:
- - 6969
+ ports:
+ - 30441:6969
volumes:
- ./config/xacml-pdp/defaultConfig.json:/opt/app/policy/pdpx/etc/defaultConfig.json:ro
- - ./config/ks.jks:/opt/app/policy/pdpx/etc/ssl/policy-keystore:ro
- - ./config/policy-truststore:/opt/app/policy/pdpx/etc/ssl/policy-truststore:ro
+ - ./config/xacml-pdp/groups.json:/opt/app/policy/pdpx/etc/groups.json:ro
- ./wait_for_port.sh:/opt/app/policy/pdpx/bin/wait_for_port.sh:ro
entrypoint: ./wait_for_port.sh
command: [
'-c', './policy-pdpx.sh',
'mariadb', '3306',
- 'message-router', '3905',
+ 'message-router', '3904',
'pap', '6969'
]
drools:
- image: nexus3.onap.org:10001/onap/policy-drools:${POLICY_DROOLS_PDP_VERSION}
+ image: ${CONTAINER_LOCATION}onap/policy-drools:${POLICY_DROOLS_PDP_VERSION}
container_name: drools
depends_on:
- mariadb
- simulator
- pap
hostname: drools
- expose:
- - 6969
- - 9696
+ ports:
+ - 30217:6969
+ - 30216:9696
volumes:
- - ./config/drools/custom:/tmp/policy-install/config:ro
+ - ./config/drools-pdp/custom:/tmp/policy-install/config:ro
- ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
env_file:
- - config/drools/env/base.conf
+ - config/drools-pdp/env/base.conf
entrypoint: /opt/app/policy/bin/wait_for_port.sh
command: [
'-c', '/opt/app/policy/bin/pdpd-entrypoint.sh boot',
'mariadb', '3306',
- 'message-router', '3905'
+ 'message-router', '3904'
]
drools-apps:
- image: nexus3.onap.org:10001/onap/policy-pdpd-cl:${POLICY_DROOLS_APPS_VERSION}
+ image: ${CONTAINER_LOCATION}onap/policy-pdpd-cl:${POLICY_DROOLS_APPS_VERSION}
container_name: drools-apps
depends_on:
- mariadb
@@ -169,21 +163,21 @@
- pap
- xacml-pdp
hostname: drools-apps
- expose:
- - 6969
- - 9696
+ ports:
+ - 30221:6969
+ - 30219:9696
volumes:
- - ./config/drools-apps/custom:/tmp/policy-install/config:ro
+ - ./config/drools-applications/custom:/tmp/policy-install/config:ro
- ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
env_file:
- - config/drools-apps/env/base.conf
- - config/drools-apps/env/feature-healthcheck.conf
- - config/drools-apps/env/feature-pooling-dmaap.conf
+ - config/drools-applications/env/base.conf
+ - config/drools-applications/env/feature-healthcheck.conf
+ - config/drools-applications/env/feature-pooling-dmaap.conf
entrypoint: /opt/app/policy/bin/wait_for_port.sh
command: [
'-c', '/opt/app/policy/bin/pdpd-cl-entrypoint.sh boot',
'mariadb', '3306',
- 'message-router', '3905',
+ 'message-router', '3904',
'pap', '6969',
'aai-sim', '6666',
'sdnc-sim', '6668',
@@ -191,30 +185,27 @@
'vfc-sim', '6670'
]
apex-pdp:
- image: nexus3.onap.org:10001/onap/policy-apex-pdp:${POLICY_APEX_PDP_VERSION}
+ image: ${CONTAINER_LOCATION}onap/policy-apex-pdp:${POLICY_APEX_PDP_VERSION}
container_name: policy-apex-pdp
depends_on:
- mariadb
- simulator
- pap
hostname: policy-apex-pdp
- expose:
- - 6969
- - 23324
+ ports:
+ - 30237:6969
volumes:
- ./config/apex-pdp/OnapPfConfig.json:/opt/app/policy/apex-pdp/etc/onappf/config/OnapPfConfig.json:ro
- - ./config/ks.jks:/opt/app/policy/apex-pdp/etc/ssl/policy-keystore:ro
- - ./config/policy-truststore:/opt/app/policy/apex-pdp/etc/ssl/policy-truststore:ro
- ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
entrypoint: /opt/app/policy/bin/wait_for_port.sh
command: [
'-c', '/opt/app/policy/apex-pdp/bin/apexOnapPf.sh -c /opt/app/policy/apex-pdp/etc/onappf/config/OnapPfConfig.json',
'mariadb', '3306',
- 'message-router', '3905',
+ 'message-router', '3904',
'pap', '6969'
]
distribution:
- image: nexus3.onap.org:10001/onap/policy-distribution:${POLICY_DISTRIBUTION_VERSION}
+ image: ${CONTAINER_LOCATION}onap/policy-distribution:${POLICY_DISTRIBUTION_VERSION}
container_name: policy-distribution
depends_on:
- mariadb
@@ -224,84 +215,78 @@
hostname: policy-distribution
volumes:
- ./config/distribution/defaultConfig.json:/opt/app/policy/distribution/etc/defaultConfig.json:ro
- - ./config/ks.jks:/opt/app/policy/distribution/etc/ssl/policy-keystore:ro
- - ./config/policy-truststore:/opt/app/policy/distribution/etc/ssl/policy-truststore:ro
- ./distribution/config/temp/:/opt/app/policy/distribution/etc/temp/:ro
- ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
entrypoint: /opt/app/policy/bin/wait_for_port.sh
command: [
'-c', './policy-dist.sh',
'mariadb', '3306',
- 'message-router', '3905',
+ 'message-router', '3904',
'pap', '6969',
'apex-pdp', '6969'
]
policy-clamp-runtime-acm:
- image: nexus3.onap.org:10001/onap/policy-clamp-runtime-acm:${POLICY_CLAMP_VERSION}
+ image: ${CONTAINER_LOCATION}onap/policy-clamp-runtime-acm:${POLICY_CLAMP_VERSION}
container_name: policy-clamp-runtime-acm
depends_on:
- mariadb
- simulator
hostname: policy-clamp-runtime-acm
- expose:
- - 6969
+ ports:
+ - 30258:6969
volumes:
- - ./config/policy-truststore:/opt/app/policy/clamp/etc/ssl/policy-truststore:ro
+ - ./config/clamp/AcRuntimeParameters.yaml:/opt/app/policy/clamp/etc/AcRuntimeParameters.yaml
- ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
- - ./config/ks.jks:/opt/app/policy/clamp/etc/ssl/policy-keystore:ro
entrypoint: /opt/app/policy/bin/wait_for_port.sh
command: [
'-c', './acm-runtime.sh',
- 'message-router', '3905'
+ 'message-router', '3904'
]
policy-clamp-ac-http-ppnt:
- image: nexus3.onap.org:10001/onap/policy-clamp-ac-http-ppnt:${POLICY_CLAMP_VERSION}
+ image: ${CONTAINER_LOCATION}onap/policy-clamp-ac-http-ppnt:${POLICY_CLAMP_VERSION}
container_name: policy-clamp-ac-http-ppnt
hostname: policy-clamp-ac-http-ppnt
- expose:
- - 6971
+ ports:
+ - 30290:6969
volumes:
- - ./config/policy-truststore:/opt/app/policy/clamp/etc/ssl/policy-truststore:ro
+ - ./config/clamp/HttpParticipantParameters.yaml:/opt/app/policy/clamp/etc/HttpParticipantParameters.yaml
- ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
- - ./config/ks.jks:/opt/app/policy/clamp/etc/ssl/policy-keystore:ro
entrypoint: /opt/app/policy/bin/wait_for_port.sh
command: [
'-c', './http-participant.sh',
- 'message-router', '3905'
+ 'policy-clamp-runtime-acm', '6969',
+ 'message-router', '3904'
]
policy-clamp-ac-k8s-ppnt:
- image: nexus3.onap.org:10001/onap/policy-clamp-ac-k8s-ppnt:${POLICY_CLAMP_VERSION}
+ image: ${CONTAINER_LOCATION}onap/policy-clamp-ac-k8s-ppnt:${POLICY_CLAMP_VERSION}
container_name: policy-clamp-ac-k8s-ppnt
hostname: policy-clamp-ac-k8s-ppnt
- expose:
- - 6972
+ ports:
+ - 30295:6969
volumes:
- - ./config/policy-truststore:/opt/app/policy/clamp/etc/ssl/policy-truststore:ro
+ - ./config/clamp/KubernetesParticipantParameters.yaml:/opt/app/policy/clamp/etc/KubernetesParticipantParameters.yaml
- ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
- - ./config/ks.jks:/opt/app/policy/clamp/etc/ssl/policy-keystore:ro
entrypoint: /opt/app/policy/bin/wait_for_port.sh
command: [
'-c', './kubernetes-participant.sh',
- 'message-router', '3905'
+ 'policy-clamp-runtime-acm', '6969',
+ 'message-router', '3904'
]
policy-clamp-ac-pf-ppnt:
- image: nexus3.onap.org:10001/onap/policy-clamp-ac-pf-ppnt:${POLICY_CLAMP_VERSION}
+ image: ${CONTAINER_LOCATION}onap/policy-clamp-ac-pf-ppnt:${POLICY_CLAMP_VERSION}
container_name: policy-clamp-ac-pf-ppnt
depends_on:
- simulator
- api
- - policy-clamp-ac-http-ppnt
- - policy-clamp-ac-k8s-ppnt
hostname: policy-clamp-ac-pf-ppnt
- expose:
- - 6973
+ ports:
+ - 30218:6969
volumes:
- - ./config/policy-truststore:/opt/app/policy/clamp/etc/ssl/policy-truststore:ro
+ - ./config/clamp/PolicyParticipantParameters.yaml:/opt/app/policy/clamp/etc/PolicyParticipantParameters.yaml:ro
- ./wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
- - ./config/ks.jks:/opt/app/policy/clamp/etc/ssl/policy-keystore:ro
- - ./config/clamp/PolicyParticipantParameters.yaml:/opt/app/policy/clamp/config/PolicyParticipantParameters.yaml:ro
entrypoint: /opt/app/policy/bin/wait_for_port.sh
command: [
'-c', './policy-participant.sh',
- 'message-router', '3905'
+ 'policy-clamp-runtime-acm', '6969',
+ 'message-router', '3904'
]
diff --git a/csit/drools-applications/tests/drools-applications-test.robot b/csit/drools-applications/tests/drools-applications-test.robot
index a908f79..c06631b 100644
--- a/csit/drools-applications/tests/drools-applications-test.robot
+++ b/csit/drools-applications/tests/drools-applications-test.robot
@@ -213,8 +213,8 @@
PeformGetRequest
[Arguments] ${url} ${hostname} ${port} ${expectedstatus}
${auth}= Create List demo@people.osaaf.org demo123456!
- Log Creating session https://${hostname}:${port}
- ${session}= Create Session policy https://${hostname}:${port} auth=${auth}
+ Log Creating session http://${hostname}:${port}
+ ${session}= Create Session policy http://${hostname}:${port} auth=${auth}
${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}
@@ -224,8 +224,8 @@
[Arguments] ${url} ${params} ${hostname} ${port} ${jsonfile} ${filepath} ${contenttype} ${expectedstatus}
${auth}= Create List policyadmin zb!XztG34
${postjson}= Get file ${filepath}/${jsonfile}
- Log Creating session https://${hostname}:${port}
- ${session}= Create Session policy https://${hostname}:${port} auth=${auth}
+ Log Creating session http://${hostname}:${port}
+ ${session}= Create Session policy http://${hostname}:${port} auth=${auth}
${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}
diff --git a/csit/drools-pdp/tests/drools-pdp-test.robot b/csit/drools-pdp/tests/drools-pdp-test.robot
index 68dc4ea..3d95b6a 100644
--- a/csit/drools-pdp/tests/drools-pdp-test.robot
+++ b/csit/drools-pdp/tests/drools-pdp-test.robot
@@ -8,8 +8,8 @@
Alive
[Documentation] Runs Policy PDP Alive Check
${auth}= Create List demo@people.osaaf.org demo123456!
- Log Creating session https://${POLICY_DROOLS_IP}:9696
- ${session}= Create Session policy https://${POLICY_DROOLS_IP}:9696 auth=${auth}
+ Log Creating session http://${POLICY_DROOLS_IP}:9696
+ ${session}= Create Session policy http://${POLICY_DROOLS_IP}:9696 auth=${auth}
${headers}= Create Dictionary Accept=application/json Content-Type=application/json
${resp}= GET On Session policy /policy/pdp/engine headers=${headers} expected_status=200
Log Received response from policy ${resp.text}
@@ -18,8 +18,8 @@
Metrics
[Documentation] Verify drools-pdp is exporting metrics
${auth}= Create List demo@people.osaaf.org demo123456!
- Log Creating session https://${POLICY_DROOLS_IP}:9696
- ${session}= Create Session policy https://${POLICY_DROOLS_IP}:9696 auth=${auth}
+ Log Creating session http://${POLICY_DROOLS_IP}:9696
+ ${session}= Create Session policy http://${POLICY_DROOLS_IP}:9696 auth=${auth}
${headers}= Create Dictionary Accept=application/json Content-Type=application/json
${resp}= GET On Session policy /metrics headers=${headers} expected_status=200
Log Received response from policy ${resp.text}
diff --git a/csit/gen_keystore.sh b/csit/gen_keystore.sh
deleted file mode 100755
index 9b1cdfd..0000000
--- a/csit/gen_keystore.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-#
-# ===========LICENSE_START====================================================
-# Copyright (C) 2021 AT&T Intellectual Property. 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=====================================================
-#
-
-#
-# Generates a self-signed keystore for use by the various policy docker
-# images.
-#
-
-DIR="${0%/*}/config"
-cd "${DIR}"
-
-OUTFILE=ks.jks
-
-ALIAS="policy@policy.onap.org"
-PASS=Pol1cy_0nap
-
-dn="C=US, O=ONAP, OU=OSAAF, OU=policy@policy.onap.org:DEV, CN=policy"
-
-rm -f "${OUTFILE}"
-
-keytool -genkeypair -alias "${ALIAS}" -validity 30 \
- -keyalg RSA -dname "${dn}" -keystore "${OUTFILE}" \
- -keypass "${PASS}" -storepass "${PASS}"
-
-keytool -certreq -alias "${ALIAS}" -keystore ks.jks -file ks.csr \
- -storepass "${PASS}"
-
-openssl x509 -CA caroot.cer -CAkey cakey.pem -CAserial caserial.txt \
- -req -in ks.csr -out ks.cer -passin "pass:${PASS}" \
- -extfile dns_ssl.txt -days 30
-
-keytool -import -noprompt -file caroot.cer -keystore ks.jks \
- -storepass "${PASS}"
-
-keytool -import -alias "${ALIAS}" -file ks.cer -keystore ks.jks \
- -storepass "${PASS}"
-
-chmod 644 "$OUTFILE"
diff --git a/csit/gen_truststore.sh b/csit/gen_truststore.sh
deleted file mode 100755
index 748d5f3..0000000
--- a/csit/gen_truststore.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-#
-# ===========LICENSE_START====================================================
-# Copyright (C) 2021 AT&T Intellectual Property. 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=====================================================
-#
-
-#
-# Generates a root certificate and truststore for use by the various policy
-# docker images.
-#
-
-DIR="${0%/*}/config"
-cd "${DIR}"
-
-OUTFILE=policy-truststore
-ALIAS=onap.policy.csit.root.ca
-PASS=Pol1cy_0nap
-
-keytool -list -alias ${ALIAS} -keystore ${OUTFILE} -storepass "${PASS}" \
- >/dev/null 2>&1
-if [ $? -eq 0 ]
-then
- echo "Truststore already contains a policy root CA - not re-generating"
- exit 0
-fi
-
-openssl req -new -keyout cakey.pem -out careq.pem -passout "pass:${PASS}" \
- -subj "/C=US/ST=New Jersey/OU=ONAP/CN=policy.onap"
-
-openssl x509 -signkey cakey.pem -req -days 3650 -in careq.pem \
- -out caroot.cer -extensions v3_ca -passin "pass:${PASS}"
-
-keytool -import -noprompt -trustcacerts -alias ${ALIAS} \
- -file caroot.cer -keystore "${OUTFILE}" -storepass "${PASS}"
-
-chmod 644 "$OUTFILE"
diff --git a/csit/make_topic.sh b/csit/make_topic.sh
index 77e0a2d..05d11f3 100755
--- a/csit/make_topic.sh
+++ b/csit/make_topic.sh
@@ -2,6 +2,7 @@
#
# ===========LICENSE_START====================================================
# Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright (C) 2022 Nordix Foundation.
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -29,5 +30,5 @@
topic="${1}"
-curl -s -k "https://${SIM_IP}:3905/events/${topic}/script/1?limit=1&timeout=0"
+curl -s -k "http://${SIM_IP}:3904/events/${topic}/script/1?limit=1&timeout=0"
echo
diff --git a/csit/onset.sh b/csit/onset.sh
index 06b0c9f..251b5b5 100755
--- a/csit/onset.sh
+++ b/csit/onset.sh
@@ -2,6 +2,7 @@
#
# ===========LICENSE_START====================================================
# Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright (C) 2022 Nordix Foundation.
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -28,5 +29,5 @@
fi
curl -k -H "Content-type: application/json" --data-binary @$1 \
- https://${SIM_IP}:3905/events/unauthenticated.DCAE_CL_OUTPUT
+ http://${SIM_IP}:3904/events/unauthenticated.DCAE_CL_OUTPUT
echo
diff --git a/csit/pap/plans/setup.sh b/csit/pap/plans/setup.sh
index f002d68..c5b7593 100755
--- a/csit/pap/plans/setup.sh
+++ b/csit/pap/plans/setup.sh
@@ -24,13 +24,17 @@
python3 -m pip uninstall -y docker
python3 -m pip install -U docker
-sudo apt-get -y install libxml2-utils
-
source "${SCRIPTS}"/get-versions.sh
+
+sudo apt-get -y install libxml2-utils
bash "${SCRIPTS}"/get-models-examples.sh
+echo "${POLICY_PAP_VERSION}"
+
+cd "${SCRIPTS}"
docker-compose -f "${SCRIPTS}"/docker-compose-all.yml up -d pap apex-pdp
+sleep 10
unset http_proxy https_proxy
POLICY_PAP_IP=$(get-instance-ip.sh policy-pap)
@@ -44,7 +48,6 @@
# wait for the app to start up
"${SCRIPTS}"/wait_for_port.sh "${POLICY_PAP_IP}" 6969
-
DATA=${WORKSPACE}/models/models-examples/src/main/resources/policies
NODETEMPLATES=${WORKSPACE}/models/models-examples/src/main/resources/nodetemplates
diff --git a/csit/prepare-config-files.py b/csit/prepare-config-files.py
deleted file mode 100755
index 4eaa342..0000000
--- a/csit/prepare-config-files.py
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/python3
-#
-# ============LICENSE_START====================================================
-# Copyright (C) 2022 Nordix Foundation.
-# =============================================================================
-# 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.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END======================================================
-
-import os
-import argparse
-
-if __name__ == '__main__':
- parser = argparse.ArgumentParser(description='Process configuration files for https/ssl '
- 'disabling.')
- parser.add_argument('--https', default="true",
- help='enable or disable https/ssl connection. '
- 'use https=true or https=false')
-
- https_enabled = parser.parse_args().https
- message_router_port = '3905' if https_enabled == "true" else '3904'
- protocol = 'https://' if https_enabled == "true" else 'http://'
-
- current_dir = os.getcwd()
- config_dir = current_dir + "/config/"
-
- files = []
- for (dirpath, dirnames, filenames) in os.walk(config_dir):
- for filename in filenames:
- files.append(os.path.join(dirpath, filename))
-
- for file in files:
- try:
- with open(file, 'r+') as f:
- content = f.read()
- new_content = content.replace("{{HTTPS_ENABLED}}", https_enabled)
- new_content = new_content.replace("{{PROTOCOL}}", protocol)
- new_content = new_content.replace("{{MESSAGE_ROUTER_PORT}}", message_router_port)
-
- if new_content != content:
- f.seek(0)
- f.truncate()
- f.write(new_content)
- print("File {0} updated!".format(file))
- except UnicodeDecodeError:
- print("File didn't open: ", file)
-
- exit(0)
diff --git a/csit/run-project-csit.sh b/csit/run-project-csit.sh
index f09af48..b5ddc8e 100755
--- a/csit/run-project-csit.sh
+++ b/csit/run-project-csit.sh
@@ -51,16 +51,23 @@
trap on_exit EXIT
function docker_stats(){
- #General memory details
- echo "> top -bn1 | head -3"
- top -bn1 | head -3
- echo
+ # General memory details
+ if [ "$(uname -s)" == "Darwin" ]
+ then
+ echo "> top -l1 | head -10"
+ sh -c "top -l1 | head -10"
+ echo
+ else
+ echo "> top -bn1 | head -3"
+ sh -c "top -bn1 | head -3"
+ echo
- echo "> free -h"
- free -h
- echo
+ echo "> free -h"
+ sh -c "free -h"
+ echo
+ fi
- #Memory details per Docker
+ # Memory details per Docker
echo "> docker ps"
docker ps
echo
@@ -120,6 +127,19 @@
# main
#
+if $(docker images | grep -q "onap\/policy-api")
+then
+ echo where
+ export CONTAINER_LOCATION=$(
+ docker images |
+ grep onap/policy-api |
+ head -1 |
+ sed 's/onap\/policy-api.*$//'
+ )
+else
+ export CONTAINER_LOCATION="nexus3.onap.org:10001/"
+fi
+
# set and save options for quick failure
harden_set && save_set
@@ -145,10 +165,6 @@
# get the plan from git clone
source "${SCRIPTS}"/get-branch.sh
-# Prepare configuration files
-cd "${WORKSPACE}/csit"
-python3 ./prepare-config-files.py --https=true
-
export PROJECT="${1}"
cd ${WORKSPACE}
@@ -165,25 +181,12 @@
# Activate the virtualenv containing all the required libraries installed by prepare-csit.sh
source_safely "${ROBOT_VENV}/bin/activate"
-WORKDIR=$(mktemp -d --suffix=-robot-workdir)
+WORKDIR=$(mktemp -d)
cd "${WORKDIR}"
# Sign in to nexus3 docker repo
docker login -u docker -p docker nexus3.onap.org:10001
-# Generate truststore and keystore to be used by repos
-${SCRIPTS}/gen_truststore.sh
-${SCRIPTS}/gen_keystore.sh
-cp ${SCRIPTS}/config/ks.jks ${SCRIPTS}/config/drools/custom/policy-keystore
-cp ${SCRIPTS}/config/ks.jks ${SCRIPTS}/config/drools-apps/custom/policy-keystore
-cp ${SCRIPTS}/config/policy-truststore \
- ${SCRIPTS}/config/drools/custom/policy-truststore
-cp ${SCRIPTS}/config/policy-truststore \
- ${SCRIPTS}/config/drools-apps/custom/policy-truststore
-chmod 644 \
- ${SCRIPTS}/config/drools/custom/policy-* \
- ${SCRIPTS}/config/drools-apps/custom/policy-*
-
# Run setup script plan if it exists
cd "${TESTPLANDIR}/plans/"
SETUP="${TESTPLANDIR}/plans/setup.sh"
@@ -200,7 +203,7 @@
echo "Reading the testplan:"
cat "${TESTPLANDIR}/plans/testplan.txt" | egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' | sed "s|^|${TESTPLANDIR}/tests/|" > testplan.txt
cat testplan.txt
-SUITES=$( xargs -a testplan.txt )
+SUITES=$( xargs < testplan.txt )
echo ROBOT_VARIABLES="${ROBOT_VARIABLES}"
echo "Starting Robot test suites ${SUITES} ..."
diff --git a/csit/start-grafana.sh b/csit/start-grafana.sh
index 0350ad2..e081d04 100755
--- a/csit/start-grafana.sh
+++ b/csit/start-grafana.sh
@@ -21,20 +21,16 @@
SCRIPTS=$(git rev-parse --show-toplevel)
export SCRIPTS="${SCRIPTS}"/csit
-cd ${SCRIPTS}
-
-python3 ./prepare-config-files.py --https=false
-
-source ./get-versions.sh
+source "${SCRIPTS}"/get-versions.sh
export PROJECT="${1}"
if [ -z "${PROJECT}" ]; then
echo "Starting all components..."
- docker-compose -f ./compose-grafana.yml up -d
+ docker-compose -f "${SCRIPTS}"/compose-grafana.yml up -d
else
echo "Starting ${PROJECT} application..."
- docker-compose -f ./compose-grafana.yml up -d "${PROJECT}" grafana
+ docker-compose -f "${SCRIPTS}"/compose-grafana.yml up -d "${PROJECT}" grafana
fi
prometheus=$(docker inspect -f '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' prometheus)
diff --git a/csit/start-gui-smoke-components.sh b/csit/start-gui-smoke-components.sh
index 4fe36a0..257502f 100755
--- a/csit/start-gui-smoke-components.sh
+++ b/csit/start-gui-smoke-components.sh
@@ -18,12 +18,8 @@
SCRIPTS=$(git rev-parse --show-toplevel)
export SCRIPTS="${SCRIPTS}"/csit
-cd ${SCRIPTS}
+source "${SCRIPTS}"/get-versions.sh
-python3 ./prepare-config-files.py --https=true
-
-source ./get-versions.sh
-
-docker-compose -f docker-compose-gui-smoke.yml up -d policy-gui
+docker-compose -f "${SCRIPTS}"/docker-compose-gui-smoke.yml up -d policy-gui
echo "Clamp GUI: https://localhost:2443/clamp"
diff --git a/csit/wait_for_port.sh b/csit/wait_for_port.sh
index 0eeb1c9..0a9adc3 100755
--- a/csit/wait_for_port.sh
+++ b/csit/wait_for_port.sh
@@ -1,6 +1,7 @@
#!/bin/sh
# ============LICENSE_START====================================================
# Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright (C) 2022 Nordix Foundation.
# =============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,35 +18,64 @@
# SPDX-License-Identifier: Apache-2.0
# ============LICENSE_END======================================================
+usage() {
+ echo args: [-t timeout] [-c command] hostname1 port1 hostname2 port2 ... >&2
+ exit 1
+}
+
tmout=300
cmd=
-while getopts c:t: opt; do
+while getopts c:t: opt
+do
case "$opt" in
- c) cmd="$OPTARG" ;;
- t) tmout="$OPTARG" ;;
+ c)
+ cmd="$OPTARG"
+ ;;
+
+ t)
+ tmout="$OPTARG"
+ ;;
+
+ *)
+ usage
+ ;;
esac
done
-nargs=$(expr $OPTIND - 1)
-shift $nargs
-even_args=$(expr $# % 2)
-if [ $# -lt 2 -o $even_args -ne 0 ]; then
- echo "args: [-t timeout] [-c command] hostname1 port1 hostname2 port2 ..." >&2
- exit 1
+nargs=$((OPTIND-1))
+shift "$nargs"
+
+even_args=$(($#%2))
+if [ $# -lt 2 ] || [ "$even_args" -ne 0 ]
+then
+ usage
fi
-while [ $# -ge 2 ]; do
- export host=$1
- export port=$2
+while [ $# -ge 2 ]
+do
+ export host="$1"
+ export port="$2"
shift
shift
echo "Waiting for $host port $port..."
- timeout $tmout sh -c 'until nc -vz "$host" "$port"; do echo -n ".";
- sleep 1; done'
- rc=$?
- if [ $rc != 0 ]; then
+ while [ "$tmout" -gt 0 ]
+ do
+ nc -vz "$host" "$port"
+ rc=$?
+
+ if [ $rc -eq 0 ]
+ then
+ break
+ else
+ tmout=$((tmout-1))
+ sleep 1
+ fi
+ done
+
+ if [ $rc -ne 0 ]
+ then
echo "$host port $port cannot be reached"
exit $rc
fi
diff --git a/csit/wait_topic.sh b/csit/wait_topic.sh
index 64b6c9f..a6d997d 100755
--- a/csit/wait_topic.sh
+++ b/csit/wait_topic.sh
@@ -2,6 +2,7 @@
#
# ===========LICENSE_START====================================================
# Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright (C) 2022 Nordix Foundation.
# ============================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -39,7 +40,7 @@
while [ ${matched} = "no" ]
do
- msg=`curl -s -k "https://${SIM_IP}:3905/events/${topic}/script/1?limit=1"`
+ msg=`curl -s -k "http://${SIM_IP}:3904/events/${topic}/script/1?limit=1"`
if [ $? -ne 0 -o "${msg}" = "[]" ]
then
echo not found >&2
diff --git a/csit/xacml-pdp/plans/setup.sh b/csit/xacml-pdp/plans/setup.sh
index c99a031..705c820 100755
--- a/csit/xacml-pdp/plans/setup.sh
+++ b/csit/xacml-pdp/plans/setup.sh
@@ -40,7 +40,7 @@
export SIM_IP
-echo PDP IP IS "${POLICY_PDPX_IP}"
+echo XACML-PDP IP IS "${POLICY_PDPX_IP}"
echo API IP IS "${POLICY_API_IP}"
echo PAP IP IS "${POLICY_PAP_IP}"
echo MARIADB IP IS "${MARIADB_IP}"