Merge branch 'ZSTAC-25975-1@@2' into 'master'

[BugFix: ZSTACK-26382]

See merge request zstackio/zstack!6104

Author: gitlab

conf/errorElaborations/Elaboration.json

@@ -1375,6 +1375,30 @@
     "message_cn": "找不到合适的host来启动vm, 因为该主存储的vm只能启动在host[%2$s]上，但这个host没有足够的cpu/memory/gpu资源，或不处于Enabled/Connected 状态",
     "message_en": "the vm can only be started on the host[%2$s] because of its primary storage, but the host is either not having enough cpu/memory/gpu, or in the Enabled/Connected status"
   },
+  {
+    "category": "VM",
+    "code": "1042",
+    "method": "regex",
+    "regex": "IP\\[.*] is not available on the L3 network\\[uuid:.*] because:.*it is gateway.*",
+    "message_cn": "在L3网络[uuid:%2$s]中，IP[%1$s]不可用, 因为IP是网关地址",
+    "message_en": "IP[%1$s] is not available on the L3 network[uuid:%2$s] because: it is gateway"
+  },
+  {
+    "category": "VM",
+    "code": "1043",
+    "method": "regex",
+    "regex": "IP\\[.*] is not available on the L3 network\\[uuid:.*] because:.*it is not in this range.*",
+    "message_cn": "在L3网络[uuid:%2$s]中，IP[%1$s]不可用, 因为IP不在网络段范围内",
+    "message_en": "IP[%1$s] is not available on the L3 network[uuid:%2$s] because: it is not in this range"
+  },
+  {
+    "category": "VM",
+    "code": "1044",
+    "method": "regex",
+    "regex": "IP\\[.*] is not available on the L3 network\\[uuid:.*] because:.*it is used.*",
+    "message_cn": "在L3网络[uuid:%2$s]中，IP[%1$s]不可用, 因为IP被占用",
+    "message_en": "IP[%1$s] is not available on the L3 network[uuid:%2$s] because: it is used"
+  },
   {
     "category": "VOLUME",
     "code": "1000",

conf/i18n.json

@@ -5130,7 +5130,7 @@
   {
     "raw": "IP[%s] is not available on the L3 network[uuid:%s] because: %s",
     "en_US": "IP[{0}] is not available on the L3 network[uuid:{1}] because: {2}",
-    "zh_CN": "在L3网络[uuid:{1}]中，IP[{0}]不可用, 因为{{2}}",
+    "zh_CN": "在L3网络[uuid:{1}]中，IP[{0}]不可用, 因为{2}",
     "arguments": [
       "ip",
       "l3Uuid",

network/src/main/java/org/zstack/network/l3/L3BasicNetwork.java

@@ -366,9 +366,9 @@ protected CheckIpAvailabilityReply checkIpAvailability(String ip) {
             // not an IP of this L3 or is a gateway
             reply.setAvailable(false);
             if (isGateway) {
-                reply.setReason(IpNotAvailabilityReason.GATEWAY.toi18nString());
+                reply.setReason(IpNotAvailabilityReason.GATEWAY.toString());
             } else {
-                reply.setReason(IpNotAvailabilityReason.NO_IN_RANGE.toi18nString());
+                reply.setReason(IpNotAvailabilityReason.NO_IN_RANGE.toString());
             }
             return reply;
         } else {
@@ -377,7 +377,7 @@ protected CheckIpAvailabilityReply checkIpAvailability(String ip) {
             q.add(UsedIpVO_.ip, Op.EQ, ip);
             if (q.isExists()) {
                 reply.setAvailable(false);
-                reply.setReason(IpNotAvailabilityReason.USED.toi18nString());
+                reply.setReason(IpNotAvailabilityReason.USED.toString());
             } else {
                 reply.setAvailable(true);
             }

test/src/test/groovy/org/zstack/test/integration/network/l3network/IpRangeCase.groovy

@@ -125,15 +125,15 @@ class IpRangeCase extends SubCase {
         check.sessionId = adminSession()
         CheckIpAvailabilityAction.Result res = check.call()
         assert res.value.available == false
-        assert res.value.reason == IpNotAvailabilityReason.GATEWAY.toi18nString()
+        assert res.value.reason == IpNotAvailabilityReason.GATEWAY.toString()
 
         check = new CheckIpAvailabilityAction()
         check.ip = "10.0.1.2"
         check.l3NetworkUuid = l3_3.getUuid()
         check.sessionId = adminSession()
         res = check.call()
         assert res.value.available == false
-        assert res.value.reason == IpNotAvailabilityReason.NO_IN_RANGE.toi18nString()
+        assert res.value.reason == IpNotAvailabilityReason.NO_IN_RANGE.toString()
 
         check = new CheckIpAvailabilityAction()
         check.ip = "10.0.1.120"
@@ -156,7 +156,7 @@ class IpRangeCase extends SubCase {
         check.sessionId = adminSession()
         res = check.call()
         assert res.value.available == false
-        assert res.value.reason == IpNotAvailabilityReason.USED.toi18nString()
+        assert res.value.reason == IpNotAvailabilityReason.USED.toString()
 
         L3NetworkInventory l3_4 = createL3Network {
             name = "l3-4"