If 'disableHttp' is enabled then HTTP ports are replaced with HTTPS ports.
Also added the latest trustore with AAF issuer. And because certs for SDC
components have CN set to "sdc" - environment json must have the domain
names correctly too...it will not work with plain IPs.
The changes have been tested from CSIT perspective so if something is
missing here or wrong then it is due to the fact that I was focusing on
bringing https support to the same level as are http tests and there is
also the fact that I do not know SDC component at all.
The changes are also done in a manner of previous ones - hacked on top of
the current codebase, which is in dire need of a rewrite:
- duplicated trustores and other artifacts
- duplicated scripts and/or similar script with small differences
- ui tests use old ubuntu image vs api tests on alpine
- chef codebase is very messy and I see no benefit in the current usage
Issue-ID: SDC-2564
Signed-off-by: Petr Ospalý <p.ospaly@partner.samsung.com>
Change-Id: I32e0fb7723ab8489eb09372d410c6f34aaf7cfc8
"override_attributes": {
"FE": {
"http_port": "8181",
- "https_port": "9443"
+ "https_port": "9443",
+ "domain_name": "sdc"
},
"BE": {
"http_port": "8080",
- "https_port": "8443"
+ "https_port": "8443",
+ "domain_name": "sdc"
},
"ONBOARDING_BE": {
"http_port": "8081",
"https_port": "8445",
+ "domain_name": "sdc",
"catalog_notification_url": "%s://%s:%s/sdc2/rest/v1/catalog/notif/vsp/"
},
"elasticsearch": {
FROM onap/base_sdc-sanity:1.4.1
+# install packages
+RUN \
+ apk update \
+ && \
+ apk add --no-cache \
+ jq \
+ openssl \
+ && \
+ rm -rf /var/cache/apk/*
+
COPY chef-solo /root/chef-solo/
COPY chef-repo/cookbooks/. /root/chef-solo/cookbooks/
debug_port=8000
TEST_SUITES=testSuites
fileName=testng-failed.xml
+JAVA_OPTIONS="${JAVA_OPTIONS} \
+ -Djavax.net.ssl.trustStore=/var/lib/tests/etc/org.onap.sdc.trust.jks \
+ -Dtestng.show.stack.frames=true \
+ "
function help_usage ()
{
group 'root'
mode '0755'
action :create
- end
\ No newline at end of file
+ end
+
+ directory "create_etc_dir" do
+ path "/var/lib/tests/etc"
+ owner 'root'
+ group 'root'
+ mode '0755'
+ action :create
+ end
+
+cookbook_file "/var/lib/tests/etc/org.onap.sdc.trust.jks" do
+ source "org.onap.sdc.trust.jks"
+ owner "root"
+ group "root"
+ mode 0644
+end
\ No newline at end of file
mode "0755"
variables ({
:target_path => "#{tests_base}/target",
- :catalogBE_ip => node['Nodes']['BE'],
+ :catalogBE_host => node['Nodes']['BE'],
:catalogBE_port => node['BE'][:http_port],
- :webportal_ip => node['Nodes']['FE'],
+ :webportal_host => node['Nodes']['FE'],
:webportal_port => node['FE'][:http_port],
:janusgraph_file => "#{tests_base}/conf/janusgraph.properties",
:tests_base_ci => "#{tests_base}/CI/tests",
reportName: index.html
esHost: eshost
disributionClientHost: disClient
-catalogFeHost: <%= @webportal_ip %>
-catalogFePort: <%= @webportal_port %>
-catalogBeHost: <%= @catalogBE_ip %>
-catalogBePort: <%= @catalogBE_port %>
-onboardingBeHost: <%= node['ONBOARDING_BE_VIP'] %>
<% if node[:disableHttp] -%>
sdcHttpMethod: https
onboardingBePort: <%= node['ONBOARDING_BE'][:https_port] %>
+onboardingBeHost: <%= node['ONBOARDING_BE'][:domain_name] %>
+catalogBeHost: <%= node['BE'][:domain_name] %>
+catalogBePort: <%= node['BE'][:https_port] %>
+catalogFeHost: <%= node['FE'][:domain_name] %>
+catalogFePort: <%= node['FE'][:https_port] %>
<% else %>
sdcHttpMethod: http
onboardingBePort: <%= node['ONBOARDING_BE'][:http_port] %>
+onboardingBeHost: <%= node['ONBOARDING_BE_VIP'] %>
+catalogFeHost: <%= @webportal_host %>
+catalogFePort: <%= @webportal_port %>
+catalogBeHost: <%= @catalogBE_host %>
+catalogBePort: <%= @catalogBE_port %>
<% end -%>
disributionClientPort: 8181
esPort: 9200
#!/bin/bash
+# prepare env for HTTPS if used
+
+is_https=$(cat /root/chef-solo/environments/${ENVNAME}.json | \
+ jq -cr '.default_attributes.disableHttp' | \
+ tr '[:upper:]' '[:lower:]')
+
+if [ "$is_https" = true ] ; then
+ # setup /etc/hosts
+ SDC_FE_IP=$(cat /root/chef-solo/environments/${ENVNAME}.json | \
+ jq -cr '.default_attributes.Nodes.FE')
+ SDC_FE_HOSTNAME=$(cat /root/chef-solo/environments/${ENVNAME}.json | \
+ jq -cr '.override_attributes.FE.domain_name')
+ if ! grep -q "^[[:space:]]*${SDC_FE_IP}[[:space:]]" ; then
+ echo "${SDC_FE_IP}" "${SDC_FE_HOSTNAME}" >> /etc/hosts
+ fi
+fi
+
+# run tests
+
cd /root/chef-solo
chef-solo -c solo.rb -E ${ENVNAME}
FROM onap/base_sdc-vnc:1.4.1
+# install packages
+RUN DEBIAN_FRONTEND=noninteractive \
+ apt-get -y update \
+ && \
+ apt-get -y install \
+ jq \
+ openssl \
+ && \
+ apt-get -y clean
+
COPY chef-solo /root/chef-solo/
COPY chef-repo/cookbooks/. /root/chef-solo/cookbooks/
debug_port=8000
TEST_SUITES=testSuites
fileName=testng-failed.xml
+JAVA_OPTIONS="${JAVA_OPTIONS} \
+ -Djavax.net.ssl.trustStore=/var/lib/tests/etc/org.onap.sdc.trust.jks \
+ -Dtestng.show.stack.frames=true \
+ "
function help_usage ()
{
group 'root'
mode '0755'
action :create
- end
\ No newline at end of file
+ end
+
+ directory "create_etc_dir" do
+ path "/var/lib/tests/etc"
+ owner 'root'
+ group 'root'
+ mode '0755'
+ action :create
+ end
+
+cookbook_file "/var/lib/tests/etc/org.onap.sdc.trust.jks" do
+ source "org.onap.sdc.trust.jks"
+ owner "root"
+ group "root"
+ mode 0644
+end
\ No newline at end of file
group "root"
mode "0755"
variables ({
- :catalogBE_ip => node['Nodes']['BE'],
+ :catalogBE_host => node['Nodes']['BE'],
:catalogBE_port => node['BE'][:http_port],
- :webportal_ip => node['Nodes']['FE'],
+ :webportal_host => node['Nodes']['FE'],
:webportal_port => node['FE'][:http_port],
:janusgraph_file => "#{tests_base}/conf/janusgraph.properties",
:tests_base_ci => "#{tests_base}/CI/tests",
-url: http://<%= @webportal_ip %>:8285/sdc1
browser: firefox
uiSimulator: true
-catalogBeHost: <%= @catalogBE_ip %>
-catalogBePort: <%= @catalogBE_port %>
-catalogFeHost: <%= @webportal_ip %>
-catalogFePort: <%= @webportal_port %>
-onboardingBeHost: <%= node['ONBOARDING_BE_VIP'] %>
<% if node[:disableHttp] -%>
sdcHttpMethod: https
onboardingBePort: <%= node['ONBOARDING_BE'][:https_port] %>
+onboardingBeHost: <%= node['ONBOARDING_BE'][:domain_name] %>
+url: https://<%= node['FE'][:domain_name] %>:8286/sdc1
+catalogBeHost: <%= node['BE'][:domain_name] %>
+catalogBePort: <%= node['BE'][:https_port] %>
+catalogFeHost: <%= node['FE'][:domain_name] %>
+catalogFePort: <%= node['FE'][:https_port] %>
<% else %>
sdcHttpMethod: http
onboardingBePort: <%= node['ONBOARDING_BE'][:http_port] %>
+onboardingBeHost: <%= node['ONBOARDING_BE_VIP'] %>
+url: http://<%= @webportal_host %>:8285/sdc1
+catalogBeHost: <%= @catalogBE_host %>
+catalogBePort: <%= @catalogBE_port %>
+catalogFeHost: <%= @webportal_host %>
+catalogFePort: <%= @webportal_port %>
<% end -%>
-
-
esHost: <%= @ES_IP %>
esPort: 9200
disributionClientHost: disClient
errorConfigurationFile: <%= @errorConfigurationFile %>
configurationFile: <%= @ConfigurationFile %>
importTypesConfigDir: <%= @importTypesDir %>
-janusGraphPropertiesFile: <%= @janusgraph_file %>
\ No newline at end of file
+janusGraphPropertiesFile: <%= @janusgraph_file %>
/dockerstartup/vnc_startup.sh &
+# prepare env for HTTPS if used
+
+is_https=$(cat /root/chef-solo/environments/${ENVNAME}.json | \
+ jq -cr '.default_attributes.disableHttp' | \
+ tr '[:upper:]' '[:lower:]')
+
+if [ "$is_https" = true ] ; then
+ # setup /etc/hosts
+ SDC_FE_IP=$(cat /root/chef-solo/environments/${ENVNAME}.json | \
+ jq -cr '.default_attributes.Nodes.FE')
+ SDC_FE_HOSTNAME=$(cat /root/chef-solo/environments/${ENVNAME}.json | \
+ jq -cr '.override_attributes.FE.domain_name')
+ if ! grep -q "^[[:space:]]*${SDC_FE_IP}[[:space:]]" ; then
+ echo "${SDC_FE_IP}" "${SDC_FE_HOSTNAME}" >> /etc/hosts
+ fi
+fi
+
+# run tests
+
cd /root/chef-solo
chef-solo -c solo.rb -E ${ENVNAME}
Code Review / sdc.git / commitdiff