Retry on NoSuchNamespaceException not found in rename table for rest catalog

core/src/main/java/org/apache/iceberg/rest/RESTSessionCatalog.java

@@ -25,6 +25,7 @@
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.time.Duration;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -428,7 +429,19 @@ public void renameTable(SessionContext context, TableIdentifier from, TableIdent
     Endpoint.check(endpoints, Endpoint.V1_RENAME_TABLE);
     checkIdentifierIsValid(from);
     checkIdentifierIsValid(to);
+    try {
+      renameInternal(context, from, to);
+    } catch (NoSuchNamespaceException e) {
+      if (name().equals(to.namespace().level(0)) && to.namespace().length() > 1) {
+        Namespace namespace =
+            Namespace.of(Arrays.copyOfRange(to.namespace().levels(), 1, to.namespace().length()));
+        TableIdentifier toWithStrippingCatalog = TableIdentifier.of(namespace, to.name());
+        renameInternal(context, from, toWithStrippingCatalog);
+      }
+    }
+  }
 
+  private void renameInternal(SessionContext context, TableIdentifier from, TableIdentifier to) {
     RenameTableRequest request =
         RenameTableRequest.builder().withSource(from).withDestination(to).build();
 

spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/sql/TestAlterTable.java

@@ -277,10 +277,6 @@ public void testAlterColumnPositionFirst() {
 
   @TestTemplate
   public void testTableRename() {
-    assumeThat(catalogConfig.get(ICEBERG_CATALOG_TYPE))
-        .as(
-            "need to fix https://github.com/apache/iceberg/issues/11154 before enabling this for the REST catalog")
-        .isNotEqualTo(ICEBERG_CATALOG_TYPE_REST);
     assumeThat(validationCatalog)
         .as("Hadoop catalog does not support rename")
         .isNotInstanceOf(HadoopCatalog.class);
@@ -298,6 +294,37 @@ public void testTableRename() {
     assertThat(validationCatalog.tableExists(renamedIdent)).as("New name should exist").isTrue();
   }
 
+  @TestTemplate
+  public void testTableRenameInMultiLevelNameSpace() {
+    assumeThat(catalogConfig.get(ICEBERG_CATALOG_TYPE)).isEqualTo(ICEBERG_CATALOG_TYPE_REST);
+
+    assertThat(validationCatalog.tableExists(tableIdent)).as("Initial name should exist").isTrue();
+    // Use a special case that first level name space is same as catalog name
+    sql("CREATE NAMESPACE IF NOT EXISTS %s.%s.secondlevel", catalogName, catalogName);
+
+    sql("ALTER TABLE %s RENAME TO %s.secondlevel.table2", tableName, catalogName);
+
+    assertThat(validationCatalog.tableExists(tableIdent))
+        .as("Initial name should not exist")
+        .isFalse();
+    assertThat(
+            validationCatalog.tableExists(TableIdentifier.of(catalogName, "secondlevel", "table2")))
+        .as("New name should exist")
+        .isTrue();
+
+    sql(
+        "ALTER TABLE %s.%s.secondlevel.table2 RENAME TO %s.%s.secondlevel.table3",
+        catalogName, catalogName, catalogName, catalogName);
+    assertThat(
+            validationCatalog.tableExists(TableIdentifier.of(catalogName, "secondlevel", "table2")))
+        .as("Second name should not exist")
+        .isFalse();
+    assertThat(
+            validationCatalog.tableExists(TableIdentifier.of(catalogName, "secondlevel", "table3")))
+        .as("Third name should exist")
+        .isTrue();
+  }
+
   @TestTemplate
   public void testSetTableProperties() {
     sql("ALTER TABLE %s SET TBLPROPERTIES ('prop'='value')", tableName);