[PMSH] Updating csits for CBS module
Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: I4932bd4e5ab6b6d8fe524290079edd1093d49394
Issue-ID: DCAEGEN2-2156
diff --git a/plans/dcaegen2-services-pmsh/testsuite/assets/aai-initializer.json b/plans/dcaegen2-services-pmsh/testsuite/assets/aai_sim/aai-initializer.json
similarity index 100%
rename from plans/dcaegen2-services-pmsh/testsuite/assets/aai-initializer.json
rename to plans/dcaegen2-services-pmsh/testsuite/assets/aai_sim/aai-initializer.json
diff --git a/plans/dcaegen2-services-pmsh/testsuite/assets/mockserver.properties b/plans/dcaegen2-services-pmsh/testsuite/assets/aai_sim/aai_mockserver.properties
similarity index 100%
copy from plans/dcaegen2-services-pmsh/testsuite/assets/mockserver.properties
copy to plans/dcaegen2-services-pmsh/testsuite/assets/aai_sim/aai_mockserver.properties
diff --git a/plans/dcaegen2-services-pmsh/testsuite/assets/cbs-initializer.json b/plans/dcaegen2-services-pmsh/testsuite/assets/cbs_sim/cbs-initializer.json
similarity index 94%
rename from plans/dcaegen2-services-pmsh/testsuite/assets/cbs-initializer.json
rename to plans/dcaegen2-services-pmsh/testsuite/assets/cbs_sim/cbs-initializer.json
index 2388809..1a1ba9e 100644
--- a/plans/dcaegen2-services-pmsh/testsuite/assets/cbs-initializer.json
+++ b/plans/dcaegen2-services-pmsh/testsuite/assets/cbs_sim/cbs-initializer.json
@@ -82,7 +82,7 @@
"dmaap_info": {
"client_id": "1475976809466",
"client_role": "org.onap.dcae.pmPublisher",
- "topic_url": "https://mr-sim:1080/events/org.onap.dmaap.mr.PM_SUBSCRIPTIONS",
+ "topic_url": "https://mr-sim:3095/events/org.onap.dmaap.mr.PM_SUBSCRIPTIONS",
"location": "san-francisco"
},
"type": "message_router"
@@ -94,14 +94,14 @@
"dmaap_info": {
"client_id": "1575976809466",
"client_role": "org.onap.dcae.aaiSub",
- "topic_url": "https://mr-sim:1080/events/AAI_EVENT",
+ "topic_url": "https://mr-sim:3095/events/AAI_EVENT",
"location": "san-francisco"
}
},
"policy_pm_subscriber": {
"dmaap_info": {
"location": "san-francisco",
- "topic_url": "https://mr-sim:1080/events/org.onap.dmaap.mr.PM_SUBSCRIPTIONS",
+ "topic_url": "https://mr-sim:3095/events/org.onap.dmaap.mr.PM_SUBSCRIPTIONS",
"client_role": "org.onap.dcae.pmSubscriber",
"client_id": "1575876809456"
},
diff --git a/plans/dcaegen2-services-pmsh/testsuite/assets/cbs_sim/cbs_mockserver.properties b/plans/dcaegen2-services-pmsh/testsuite/assets/cbs_sim/cbs_mockserver.properties
new file mode 100644
index 0000000..0ef573f
--- /dev/null
+++ b/plans/dcaegen2-services-pmsh/testsuite/assets/cbs_sim/cbs_mockserver.properties
@@ -0,0 +1,31 @@
+#######################################
+# 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
diff --git a/plans/dcaegen2-services-pmsh/testsuite/assets/mr-initializer.json b/plans/dcaegen2-services-pmsh/testsuite/assets/mr_sim/mr-initializer.json
similarity index 100%
rename from plans/dcaegen2-services-pmsh/testsuite/assets/mr-initializer.json
rename to plans/dcaegen2-services-pmsh/testsuite/assets/mr_sim/mr-initializer.json
diff --git a/plans/dcaegen2-services-pmsh/testsuite/assets/mockserver.properties b/plans/dcaegen2-services-pmsh/testsuite/assets/mr_sim/mr_mockserver.properties
similarity index 100%
rename from plans/dcaegen2-services-pmsh/testsuite/assets/mockserver.properties
rename to plans/dcaegen2-services-pmsh/testsuite/assets/mr_sim/mr_mockserver.properties
diff --git a/plans/dcaegen2-services-pmsh/testsuite/assets/cert.pem b/plans/dcaegen2-services-pmsh/testsuite/assets/ssl_certs/cert.pem
similarity index 99%
rename from plans/dcaegen2-services-pmsh/testsuite/assets/cert.pem
rename to plans/dcaegen2-services-pmsh/testsuite/assets/ssl_certs/cert.pem
index 1f789ba..5bb1bb9 100644
--- a/plans/dcaegen2-services-pmsh/testsuite/assets/cert.pem
+++ b/plans/dcaegen2-services-pmsh/testsuite/assets/ssl_certs/cert.pem
@@ -29,4 +29,4 @@
A5EVnjxW61yFopcaAvjeRqH/tKtZBrEqzLmpyqbFlMaSVyJ+4L3G+DPZUbX0ypod
9ouIpBUmGIUyVZYKZdtZgDcz8gEVyHVvReRegpWK4PqTK1Sp5V4AL+KsvtB/Lkk1
WA==
------END CERTIFICATE-----
+-----END CERTIFICATE-----
\ No newline at end of file
diff --git a/plans/dcaegen2-services-pmsh/testsuite/assets/key.pem b/plans/dcaegen2-services-pmsh/testsuite/assets/ssl_certs/key.pem
similarity index 99%
rename from plans/dcaegen2-services-pmsh/testsuite/assets/key.pem
rename to plans/dcaegen2-services-pmsh/testsuite/assets/ssl_certs/key.pem
index eddafc1..15fa361 100644
--- a/plans/dcaegen2-services-pmsh/testsuite/assets/key.pem
+++ b/plans/dcaegen2-services-pmsh/testsuite/assets/ssl_certs/key.pem
@@ -49,4 +49,4 @@
rX/cdAJnlkzAT4PsrnqoLr8jb2lGpXTm8xsW0wJWa6gzGC2kHHEsUbo0k3Vu1Uaz
6yBjLYXBP7txiHjkLmoPlXfzEh6ls5yFsg8Yb63NRS0T1Kvb3U1edrf78axK1JBD
hbGjpWWdg2ta42RD3MB/wgEAesncd+r4
------END PRIVATE KEY-----
+-----END PRIVATE KEY-----
\ No newline at end of file
diff --git a/plans/dcaegen2-services-pmsh/testsuite/assets/ssl_certs/mock_server_cacert.pem b/plans/dcaegen2-services-pmsh/testsuite/assets/ssl_certs/mock_server_cacert.pem
new file mode 100644
index 0000000..33a8b28
--- /dev/null
+++ b/plans/dcaegen2-services-pmsh/testsuite/assets/ssl_certs/mock_server_cacert.pem
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDqDCCApCgAwIBAgIEPhwe6TANBgkqhkiG9w0BAQsFADBiMRswGQYDVQQDDBJ3
+d3cubW9ja3NlcnZlci5jb20xEzARBgNVBAoMCk1vY2tTZXJ2ZXIxDzANBgNVBAcM
+BkxvbmRvbjEQMA4GA1UECAwHRW5nbGFuZDELMAkGA1UEBhMCVUswIBcNMTYwNjIw
+MTYzNDE0WhgPMjExNzA1MjcxNjM0MTRaMGIxGzAZBgNVBAMMEnd3dy5tb2Nrc2Vy
+dmVyLmNvbTETMBEGA1UECgwKTW9ja1NlcnZlcjEPMA0GA1UEBwwGTG9uZG9uMRAw
+DgYDVQQIDAdFbmdsYW5kMQswCQYDVQQGEwJVSzCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAPGORrdkwTY1H1dvQPYaA+RpD+pSbsvHTtUSU6H7NQS2qu1p
+sE6TEG2fE+Vb0QIXkeH+jjKzcfzHGCpIU/0qQCu4RVycrIW4CCdXjl+T3L4C0I3R
+mIMciTig5qcAvY9P5bQAdWDkU36YGrCjGaX3QlndGxD9M974JdpVK4cqFyc6N4gA
+Onys3uS8MMmSHTjTFAgR/WFeJiciQnal+Zy4ZF2x66CdjN+hP8ch2yH/CBwrSBc0
+ZeH2flbYGgkh3PwKEqATqhVa+mft4dCrvqBwGhBTnzEGWK/qrl9xB4mTs4GQ/Z5E
+8rXzlvpKzVJbfDHfqVzgFw4fQFGV0XMLTKyvOX0CAwEAAaNkMGIwHQYDVR0OBBYE
+FH3W3sL4XRDM/VnRayaSamVLISndMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQD
+AgG2MCMGA1UdJQQcMBoGCCsGAQUFBwMBBggrBgEFBQcDAgYEVR0lADANBgkqhkiG
+9w0BAQsFAAOCAQEAecfgKuMxCBe/NxVqoc4kzacf9rjgz2houvXdZU2UDBY3hCs4
+MBbM7U9Oi/3nAoU1zsA8Rg2nBwc76T8kSsfG1TK3iJkfGIOVjcwOoIjy3Z8zLM2V
+YjYbOUyAQdO/s2uShAmzzjh9SV2NKtcNNdoE9e6udvwDV8s3NGMTUpY5d7BHYQqV
+sqaPGlsKi8dN+gdLcRbtQo29bY8EYR5QJm7QJFDI1njODEnrUjjMvWw2yjFlje59
+j/7LBRe2wfNmjXFYm5GqWft10UJ7Ypb3XYoGwcDac+IUvrgmgTHD+E3klV3SUi8i
+Gm5MBedhPkXrLWmwuoMJd7tzARRHHT6PBH/ZGw==
+-----END CERTIFICATE-----
diff --git a/plans/dcaegen2-services-pmsh/testsuite/assets/ssl_certs/mock_server_key.pem b/plans/dcaegen2-services-pmsh/testsuite/assets/ssl_certs/mock_server_key.pem
new file mode 100644
index 0000000..2d5fe6d
--- /dev/null
+++ b/plans/dcaegen2-services-pmsh/testsuite/assets/ssl_certs/mock_server_key.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDxjka3ZME2NR9X
+b0D2GgPkaQ/qUm7Lx07VElOh+zUEtqrtabBOkxBtnxPlW9ECF5Hh/o4ys3H8xxgq
+SFP9KkAruEVcnKyFuAgnV45fk9y+AtCN0ZiDHIk4oOanAL2PT+W0AHVg5FN+mBqw
+oxml90JZ3RsQ/TPe+CXaVSuHKhcnOjeIADp8rN7kvDDJkh040xQIEf1hXiYnIkJ2
+pfmcuGRdseugnYzfoT/HIdsh/wgcK0gXNGXh9n5W2BoJIdz8ChKgE6oVWvpn7eHQ
+q76gcBoQU58xBliv6q5fcQeJk7OBkP2eRPK185b6Ss1SW3wx36lc4BcOH0BRldFz
+C0ysrzl9AgMBAAECggEAAr70TNdnXt9huNO58FJBYxJSrP485jIg0klADCJX6vLM
+pKBD8dC4KhbZ2gyeJqDv9pq3MRpbHF2DB9AErGcTjautliztxSNfbFsRckKzCrHr
+fwE3852abbteg919SijFWrN6ohxWWqUOAJ4KB5n09iKOUTYfpdQ6Ue4P7Zxr4PVB
+zvwLsDjZvco2q6DkKuoO5pLUaUxSeuATtnikOcfZxM+lefdemN0CpgbVZ4xtyefp
+kENYaWL3NygSPL422+kdcD0ori/TZpKDua2c/AbsBSOPku5wYHIjYi6gKNwaT17D
+M+E8tudk5j9cX6C1/tyOHHHVM20C0gtbAxHaiYGA3QKBgQD5g7GaE7ykaPJ2hSNG
+++nMMzMWdxMe6bm2kcMWeVWkQiy8SbK530ul7o3dDb3vWCrfyFcTfq+ZCg7pDw8A
+szwm9F7ay1Yr8FXKn4A557EFBolZpugajCA+BDvC39DslOgTD8+IOyRql41C6/32
+aQ+2H9mu9HBXCr/o1UG00q/5YwKBgQD31Z/VlGS6x2abDUKUVDM5LqY1j6r5xUrK
+7rrJkKHJ2F7xnsmkiDNoAf2uOhw2i7/9CXvYJlNnJducmFRJK5rxu/63ddQnVDrd
+vZiQL1Qy6aIqkVRt8XHXrVTDoyRO1kygzNjc26yI8Zk/JmwVkPS6MmRWfJL+N//P
+urK0l6nnnwKBgHog2bd+3aDjtXoJpMDD4SYQEXt3gSZqZHpWUlUXwrGJqnfm4tJT
+16U6ZLnEVilm0GWEnApwweZ4o9+zfTZshI7UofEaAe2zz2pEM/Ej1OOO1X/KUGVe
+HRH95Hp4Lrz+DbH21S/rMuHxmDUfaclIl2YfpN8byjjwjAqdB3JIhdXdAoGAHwz5
+yJWeBTTEazq/E7x06n4ovt8wKbkJROGiL2zaiGJ+isE9PEsAPdC6CuEm9cKOnFJa
+3Nr4ahz5JeaD8OLwt8a5BB1UJlVMRsnhWndDkllpQvIQZPHyNHZ3/0bqXqJE2YSw
+ywMO292BOMNEmXMe5lE39woGlKlJeKpIh43U8LsCgYAKl7GlVA547z0975B2nv4a
+YeWzt20plkSyENv2V65DVogY0lKNpMNgttH0+UkZkJ03jFQ8n7EaKzwKhVxhvcg0
+tHXNTuAECG7uhT4aLjBUA4KTMNFjsDrSM5RnvM86U6noIrNl0UirJsrIzX/FiBd4
+B00j3wnIg+Ix1l+X44GneQ==
+-----END PRIVATE KEY-----
\ No newline at end of file
diff --git a/plans/dcaegen2-services-pmsh/testsuite/docker-compose.yml b/plans/dcaegen2-services-pmsh/testsuite/docker-compose.yml
index 0ad8453..ed991c3 100644
--- a/plans/dcaegen2-services-pmsh/testsuite/docker-compose.yml
+++ b/plans/dcaegen2-services-pmsh/testsuite/docker-compose.yml
@@ -18,8 +18,8 @@
MOCKSERVER_PROPERTY_FILE: /config/mockserver.properties
MOCKSERVER_INITIALIZATION_JSON_PATH: /config/aai-initializer.json
volumes:
- - ./assets/mockserver.properties:/config/mockserver.properties
- - ./assets/aai-initializer.json:/config/aai-initializer.json
+ - ./assets/aai_sim/aai_mockserver.properties:/config/mockserver.properties
+ - ./assets/aai_sim/aai-initializer.json:/config/aai-initializer.json
networks:
pmsh-network:
@@ -29,9 +29,13 @@
environment:
MOCKSERVER_PROPERTY_FILE: /config/mockserver.properties
MOCKSERVER_INITIALIZATION_JSON_PATH: /config/cbs-initializer.json
+ LOG_LEVEL: "DEBUG"
+ SERVER_PORT: 10443
volumes:
- - ./assets/mockserver.properties:/config/mockserver.properties
- - ./assets/cbs-initializer.json:/config/cbs-initializer.json
+ - ./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:
pmsh-network:
@@ -41,29 +45,32 @@
environment:
MOCKSERVER_PROPERTY_FILE: /config/mockserver.properties
MOCKSERVER_INITIALIZATION_JSON_PATH: /config/mr-initializer.json
+ LOG_LEVEL: "DEBUG"
+ SERVER_PORT: 3095
volumes:
- - ./assets/mockserver.properties:/config/mockserver.properties
- - ./assets/mr-initializer.json:/config/mr-initializer.json
+ - ./assets/mr_sim/mr_mockserver.properties:/config/mockserver.properties
+ - ./assets/mr_sim/mr-initializer.json:/config/mr-initializer.json
networks:
pmsh-network:
pmsh:
container_name: pmsh
- image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.pmsh:1.0.1
+ image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.pmsh:latest
depends_on:
- db
volumes:
- - ./assets/cert.pem:/opt/app/pmsh/etc/certs/cert.pem
- - ./assets/key.pem:/opt/app/pmsh/etc/certs/key.pem
+ - ./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
environment:
HOSTNAME: "dcae-pmsh"
- CONFIG_BINDING_SERVICE_SERVICE_HOST: cbs-sim
- CONFIG_BINDING_SERVICE_SERVICE_PORT: 1080
+ CONFIG_BINDING_SERVICE: cbs-sim
PMSH_PG_URL: db
PMSH_PG_USERNAME: $DB_USER
PMSH_PG_PASSWORD: $DB_PASSWORD
AAI_SERVICE_HOST: aai-sim
- AAI_SERVICE_PORT_AAI_SSL: 1080
+ AAI_SERVICE_PORT: 1080
+ DCAE_CA_CERTPATH: '/opt/app/pmsh/etc/certs/cacert.pem'
networks:
pmsh-network:
diff --git a/tests/dcaegen2-services-pmsh/testcases/assets/cbs-expectation-unlocked-config.json b/tests/dcaegen2-services-pmsh/testcases/assets/cbs-expectation-unlocked-config.json
index 6f6972f..569e938 100644
--- a/tests/dcaegen2-services-pmsh/testcases/assets/cbs-expectation-unlocked-config.json
+++ b/tests/dcaegen2-services-pmsh/testcases/assets/cbs-expectation-unlocked-config.json
@@ -82,7 +82,7 @@
"dmaap_info": {
"client_id": "1475976809466",
"client_role": "org.onap.dcae.pmPublisher",
- "topic_url": "https://mr-sim:1080/events/org.onap.dmaap.mr.PM_SUBSCRIPTIONS",
+ "topic_url": "https://mr-sim:3095/events/org.onap.dmaap.mr.PM_SUBSCRIPTIONS",
"location": "san-francisco"
},
"type": "message_router"
@@ -94,14 +94,14 @@
"dmaap_info": {
"client_id": "1575976809466",
"client_role": "org.onap.dcae.aaiSub",
- "topic_url": "https://mr-sim:1080/events/AAI_EVENT",
+ "topic_url": "https://mr-sim:3095/events/AAI_EVENT",
"location": "san-francisco"
}
},
"policy_pm_subscriber": {
"dmaap_info": {
"location": "san-francisco",
- "topic_url": "https://mr-sim:1080/events/org.onap.dmaap.mr.PM_SUBSCRIPTIONS",
+ "topic_url": "https://mr-sim:3095/events/org.onap.dmaap.mr.PM_SUBSCRIPTIONS",
"client_role": "org.onap.dcae.pmSubscriber",
"client_id": "1575876809456"
},
diff --git a/tests/dcaegen2-services-pmsh/testcases/pmsh.robot b/tests/dcaegen2-services-pmsh/testcases/pmsh.robot
index 95b78c2..ebdae84 100644
--- a/tests/dcaegen2-services-pmsh/testcases/pmsh.robot
+++ b/tests/dcaegen2-services-pmsh/testcases/pmsh.robot
@@ -15,8 +15,8 @@
*** Variables ***
${PMSH_BASE_URL} https://${PMSH_IP}:8443
-${MR_BASE_URL} http://${MR_SIM_IP_ADDRESS}:1080
-${CBS_BASE_URL} http://${CBS_SIM_IP_ADDRESS}:1080
+${MR_BASE_URL} https://${MR_SIM_IP_ADDRESS}:3095
+${CBS_BASE_URL} https://${CBS_SIM_IP_ADDRESS}:10443
${HEALTHCHECK_ENDPOINT} /healthcheck
${MR_EXPECTATION_AAI_PNF_CREATED} %{WORKSPACE}/tests/dcaegen2-services-pmsh/testcases/assets/mr-expectation-aai-pnf-created.json
@@ -27,8 +27,8 @@
${ADMIN_STATE_LOCKED_PATTERN} 'administrativeState': 'LOCKED'
${ADMIN_STATE_UNLOCKED_PATTERN} 'administrativeState': 'UNLOCKED'
-${CLI_EXEC_GET_CBS_CONFIG_FIRST} docker exec pmsh /bin/sh -c "grep -m 1 'PMSH Configuration from Configbinding Service' /var/log/ONAP/dcaegen2/services/pmsh/debug.log"
-${CLI_EXEC_GET_CBS_CONFIG_LAST} docker exec pmsh /bin/sh -c "grep 'PMSH Configuration from Configbinding Service' /var/log/ONAP/dcaegen2/services/pmsh/debug.log | tail -1"
+${CLI_EXEC_GET_CBS_CONFIG_FIRST} docker exec pmsh /bin/sh -c "grep -m 1 'PMSH config from CBS' /var/log/ONAP/dcaegen2/services/pmsh/debug.log"
+${CLI_EXEC_GET_CBS_CONFIG_LAST} docker exec pmsh /bin/sh -c "grep 'PMSH config from CBS' /var/log/ONAP/dcaegen2/services/pmsh/debug.log | tail -1"
${DB_CMD_NETWORK_FUNCTIONS_COUNT} docker exec db bash -c "psql -U pmsh -d pmsh -A -t -c 'select count(*) from network_functions;'"
${DB_CMD_NF_TO_SUB_REL_COUNT} docker exec db bash -c "psql -U pmsh -d pmsh -A -t -c 'select count(*) from nf_to_sub_rel;'"