From d9a7933dcfd3fd296be9b877a4801c992bf2658b Mon Sep 17 00:00:00 2001 From: Michal Jagiello Date: Tue, 27 Feb 2024 21:16:20 +0100 Subject: Fix distribution status check error Check if the set of components to which distribution is required is a subset of the set of components to which the service model has beed distributed Issue-ID: TEST-404 Signed-off-by: Michal Jagiello Change-Id: I4ed15a38022ccefab8148fa9f46a4e5ef38dc212 --- src/onapsdk/sdc2/service.py | 2 +- src/onapsdk/version.py | 2 +- tests/test_sdc2_service.py | 11 +++++++++++ tests/test_version.py | 2 +- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/onapsdk/sdc2/service.py b/src/onapsdk/sdc2/service.py index 4618ec2..5f3a71c 100644 --- a/src/onapsdk/sdc2/service.py +++ b/src/onapsdk/sdc2/service.py @@ -143,7 +143,7 @@ class ServiceDistribution(SDC): notified_components_set: Set[str] = { distribution.component_id for distribution in self.distribution_status_list } - return notified_components_set == set(settings.SDC_SERVICE_DISTRIBUTION_COMPONENTS) + return set(settings.SDC_SERVICE_DISTRIBUTION_COMPONENTS).issubset(notified_components_set) @property def _no_distribution_errors_test(self) -> bool: diff --git a/src/onapsdk/version.py b/src/onapsdk/version.py index fcce060..6d6d217 100644 --- a/src/onapsdk/version.py +++ b/src/onapsdk/version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "13.0.3" +__version__ = "13.0.4" diff --git a/tests/test_sdc2_service.py b/tests/test_sdc2_service.py index b189687..0984cf8 100644 --- a/tests/test_sdc2_service.py +++ b/tests/test_sdc2_service.py @@ -542,6 +542,17 @@ def test_service_distribution_distribution_components_test(mock_distribution_sta ] assert sd._distribution_components_test is True + mock_distribution_status_list.return_value = [ + ServiceDistribution.DistributionStatus( + component_id=component_id, + timestamp=str(randint(0, maxsize)), + status=str(uuid4()), + url=str(uuid4()), + error_reason=str(uuid4()) + ) for component_id in settings.SDC_SERVICE_DISTRIBUTION_COMPONENTS + ["additional-test-component"] + ] + assert sd._distribution_components_test is True + @patch("onapsdk.sdc2.service.ServiceDistribution.distribution_status_list", new_callable=PropertyMock) def test_service_distribution_no_distribution_errors_test(mock_distribution_status_list): diff --git a/tests/test_version.py b/tests/test_version.py index 23a3b9c..eac3433 100644 --- a/tests/test_version.py +++ b/tests/test_version.py @@ -17,4 +17,4 @@ import onapsdk.version as version def test_version(): """Check version is the right one.""" - assert version.__version__ == '13.0.3' + assert version.__version__ == '13.0.4' -- cgit 1.2.3-korg