diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d76bd4217ecef4423f62ef68e5a9275c5c19006..191e73955dc2add04f347e4981892255a1da7c17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [1.1.3] - 2024-05-31 +### Fixed +- assert disabled projects + ## [1.1.2] - 2024-05-30 ### Fixed - attach FIP to correct virtual NIC diff --git a/ci/project-migrator.py b/ci/project-migrator.py index 52caacd4bbd1b5d072e6dd162bf11c7854e1c733..464fc6786a921e47f304ec5f0040e28f260e5259 100755 --- a/ci/project-migrator.py +++ b/ci/project-migrator.py @@ -54,20 +54,22 @@ def main(args): source_project = lib.get_ostack_project(source_migrator_conn, source_project_name) lib.log_or_assert(args, f"B.01 Source OpenStack cloud project (name:{source_project_name}) exists", source_project) source_project_type = lib.get_ostack_project_type(source_migrator_conn, source_project) - lib.log_or_assert(args, f"B.02 Source OpenStack cloud project type is {source_project_type}", - source_project_type) + lib.log_or_assert(args, "B.02 Source OpenStack cloud project is enabled", source_project.is_enabled) + lib.log_or_assert(args, f"B.03 Source OpenStack cloud project type is {source_project_type}", + source_project_type) destination_project = lib.get_ostack_project(destination_migrator_conn, destination_project_name) lib.log_or_assert(args, f"B.10 Destination OpenStack cloud project (name:{destination_project_name}) exists", destination_project) + lib.log_or_assert(args, "B.11 Destination OpenStack cloud project is enabled", destination_project.is_enabled) destination_project_type = lib.get_ostack_project_type(destination_migrator_conn, destination_project) - lib.log_or_assert(args, f"B.11 Destination OpenStack cloud project type is {destination_project_type}", + lib.log_or_assert(args, f"B.12 Destination OpenStack cloud project type is {destination_project_type}", destination_project_type) - lib.log_or_assert(args, "B.12 Source and destination project types match", + lib.log_or_assert(args, "B.13 Source and destination project types match", source_project_type == destination_project_type) if destination_project_type == 'group' and lib.executed_in_ci(): lib.log_or_assert(args, - "B.13 Cloud group project migration is executed by authorized person (cloud/openstack team member).", + "B.14 Cloud group project migration is executed by authorized person (cloud/openstack team member).", lib.executed_as_admin_user_in_ci())