From d248ae90bb3fd6dae5c68b1a37b8beee4a44eda5 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Tue, 17 Mar 2020 12:18:46 -0400 Subject: [PATCH] Add frankfurt to drools-apps CSIT Issue-ID: POLICY-2434 Signed-off-by: Jim Hahn Change-Id: I92ce55b8f024e6bb935b21812ceb633976b0ddf8 --- scripts/policy/config/drools-apps/custom/noop.pre.sh | 2 ++ scripts/policy/config/drools-apps/env/base.conf | 9 +++++++++ .../policy/drools-applications/drools-applications-test.robot | 11 +++++++++++ 3 files changed, 22 insertions(+) diff --git a/scripts/policy/config/drools-apps/custom/noop.pre.sh b/scripts/policy/config/drools-apps/custom/noop.pre.sh index 1959e604..909d8f48 100755 --- a/scripts/policy/config/drools-apps/custom/noop.pre.sh +++ b/scripts/policy/config/drools-apps/custom/noop.pre.sh @@ -18,8 +18,10 @@ sed -i "s/^dmaap/noop/g" \ ${POLICY_HOME}/config/engine.properties \ ${POLICY_HOME}/config/feature-lifecycle.properties \ + ${POLICY_HOME}/config/frankfurt-controller.properties \ ${POLICY_HOME}/config/usecases-controller.properties chmod 644 ${POLICY_HOME}/config/engine.properties \ ${POLICY_HOME}/config/feature-lifecycle.properties \ + ${POLICY_HOME}/config/frankfurt-controller.properties \ ${POLICY_HOME}/config/usecases-controller.properties diff --git a/scripts/policy/config/drools-apps/env/base.conf b/scripts/policy/config/drools-apps/env/base.conf index d8d0f4ed..c11e7e98 100644 --- a/scripts/policy/config/drools-apps/env/base.conf +++ b/scripts/policy/config/drools-apps/env/base.conf @@ -79,6 +79,7 @@ PAP_PASSWORD=alpha123 # PDP-X PDP_HOST=pdp +PDP_PORT=6969 PDP_USERNAME=testpdp PDP_PASSWORD=alpha123 PDP_CLIENT_USERNAME=python @@ -97,24 +98,32 @@ DMAAP_SERVERS=mr.api.simpledemo.onap.org # AAI +AAI_HOST=aai.api.simpledemo.onap.org +AAI_PORT=8443 AAI_URL=https://aai.api.simpledemo.onap.org:8443 AAI_USERNAME=policy@policy.onap.org AAI_PASSWORD=demo123456! # MSO +SO_HOST=vm1.mso.simpledemo.onap.org +SO_PORT=8080 SO_URL=http://vm1.mso.simpledemo.onap.org:8080/onap/so/infra SO_USERNAME=InfraPortalClient SO_PASSWORD=password1$ # VFC +VFC_HOST= +VFC_PORT= VFC_URL= VFC_USERNAME= VFC_PASSWORD= # SDNC +SDNC_HOST= +SDNC_PORT= SDNC_URL= SDNC_USERNAME= SDNC_PASSWORD= diff --git a/tests/policy/drools-applications/drools-applications-test.robot b/tests/policy/drools-applications/drools-applications-test.robot index 1c9ea1d8..0a41a6c5 100644 --- a/tests/policy/drools-applications/drools-applications-test.robot +++ b/tests/policy/drools-applications/drools-applications-test.robot @@ -27,6 +27,17 @@ Healthcheck Should Be Equal As Strings ${resp.status_code} 200 Should Be Equal As Strings ${resp.json()['healthy']} True +Frankfurt + [Documentation] Checks frankfurt controller is up + ${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} + ${headers}= Create Dictionary Accept=application/json Content-Type=application/json + ${resp}= Get Request policy /policy/pdp/engine/controllers/frankfurt/drools/facts headers=${headers} + Log Received response from policy ${resp.text} + Should Be Equal As Strings ${resp.status_code} 200 + Should Be Equal As Strings ${resp.json()['frankfurt']} 0 + Usecases [Documentation] Checks usecases controller is up ${auth}= Create List demo@people.osaaf.org demo123456! -- 2.16.6