Change-Id: I1bfd82b6f58edfd9dd6f9030e86f5519f2f38aea
Issue-ID: INT-2201
Signed-off-by: waqas.ikram <waqas.ikram@est.tech>
/tests/aaf/certservice/tmp/*
/tests/oom-platform-cert-service/postprocessor/tmp/*
/tests/aaf/certservice/tmp/*
/tests/oom-platform-cert-service/postprocessor/tmp/*
#reinstall pyopenssl library
echo "Reinstall pyopenssl library."
pip uninstall pyopenssl -y
#reinstall pyopenssl library
echo "Reinstall pyopenssl library."
pip uninstall pyopenssl -y
-pip install pyopenssl==17.5.0
+pip install pyopenssl==23.0.0
#install pyjks for .jks files management
pip install pyjks
#install pyjks for .jks files management
pip install pyjks
do
OOMCERT_IP=`get-instance-ip.sh oomcert-service`
RESP_CODE=$(curl -s https://localhost:8443/actuator/health --cacert ./certs/root.crt --cert-type p12 --cert ./certs/certServiceServer-keystore.p12 --pass secret | \
do
OOMCERT_IP=`get-instance-ip.sh oomcert-service`
RESP_CODE=$(curl -s https://localhost:8443/actuator/health --cacert ./certs/root.crt --cert-type p12 --cert ./certs/certServiceServer-keystore.p12 --pass secret | \
- python2 -c 'import json,sys;obj=json.load(sys.stdin);print obj["status"]')
+ python3 -c 'import json,sys;obj=json.load(sys.stdin);print (obj["status"])')
if [[ "$RESP_CODE" == "UP" ]]; then
echo 'OOM Cert Service is ready'
export OOMCERT_IP=${OOMCERT_IP}
if [[ "$RESP_CODE" == "UP" ]]; then
echo 'OOM Cert Service is ready'
export OOMCERT_IP=${OOMCERT_IP}
#Robot functions that will be shared also with other tests
*** Settings ***
Library OperatingSystem
#Robot functions that will be shared also with other tests
*** Settings ***
Library OperatingSystem
-Library HttpLibrary.HTTP
*** Keywords ***
json_from_file
*** Keywords ***
json_from_file
return SANS_DELIMITER.join(sans_strings)
def remove_nones_from_dict(self, dictionary):
return SANS_DELIMITER.join(sans_strings)
def remove_nones_from_dict(self, dictionary):
- return dict((k, v) for k, v in dictionary.iteritems() if k is not None)
+ return dict((k, v) for k, v in dictionary.items() if k is not None)
def get_list_of_pairs_by_mappings(self, list):
mappings = self.get_mappings()
def get_list_of_pairs_by_mappings(self, list):
mappings = self.get_mappings()
self.create_mount_dir()
client = docker.from_env()
environment = EnvsReader().read_env_list_from_file(path_to_env)
self.create_mount_dir()
client = docker.from_env()
environment = EnvsReader().read_env_list_from_file(path_to_env)
environment.append("REQUEST_URL=" + request_url)
container = client.containers.run(
image=client_image,
environment.append("REQUEST_URL=" + request_url)
container = client.containers.run(
image=client_image,
def remove_client_container_and_save_logs(self, container_name, log_file_name):
client = docker.from_env()
container = client.containers.get(container_name)
def remove_client_container_and_save_logs(self, container_name, log_file_name):
client = docker.from_env()
container = client.containers.get(container_name)
- text_file = open(ARCHIVES_PATH + "client_container_" + log_file_name + ".log", "w")
+ text_file = open(ARCHIVES_PATH + "client_container_" + log_file_name + ".log", "wb")
text_file.write(container.logs())
text_file.close()
container.remove()
text_file.write(container.logs())
text_file.close()
container.remove()
def parse_response(response):
def parse_response(response):
- certChain = response["certificateChain"]
- return "".join(certChain).encode("base64").replace("\n", "").strip()
+ cert_chain = response["certificateChain"]
+ encoded_bytes = base64.b64encode(bytes("".join(cert_chain), 'utf-8'))
+ base64_str = encoded_bytes.decode('utf-8')
+ return base64_str.replace("\n", "").strip()
Resource ../../../common.robot
Resource ./cert-service-properties.robot
Library RequestsLibrary
Resource ../../../common.robot
Resource ./cert-service-properties.robot
Library RequestsLibrary
-Library HttpLibrary.HTTP
Library Collections
Library Process
Library DateTime
Library Collections
Library Process
Library DateTime
Library ../libraries/JksArtifactsValidator.py ${MOUNT_PATH}
Library ../libraries/PemArtifactsValidator.py ${MOUNT_PATH}
Library ../libraries/ResponseParser.py
Library ../libraries/JksArtifactsValidator.py ${MOUNT_PATH}
Library ../libraries/PemArtifactsValidator.py ${MOUNT_PATH}
Library ../libraries/ResponseParser.py
Validate Recieved Response
[Documentation] Validare message that has been received
[Arguments] ${resp} ${key} ${expected_value}
Validate Recieved Response
[Documentation] Validare message that has been received
[Arguments] ${resp} ${key} ${expected_value}
- ${json}= Parse Json ${resp.content}
+ ${json}= Evaluate json.loads(r"""${resp.content}""", strict=False) json
${value}= Get From Dictionary ${json} ${key}
${value}= Get From Dictionary ${json} ${key}
+ Log To Console ${value}
Should Be Equal As Strings ${value} ${expected_value}
Send Get Request And Validate Response
Should Be Equal As Strings ${value} ${expected_value}
Send Get Request And Validate Response
Check Message Recieved On Success
[Documentation] Check if correct messsage has been sent on successful request
[Arguments] ${content}
Check Message Recieved On Success
[Documentation] Check if correct messsage has been sent on successful request
[Arguments] ${content}
- ${resp_content}= Parse Json ${content}
+ ${resp_content}= Evaluate json.loads(r"""${content}""", strict=False) json
Dictionary Should Contain Key ${resp_content} certificateChain
@{list}= Get From Dictionary ${resp_content} certificateChain
List Should Contain Certificates @{list}
Dictionary Should Contain Key ${resp_content} certificateChain
@{list}= Get From Dictionary ${resp_content} certificateChain
List Should Contain Certificates @{list}
[Arguments] ${path} ${csr_file} ${pk_file}
[Return] ${base64Certificate}
${resp}= Send Get Request with Header ${path} ${csr_file} ${pk_file}
[Arguments] ${path} ${csr_file} ${pk_file}
[Return] ${base64Certificate}
${resp}= Send Get Request with Header ${path} ${csr_file} ${pk_file}
- ${json}= Parse Json ${resp.content}
+ ${json}= Evaluate json.loads(r"""${resp.content}""", strict=False) json
${base64Certificate}= Parse Response ${json}
Send Certificate Update Request And Return Response
${base64Certificate}= Parse Response ${json}
Send Certificate Update Request And Return Response
class JksValidator:
def get_jks_entries(self, jks_path, password_path):
class JksValidator:
def get_jks_entries(self, jks_path, password_path):
- store = jks.KeyStore.load(jks_path, open(password_path, 'rb').read())
+ passphrase = open(password_path, 'rb').read().decode("utf-8")
+ store = jks.KeyStore.load(jks_path, passphrase)
return store.entries
def assert_jks_truststores_equal(self, result_truststore_path, password_path, expected_truststore_path):
return store.entries
def assert_jks_truststores_equal(self, result_truststore_path, password_path, expected_truststore_path):
def get_list_of_pem_certificates(self, path):
def get_list_of_pem_certificates(self, path):
- return re.findall(BEGIN_CERT + '(.+?)' + END_CERT, open(path, 'rb').read(), re.DOTALL)
+ content = open(path, 'rb').read().decode("utf-8")
+ return re.findall(BEGIN_CERT + '(.+?)' + END_CERT, content, re.DOTALL)
def remove_container_and_save_logs(self, container_name, log_file_name):
client = docker.from_env()
container = client.containers.get(container_name)
def remove_container_and_save_logs(self, container_name, log_file_name):
client = docker.from_env()
container = client.containers.get(container_name)
- text_file = open(ARCHIVES_PATH + "certservice_postprocessor_container_" + log_file_name + ".log", "w")
+ text_file = open(ARCHIVES_PATH + "certservice_postprocessor_container_" + log_file_name + ".log", "wb")
text_file.write(container.logs())
text_file.close()
container.remove()
text_file.write(container.logs())
text_file.close()
container.remove()