--- /dev/null
+{
+ "control_loop_name": "pmsh-control-loop",
+ "operational_policy_name": "pmsh-operational-policy",
+ "cert_path": "/opt/app/pmsh/etc/certs/cert.pem",
+ "enable_tls": true,
+ "ca_cert_path": "/opt/app/pmsh/etc/certs/cacert.pem",
+ "streams_publishes": {
+ "policy_pm_publisher": {
+ "dmaap_info": {
+ "client_id": "1475976809466",
+ "client_role": "org.onap.dcae.pmPublisher",
+ "topic_url": "http://mr-sim:3904/events/unauthenticated.DCAE_CL_OUTPUT",
+ "location": "san-francisco"
+ },
+ "type": "message_router"
+ }
+ },
+ "streams_subscribes": {
+ "aai_subscriber": {
+ "type": "message_router",
+ "dmaap_info": {
+ "client_id": "1575976809466",
+ "client_role": "org.onap.dcae.aaiSub",
+ "topic_url": "http://mr-sim:3904/events/AAI-EVENT",
+ "location": "san-francisco"
+ }
+ },
+ "policy_pm_subscriber": {
+ "dmaap_info": {
+ "location": "san-francisco",
+ "topic_url": "http://mr-sim:3904/events/unauthenticated.PMSH_CL_INPUT",
+ "client_role": "org.onap.dcae.pmSubscriber",
+ "client_id": "1575876809456"
+ },
+ "type": "message_router"
+ }
+ },
+ "key_path": "/opt/app/pmsh/etc/certs/key.pem",
+ "aaf_identity": "dcae@dcae.onap.org",
+ "aaf_password": "demo123456!"
+}
\ No newline at end of file
+++ /dev/null
-[
- {
- "httpRequest": {
- "path": "/service_component_all/.*"
- },
- "httpResponse": {
- "statusCode": 200,
- "headers": {
- "content-type": [
- "application/json"
- ]
- },
- "body": {
- "type": "JSON",
- "json": {
- "config": {
- "control_loop_name": "pmsh-control-loop",
- "operational_policy_name": "pmsh-operational-policy",
- "cert_path": "/opt/app/pmsh/etc/certs/cert.pem",
- "enable_tls": true,
- "ca_cert_path": "/opt/app/pmsh/etc/certs/cacert.pem",
- "pmsh_policy": {
- "subscription": {
- "subscriptionName": "ExtraPM-All-gNB-R2B",
- "administrativeState": "LOCKED",
- "fileBasedGP": 15,
- "fileLocation":"\/pm\/pm.xml",
- "nfFilter": {
- "nfNames": [
- "^pnf.*",
- "^vnf.*"
- ],
- "modelInvariantIDs": [
- "7129e420-d396-4efb-af02-6b83499b12f8"
- ],
- "modelVersionIDs": [
- ],
- "modelNames": [
- ]
- },
- "measurementGroups": [
- {
- "measurementGroup": {
- "measurementTypes": [
- {
- "measurementType": "countera"
- },
- {
- "measurementType": "counterb"
- }
- ],
- "managedObjectDNsBasic": [
- {
- "DN": "dna"
- },
- {
- "DN": "dnb"
- }
- ]
- }
- },
- {
- "measurementGroup": {
- "measurementTypes": [
- {
- "measurementType": "counterc"
- },
- {
- "measurementType": "counterd"
- }
- ],
- "managedObjectDNsBasic": [
- {
- "DN": "dnc"
- },
- {
- "DN": "dnd"
- }
- ]
- }
- }
- ]
- }
- },
- "streams_publishes": {
- "policy_pm_publisher": {
- "dmaap_info": {
- "client_id": "1475976809466",
- "client_role": "org.onap.dcae.pmPublisher",
- "topic_url": "http://mr-sim:3904/events/unauthenticated.DCAE_CL_OUTPUT",
- "location": "san-francisco"
- },
- "type": "message_router"
- }
- },
- "streams_subscribes": {
- "aai_subscriber": {
- "type": "message_router",
- "dmaap_info": {
- "client_id": "1575976809466",
- "client_role": "org.onap.dcae.aaiSub",
- "topic_url": "http://mr-sim:3904/events/AAI-EVENT",
- "location": "san-francisco"
- }
- },
- "policy_pm_subscriber": {
- "dmaap_info": {
- "location": "san-francisco",
- "topic_url": "http://mr-sim:3904/events/unauthenticated.PMSH_CL_INPUT",
- "client_role": "org.onap.dcae.pmSubscriber",
- "client_id": "1575876809456"
- },
- "type": "message_router"
- }
- },
- "key_path": "/opt/app/pmsh/etc/certs/key.pem",
- "aaf_identity": "dcae@dcae.onap.org",
- "aaf_password": "demo123456!"
- }
- }
- }
- }
- }
-]
+++ /dev/null
-#######################################
-# MockServer & Proxy Example Settings #
-#######################################
-
-# Socket & Port Settings
-
-# socket timeout in milliseconds (default 120000)
-mockserver.maxSocketTimeout=120000
-
-# Certificate Generation
-
-# delete KeyStore file on JVM shutdown (default true)
-mockserver.deleteGeneratedKeyStoreOnExit=true
-# certificate domain name (default "localhost")
-mockserver.sslCertificateDomainName=localhost
-# comma separated list of domain names for Subject Alternative Name domain names (default empty list)
-mockserver.sslSubjectAlternativeNameDomains=cbs-sim,config-binding-service,config-binding-service.onap
-# comma separated list of ip addresses for Subject Alternative Name ips (default empty list)
-mockserver.sslSubjectAlternativeNameIps=127.0.0.1
-
-mockserver.certificateAuthorityPrivateKey=/var/tmp/mock_server_key.pem
-mockserver.certificateAuthorityCertificate=/var/tmp/mock_server_cacert.pem
-#mockserver.tlsMutualAuthenticationRequired=true
-#mockserver.tlsMutualAuthenticationCertificateChain=/var/tmp/cacert.pem
-
-# CORS
-
-# enable CORS for MockServer REST API
-mockserver.enableCORSForAPI=true
-# enable CORS for all responses
-mockserver.enableCORSForAllResponses=true
aliases:
- aai-sim
- cbs-sim:
- container_name: cbs-sim
- image: nexus3.onap.org:10001/mockserver/mockserver:latest
- command: -logLevel DEBUG -serverPort 10443
- ports:
- - 10443:1080
- environment:
- MOCKSERVER_PROPERTY_FILE: /config/mockserver.properties
- MOCKSERVER_INITIALIZATION_JSON_PATH: /config/cbs-initializer.json
- volumes:
- - ./assets/cbs_sim/cbs_mockserver.properties:/config/mockserver.properties
- - ./assets/cbs_sim/cbs-initializer.json:/config/cbs-initializer.json
- - ./assets/ssl_certs/mock_server_cacert.pem:/var/tmp/mock_server_cacert.pem
- - ./assets/ssl_certs/mock_server_key.pem:/var/tmp/mock_server_key.pem
- networks:
- net:
- aliases:
- - cbs-sim
mr-sim:
container_name: mr-sim
image: nexus3.onap.org:10001/mockserver/mockserver:latest
- ./assets/ssl_certs/cert.pem:/opt/app/pmsh/etc/certs/cert.pem
- ./assets/ssl_certs/key.pem:/opt/app/pmsh/etc/certs/key.pem
- ./assets/ssl_certs/mock_server_cacert.pem:/opt/app/pmsh/etc/certs/cacert.pem
+ - ./assets/cbs_sim/application_config.yaml:/app-config/application_config.yaml
environment:
HOSTNAME: "dcae-pmsh"
- CONFIG_BINDING_SERVICE: cbs-sim
PMSH_PG_URL: db
PMSH_PG_USERNAME: $DB_USER
PMSH_PG_PASSWORD: $DB_PASSWORD
AAI_SERVICE_PORT: 1080
DCAE_CA_CERTPATH: '/opt/app/pmsh/etc/certs/cacert.pem'
+ CBS_CLIENT_CONFIG_PATH: '/app-config/application_config.yaml'
networks:
net:
aliases:
TEST_PLANS_DIR=$WORKSPACE/plans/dcaegen2-services-pmsh/testsuite
-docker-compose -f ${TEST_PLANS_DIR}/docker-compose.yml up -d db aai cbs-sim mr-sim
+docker-compose -f ${TEST_PLANS_DIR}/docker-compose.yml up -d db aai mr-sim
# Slow machine running CSITs can affect db coming up in time for PMSH
echo "Waiting for postgres db to come up..."
else
sleep ${i}
fi
- if [[ $(docker inspect --format '{{ .State.Running }}' cbs-sim) ]] && \
- [[ $(docker inspect --format '{{ .State.Running }}' aai-sim) ]] && \
+ if [[ $(docker inspect --format '{{ .State.Running }}' aai-sim) ]] && \
[[ $(docker inspect --format '{{ .State.Running }}' mr-sim) ]] && \
[[ $(docker inspect --format '{{ .State.Running }}' db) ]] && \
[[ $(docker inspect --format '{{ .State.Running }}' pmsh) ]]
[[ "$containers_ok" == "false" ]] && echo "Error: required container not running." && exit 1
DB_IP_ADDRESS=$(docker inspect -f "{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}" db)
-CBS_SIM_IP_ADDRESS=$(docker inspect -f "{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}" cbs-sim)
MR_SIM_IP_ADDRESS=$(docker inspect -f "{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}" mr-sim)
#Pass any variables required by Robot test suites in ROBOT_VARIABLES
-ROBOT_VARIABLES="-v PMSH_IP:${PMSH_IP} -v MR_SIM_IP_ADDRESS:${MR_SIM_IP_ADDRESS} -v DB_IP_ADDRESS:${DB_IP_ADDRESS} -v CBS_SIM_IP_ADDRESS:${CBS_SIM_IP_ADDRESS}"
+ROBOT_VARIABLES="-v PMSH_IP:${PMSH_IP} -v MR_SIM_IP_ADDRESS:${MR_SIM_IP_ADDRESS} -v DB_IP_ADDRESS:${DB_IP_ADDRESS}"
+++ /dev/null
-[
- {
- "httpRequest": {
- "path": "/service_component_all/.*"
- },
- "httpResponse": {
- "statusCode": 200,
- "headers": {
- "content-type": [
- "application/json"
- ]
- },
- "body": {
- "type": "JSON",
- "json": {
- "config": {
- "control_loop_name": "pmsh-control-loop",
- "operational_policy_name": "pmsh-operational-policy",
- "cert_path": "/opt/app/pmsh/etc/certs/cert.pem",
- "enable_tls": true,
- "ca_cert_path": "/opt/app/pmsh/etc/certs/cacert.pem",
- "pmsh_policy": {
- "subscription": {
- "subscriptionName": "ExtraPM-All-gNB-R2B",
- "administrativeState": "UNLOCKED",
- "fileBasedGP": 15,
- "fileLocation":"\/pm\/pm.xml",
- "nfFilter": {
- "nfNames": [
- "^pnf.*",
- "^vnf.*"
- ],
- "modelInvariantIDs": [
- "7129e420-d396-4efb-af02-6b83499b12f8"
- ],
- "modelVersionIDs": [
- ],
- "modelNames": [
- ]
- },
- "measurementGroups": [
- {
- "measurementGroup": {
- "measurementTypes": [
- {
- "measurementType": "countera"
- },
- {
- "measurementType": "counterb"
- }
- ],
- "managedObjectDNsBasic": [
- {
- "DN": "dna"
- },
- {
- "DN": "dnb"
- }
- ]
- }
- },
- {
- "measurementGroup": {
- "measurementTypes": [
- {
- "measurementType": "counterc"
- },
- {
- "measurementType": "counterd"
- }
- ],
- "managedObjectDNsBasic": [
- {
- "DN": "dnc"
- },
- {
- "DN": "dnd"
- }
- ]
- }
- }
- ]
- }
- },
- "streams_publishes": {
- "policy_pm_publisher": {
- "dmaap_info": {
- "client_id": "1475976809466",
- "client_role": "org.onap.dcae.pmPublisher",
- "topic_url": "http://mr-sim:3904/events/unauthenticated.DCAE_CL_OUTPUT",
- "location": "san-francisco"
- },
- "type": "message_router"
- }
- },
- "streams_subscribes": {
- "aai_subscriber": {
- "type": "message_router",
- "dmaap_info": {
- "client_id": "1575976809466",
- "client_role": "org.onap.dcae.aaiSub",
- "topic_url": "http://mr-sim:3904/events/AAI-EVENT",
- "location": "san-francisco"
- }
- },
- "policy_pm_subscriber": {
- "dmaap_info": {
- "location": "san-francisco",
- "topic_url": "http://mr-sim:3904/events/unauthenticated.PMSH_CL_INPUT",
- "client_role": "org.onap.dcae.pmSubscriber",
- "client_id": "1575876809456"
- },
- "type": "message_router"
- }
- },
- "key_path": "/opt/app/pmsh/etc/certs/key.pem",
- "aaf_identity": "dcae@dcae.onap.org",
- "aaf_password": "demo123456!"
- }
- }
- }
- }
- }
-]
${PMSH_BASE_URL} https://${PMSH_IP}:8443
${MR_SIM_BASE_URL} http://${MR_SIM_IP_ADDRESS}:3904
-${CBS_BASE_URL} https://${CBS_SIM_IP_ADDRESS}:10443
${SUBSCRIPTION_ENDPOINT} /subscription
${MR_SIM_RESET} %{WORKSPACE}/tests/dcaegen2-services-pmsh/testcases/assets/mr-sim-reset.json
${MR_AAI_PNF_REMOVED} %{WORKSPACE}/tests/dcaegen2-services-pmsh/testcases/assets/aai-pnf-delete.json
${MR_POLICY_RESPONSE_PNF_EXISTING} %{WORKSPACE}/tests/dcaegen2-services-pmsh/testcases/assets/policy-sub-created-pnf-existing.json
${MR_POLICY_RESPONSE_PNF_DELETED} %{WORKSPACE}/tests/dcaegen2-services-pmsh/testcases/assets/policy-sub-deleted-pnf-existing.json
-${CBS_EXPECTATION_ADMIN_STATE_UNLOCKED} %{WORKSPACE}/tests/dcaegen2-services-pmsh/testcases/assets/cbs-expectation-unlocked-config.json
${CREATE_SUBSCRIPTION_DATA} %{WORKSPACE}/tests/dcaegen2-services-pmsh/testcases/assets/create_subscription_request.json
${CREATE_SECOND_SUBSCRIPTION_DATA} %{WORKSPACE}/tests/dcaegen2-services-pmsh/testcases/assets/create_second_subscription_request.json
${CREATE_SUBSCRIPTION_BAD_DATA} %{WORKSPACE}/tests/dcaegen2-services-pmsh/testcases/assets/create_subscription_bad_request.json
[Tags] PMSH_03
[Documentation] Verify PNF detected when administrative state unlocked
[Timeout] 60 seconds
- SetAdministrativeStateToUnlocked
- Sleep 31 Allow PMSH time to pick up changes in CBS config
${resp}= GetMeasGrpCall /subscription/subs_01/measurementGroups/msg_grp_01
Should Be Equal As Strings ${resp.json()['subscriptionName']} subs_01
Should Be Equal As Strings ${resp.json()['administrativeState']} UNLOCKED
${nf_length}= Get length ${resp.json()['networkFunctions']}
Should be equal as numbers ${nf_length} 0
-Verify Update Measurement Group admin status to unlocked with no Network Functions in Subscription
+Verify Update Measurement Group admin status to unlocked
[Tags] PMSH_17
[Documentation] Verify Update Measurement Group admin status to unlocked with no Network Functions in Subscription
[Timeout] 60 seconds
- ${resp}= GetSubsCall ${SUBSCRIPTION_ENDPOINT}/subs_01 ""
- ${nf_length}= Get length ${resp.json()['subscription']['nfs']}
- Should be equal as numbers ${nf_length} 0
${json_string}= Set Variable {"administrativeState": "UNLOCKED"}
${json}= evaluate json.loads('''${json_string}''') json
${resp}= PutMsgGrpStatusCall /subscription/subs_01/measurementGroups/msg_grp_01/adminState ${json}
*** Keywords ***
-SetAdministrativeStateToUnlocked
- ${data}= Get Data From File ${CBS_EXPECTATION_ADMIN_STATE_UNLOCKED}
- Create Session cbs_sim_session ${CBS_BASE_URL} verify=false
- ${resp}= PUT On Session cbs_sim_session url=/clear data={"path": "/service_component_all/.*"}
- Should Be True ${resp.status_code} == 200
- Sleep 2 Allow CBS time to set expectation
- ${resp} = PUT On Session cbs_sim_session url=/expectation data=${data}
- Should Be True ${resp.status_code} == 201
-
AddCreatePolicyResponeToMrSim
${data}= Get Data From File ${MR_POLICY_RESPONSE_PNF_EXISTING}
Create Session mr_sim_session ${MR_SIM_BASE_URL} verify=false
Code Review / integration / csit.git / commitdiff