Commit cf93d9b3 authored by Sergio Gimenez's avatar Sergio Gimenez
Browse files

Stabilize FM deployment integration tests

parent 85802c52

src/test/test_application_deployment_management.py

+9 −24
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
from __future__ import absolute_import

import time

from test import BaseTestCase

from clients import tf_sdk

from clients import srm





class TestApplicationDeploymentManagementController(BaseTestCase):
@@ -38,7 +38,7 @@ class TestApplicationDeploymentManagementController(BaseTestCase): 
        try:

            # Check if there is connection with Edge Cloud Platform. Otherwise stop the test

            try:

                tf_sdk.get_zones()

                srm.get_zones()

            except Exception:

                self.skipTest("Edge Cloud Platform connection not available")
@@ -66,27 +66,9 @@ class TestApplicationDeploymentManagementController(BaseTestCase): 


    def test_00_setup(self):

        """Setup federation contexts for both Partner OP and Originating OP roles"""

        try:

            # Check if there are artefact and profile created at Edge Cloud Platform and must be deleted because remains there due

            # to a possible issue during the test - clean up both app configurations

            tf_sdk.delete_onboarding(self.app_id_pop)

        except Exception:

            pass



        try:

            tf_sdk.delete_onboarding(self.app_id_oop)

        except Exception:

            pass



        try:

            tf_sdk.delete_artefact(self.artefact_id_pop)

        except Exception:

            pass



        try:

            tf_sdk.delete_artefact(self.artefact_id_oop)

        except Exception:

            pass

        self.cleanup_fm_test_state()

        self.cleanup_ecp_test_state()

        self.cleanup_remote_partner_test_state(BaseTestCase.token)



        try:

            # Create federation context for Partner OP role
@@ -131,8 +113,10 @@ class TestApplicationDeploymentManagementController(BaseTestCase): 
            # Create artefacts for both roles with different app providers

            self.post_artefact(BaseTestCase.federation_context_id_partner, self.artefact_id_pop, self.artefact_name_pop,

                               self.artefact_repo_pop, BaseTestCase.token, 'partner_op')

            # Reuse a known-good public Helm chart for originating deployment validation.

            self.post_artefact(BaseTestCase.federation_context_id_originating, self.artefact_id_oop,

                               self.artefact_name_oop, self.artefact_repo_oop, BaseTestCase.token, 'originating_op')

                               self.deployable_artefact_name, self.deployable_artefact_repo, BaseTestCase.token,

                               'originating_op')



            # Create application onboarding for both roles with different app configurations

            self.post_onboarding(BaseTestCase.federation_context_id_partner, self.app_id_pop, BaseTestCase.zone_partner,
@@ -205,6 +189,7 @@ class TestApplicationDeploymentManagementController(BaseTestCase): 
            else:

                federation_id = BaseTestCase.federation_context_id_originating

                app_id = self.app_id_oop

                zone = BaseTestCase.zone_originating

                flavour = BaseTestCase.flavour_originating



            body = {