diff options
Diffstat (limited to 'csit')
| -rw-r--r-- | csit/apex-pdp/plans/setup.sh | 2 | ||||
| -rw-r--r-- | csit/config/dns_ssl.txt | 6 | ||||
| -rw-r--r-- | csit/config/drools-apps/env/base.conf | 8 | ||||
| -rw-r--r-- | csit/distribution/plans/setup.sh | 2 | ||||
| -rw-r--r-- | csit/docker-compose-all.yml | 33 | ||||
| -rwxr-xr-x | csit/drools-applications/plans/setup.sh | 2 | ||||
| -rw-r--r-- | csit/xacml-pdp/plans/setup.sh | 2 |
7 files changed, 35 insertions, 20 deletions
diff --git a/csit/apex-pdp/plans/setup.sh b/csit/apex-pdp/plans/setup.sh index 2ca55703..7876e90d 100644 --- a/csit/apex-pdp/plans/setup.sh +++ b/csit/apex-pdp/plans/setup.sh @@ -39,7 +39,7 @@ POLICY_API_IP=`get-instance-ip.sh policy-api` POLICY_PAP_IP=`get-instance-ip.sh policy-pap` MARIADB_IP=`get-instance-ip.sh mariadb` APEX_IP=`get-instance-ip.sh policy-apex-pdp` -DMAAP_IP=`get-instance-ip.sh message-router` +DMAAP_IP=`get-instance-ip.sh simulator` echo PAP IP IS ${POLICY_PAP_IP} echo MARIADB IP IS ${MARIADB_IP} diff --git a/csit/config/dns_ssl.txt b/csit/config/dns_ssl.txt index 15fcfd50..9833ed23 100644 --- a/csit/config/dns_ssl.txt +++ b/csit/config/dns_ssl.txt @@ -12,4 +12,10 @@ subjectAltName = \ 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/env/base.conf b/csit/config/drools-apps/env/base.conf index 05ccdf47..5b8031f7 100644 --- a/csit/config/drools-apps/env/base.conf +++ b/csit/config/drools-apps/env/base.conf @@ -101,7 +101,7 @@ DMAAP_SERVERS=message-router # AAI -AAI_HOST=message-router +AAI_HOST=aai-sim AAI_PORT=6666 AAI_CONTEXT_URI= AAI_USERNAME=policy@policy.onap.org @@ -109,7 +109,7 @@ AAI_PASSWORD=demo123456! # MSO -SO_HOST=message-router +SO_HOST=so-sim SO_PORT=6669 SO_CONTEXT_URI= SO_URL=https://message-router:6669/ @@ -118,7 +118,7 @@ SO_PASSWORD=password1$ # VFC -VFC_HOST=message-router +VFC_HOST=vfc-sim VFC_PORT=6670 VFC_CONTEXT_URI= VFC_USERNAME= @@ -126,7 +126,7 @@ VFC_PASSWORD= # SDNC -SDNC_HOST=message-router +SDNC_HOST=sdnc-sim SDNC_PORT=6668 SDNC_CONTEXT_URI= SDNC_USERNAME= diff --git a/csit/distribution/plans/setup.sh b/csit/distribution/plans/setup.sh index c7ed695a..df0bdb1f 100644 --- a/csit/distribution/plans/setup.sh +++ b/csit/distribution/plans/setup.sh @@ -48,7 +48,7 @@ POLICY_API_IP=`get-instance-ip.sh policy-api` POLICY_PAP_IP=`get-instance-ip.sh policy-pap` MARIADB_IP=`get-instance-ip.sh mariadb` APEX_IP=`get-instance-ip.sh policy-apex-pdp` -DMAAP_IP=`get-instance-ip.sh message-router` +DMAAP_IP=`get-instance-ip.sh simulator` POLICY_DISTRIBUTION_IP=`get-instance-ip.sh policy-distribution` echo PAP IP IS ${POLICY_PAP_IP} diff --git a/csit/docker-compose-all.yml b/csit/docker-compose-all.yml index aaa62e99..c2a1d633 100644 --- a/csit/docker-compose-all.yml +++ b/csit/docker-compose-all.yml @@ -28,10 +28,19 @@ services: - ./config/db:/docker-entrypoint-initdb.d:ro expose: - 3306 - message-router: + simulator: image: nexus3.onap.org:10001/onap/policy-models-simulator:${POLICY_MODELS_VERSION} - container_name: message-router - hostname: message-router + container_name: simulator + hostname: simulator + networks: + default: + aliases: + - message-router + - aai-sim + - grpc-sim + - sdnc-sim + - so-sim + - 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 @@ -64,7 +73,7 @@ services: container_name: policy-pap depends_on: - mariadb - - message-router + - simulator - api hostname: policy-pap expose: @@ -86,7 +95,7 @@ services: container_name: policy-xacml-pdp depends_on: - mariadb - - message-router + - simulator - pap hostname: policy-xacml-pdp expose: @@ -108,7 +117,7 @@ services: container_name: drools depends_on: - mariadb - - message-router + - simulator - pap hostname: drools expose: @@ -130,7 +139,7 @@ services: container_name: drools-apps depends_on: - mariadb - - message-router + - simulator - pap - xacml-pdp hostname: drools-apps @@ -151,17 +160,17 @@ services: 'mariadb', '3306', 'message-router', '3905', 'pap', '6969', - 'message-router', '6666', - 'message-router', '6668', - 'message-router', '6669', - 'message-router', '6670' + 'aai-sim', '6666', + 'sdnc-sim', '6668', + 'so-sim', '6669', + 'vfc-sim', '6670' ] apex-pdp: image: nexus3.onap.org:10001/onap/policy-apex-pdp:${POLICY_APEX_PDP_VERSION} container_name: policy-apex-pdp depends_on: - mariadb - - message-router + - simulator - pap hostname: policy-apex-pdp expose: diff --git a/csit/drools-applications/plans/setup.sh b/csit/drools-applications/plans/setup.sh index 45bd8828..438f82b2 100755 --- a/csit/drools-applications/plans/setup.sh +++ b/csit/drools-applications/plans/setup.sh @@ -37,7 +37,7 @@ DROOLS_IP=`get-instance-ip.sh drools-apps` API_IP=`get-instance-ip.sh policy-api` PAP_IP=`get-instance-ip.sh policy-pap` XACML_IP=`get-instance-ip.sh policy-xacml-pdp` -SIM_IP=`get-instance-ip.sh message-router` +SIM_IP=`get-instance-ip.sh simulator` export SIM_IP echo DROOLS IP IS ${DROOLS_IP} diff --git a/csit/xacml-pdp/plans/setup.sh b/csit/xacml-pdp/plans/setup.sh index b9c527e3..23ebf6fe 100644 --- a/csit/xacml-pdp/plans/setup.sh +++ b/csit/xacml-pdp/plans/setup.sh @@ -36,7 +36,7 @@ unset http_proxy https_proxy POLICY_API_IP=`get-instance-ip.sh policy-api` MARIADB_IP=`get-instance-ip.sh mariadb` POLICY_PDPX_IP=`get-instance-ip.sh policy-xacml-pdp` -SIM_IP=`get-instance-ip.sh message-router` +SIM_IP=`get-instance-ip.sh simulator` POLICY_PAP_IP=`get-instance-ip.sh policy-pap` echo PDP IP IS ${POLICY_PDPX_IP} |