Merge branch 'shixin-ZSTAC-83300' into '5.5.12'

<fix>[l2network]: validate physicalInterface for LinuxBridge

See merge request zstackio/zstack!9375

Author: gitlab

network/src/main/java/org/zstack/network/l2/L2NetworkApiInterceptor.java

@@ -123,6 +123,12 @@ private void validate(APICreateL2NetworkMsg msg) {
         } catch (Exception e) {
             throw new ApiMessageInterceptionException(argerr(ORG_ZSTACK_NETWORK_L2_10012, "unsupported vSwitch type[%s]", msg.getvSwitchType()));
         }
+
+        if (L2NetworkConstant.VSWITCH_TYPE_LINUX_BRIDGE.equals(msg.getvSwitchType())
+                && (msg.getPhysicalInterface() == null || msg.getPhysicalInterface().trim().isEmpty())) {
+            throw new ApiMessageInterceptionException(argerr(ORG_ZSTACK_NETWORK_L2_10021,
+                    "physicalInterface is required when vSwitchType is [%s]", msg.getvSwitchType()));
+        }
     }
 
     private void validate(APIChangeL2NetworkVlanIdMsg msg) {

test/src/test/groovy/org/zstack/test/integration/network/l2network/AttachL2NetworkCase.groovy

@@ -94,6 +94,7 @@ public class AttachL2NetworkCase extends SubCase{
     @Override
     public void test() {
         env.create {
+            testCreateL2NetworkWithoutPhysicalInterface()
             testAttachL2NoVlanNetwork()
             testAttachL2ValnNetwork()
             testAttachL2NoVlanNetworkSynchronously()
@@ -103,6 +104,36 @@ public class AttachL2NetworkCase extends SubCase{
 
     }
 
+    void testCreateL2NetworkWithoutPhysicalInterface() {
+        ZoneInventory zone = env.inventoryByName("zone")
+
+        // creating L2 NoVlan network without physicalInterface should fail when vSwitchType is LinuxBridge
+        expect(AssertionError.class) {
+            createL2NoVlanNetwork {
+                name = "test-no-physical-interface"
+                zoneUuid = zone.uuid
+            }
+        }
+
+        // creating L2 NoVlan network with empty physicalInterface should also fail
+        expect(AssertionError.class) {
+            createL2NoVlanNetwork {
+                name = "test-empty-physical-interface"
+                zoneUuid = zone.uuid
+                physicalInterface = ""
+            }
+        }
+
+        // creating L2 Vlan network without physicalInterface should fail when vSwitchType is LinuxBridge
+        expect(AssertionError.class) {
+            createL2VlanNetwork {
+                name = "test-vlan-no-physical-interface"
+                zoneUuid = zone.uuid
+                vlan = 100
+            }
+        }
+    }
+
     void testAttachL2NoVlanNetwork(){
         L2NetworkInventory l21 = env.inventoryByName("l2-1")
         L2NetworkInventory l22 = env.inventoryByName("l2-2")

utils/src/main/java/org/zstack/utils/clouderrorcode/CloudOperationsErrorCode.java

@@ -1022,6 +1022,8 @@ public class CloudOperationsErrorCode {
 
     public static final String ORG_ZSTACK_NETWORK_L2_10020 = "ORG_ZSTACK_NETWORK_L2_10020";
 
+    public static final String ORG_ZSTACK_NETWORK_L2_10021 = "ORG_ZSTACK_NETWORK_L2_10021";
+
     public static final String ORG_ZSTACK_CONSOLE_10000 = "ORG_ZSTACK_CONSOLE_10000";
 
     public static final String ORG_ZSTACK_CONSOLE_10001 = "ORG_ZSTACK_CONSOLE_10001";