Fix error with swr tests

Author: shhovhan

otcextensions/tests/functional/sdk/swr/__init__.py

@@ -9,6 +9,10 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
+import time
+
+from openstack import exceptions as sdk_exceptions
+
 from otcextensions.tests.functional import base
 
 
@@ -17,3 +21,19 @@ class TestSwr(base.BaseFunctionalTest):
     def setUp(self):
         super(TestSwr, self).setUp()
         self.client = self.conn.swr
+
+    def _create_organization(self, namespace, retries=3, delay=5):
+        """Create an SWR organization, retrying on transient server errors.
+
+        The SWR "create namespace" API occasionally returns a transient
+        5xx (e.g. SVCSTG.SWR.5000059) under load; retry a few times
+        before giving up.
+        """
+        for attempt in range(retries):
+            try:
+                return self.client.create_organization(namespace=namespace)
+            except sdk_exceptions.HttpException as e:
+                status = e.response.status_code if e.response is not None else None
+                if not status or status < 500 or attempt == retries - 1:
+                    raise
+                time.sleep(delay)

otcextensions/tests/functional/sdk/swr/v2/test_organization.py

@@ -22,7 +22,7 @@ def setUp(self):
         super(TestOrganization, self).setUp()
 
         self.org_name = "sdk-swr-org-" + uuid.uuid4().hex
-        self.org = self.client.create_organization(namespace=self.org_name)
+        self.org = self._create_organization(self.org_name)
         if os.getenv("OS_SWR_PERMISSIONS_RUN"):
             self.permission = [
                 {

otcextensions/tests/functional/sdk/swr/v2/test_repository.py

@@ -22,7 +22,7 @@ def setUp(self):
 
         self.org_name = "sdk-swr-org-" + uuid.uuid4().hex
         self.repo_name = "sdk-swr-repo-" + uuid.uuid4().hex
-        self.org = self.client.create_organization(namespace=self.org_name)
+        self.org = self._create_organization(self.org_name)
         self.repo = self.client.create_repository(
             namespace=self.org_name,
             repository=self.repo_name,