diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 46fdeec..309831a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -22,7 +22,7 @@ jobs: - name: Build and Upload to pypi run: | python3 setup.py sdist bdist_wheel - python3 -m twine upload dist/* + python3 -m twine upload dist/* --verbose env: TWINE_USERNAME: __token__ TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }} diff --git a/HISTORY.rst b/HISTORY.rst index d0bf5fa..057ce5e 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -2,6 +2,12 @@ History ======= +------------------- +1.0.11 (2023-09-12) +------------------- +* Bug fix on validation pipeline. Take into account that domainName may not be present in the service description (aefProfile) +* Requirements file has been updated to remove package conflicts. Also, deploy yaml has been updated for better debugging issues. + ------------------- 1.0.10 (2023-09-11) ------------------- diff --git a/evolved5g/nef_and_tsn_api_service_validation_pipeline.py b/evolved5g/nef_and_tsn_api_service_validation_pipeline.py index c7e6752..32d99bb 100644 --- a/evolved5g/nef_and_tsn_api_service_validation_pipeline.py +++ b/evolved5g/nef_and_tsn_api_service_validation_pipeline.py @@ -39,7 +39,7 @@ def validate_all_endpoints_returned_by_service_discoverer(config_file_full_path: host_info = aef_profile['interfaceDescriptions'][0] tsn_port = host_info["port"] - if aef_profile['domainName']!=None: + if "domainName" in aef_profile and aef_profile['domainName']!=None: tsn_host = aef_profile['domainName'] else: tsn_host = host_info["ipv4Addr"] @@ -52,7 +52,7 @@ def validate_all_endpoints_returned_by_service_discoverer(config_file_full_path: return True def __get_nef_url(aef_profile) -> str: - if aef_profile['domainName']!=None: + if "domainName" in aef_profile and aef_profile['domainName']!=None: return "https://{domain_name}".format(domain_name=aef_profile['domainName']) else: host_info = aef_profile['interfaceDescriptions'][0] @@ -229,7 +229,7 @@ def __test_tsn_manager(config,tsn_host,tsn_port): folder_path_for_certificates_and_capif_api_key=config["folder_to_store_certificates"], capif_host=config["capif_host"], capif_https_port=config["capif_https_port"], - https=False, + https=True, tsn_host=tsn_host, tsn_port=tsn_port ) diff --git a/requirements.txt b/requirements.txt index a0cdfa3..23bfb04 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ watchdog==0.9.0 flake8==3.9.2 coverage==4.5.4 Click==8.0.1 -pytest==6.2.4 +pytest cookiecutter==2.1.1 invoke==1.6.0 requests==2.26.0 @@ -12,3 +12,4 @@ certifi~=2021.10.8 urllib3~=1.26.7 typing-extensions==3.10.0.2 pyopenssl==22.1.0 + diff --git a/requirements_dev.txt b/requirements_dev.txt index 0fe1cf0..dbfdbea 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -6,11 +6,12 @@ watchdog==0.9.0 flake8==3.9.2 tox coverage==4.5.4 -Sphinx==1.8.5 +Sphinx twine Click==8.0.1 -pytest==6.2.4 +pytest cookiecutter==2.1.1 invoke==1.6.0 requests==2.26.0 build + diff --git a/setup.cfg b/setup.cfg index 496a317..072f40f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.0.10 +current_version = 1.0.11 commit = True tag = True diff --git a/setup.py b/setup.py index edf6642..52a3f80 100644 --- a/setup.py +++ b/setup.py @@ -48,6 +48,6 @@ test_suite="tests", tests_require=test_requirements, url="https://github.com/EVOLVED-5G/SDK-CLI", - version="1.0.10", + version="1.0.11", zip_safe=False, )