Skip to content

Commit 40f1958

Browse files
author
gitlab
committed
Merge branch 'ZSTAC-25946-errorcode-mac' into 'master'
[BugFix: ZSTAC-25946]errorcode-mac See merge request zstackio/zstack!5971
2 parents 7bb9fe5 + a6d8b58 commit 40f1958

1 file changed

Lines changed: 9 additions & 1 deletion

File tree

conf/errorElaborations/Elaboration.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -975,6 +975,14 @@
975975
"message_cn": "v2v迁移时所使用的迁移物理机应处于启用且己连接状态。",
976976
"message_en": "The state and the status of the conversion host should be Enabled and Connected while v2v is working."
977977
},
978+
{
979+
"category": "V2V",
980+
"code": "1002",
981+
"method": "regex",
982+
"regex": "Detected .*MAC address conflict.*",
983+
"message_cn": "迁移环境内存在重复的MAC地址,请先解决该问题再继续",
984+
"message_en": "There are duplicate MAC addresses in the migration environment, please resolve the problem and continue"
985+
},
978986
{
979987
"category": "VCENTER",
980988
"code": "1000",
@@ -1431,4 +1439,4 @@
14311439
"message_cn": "创建VPC路由器超时。",
14321440
"message_en": "Creating VPC router timeout."
14331441
}
1434-
]
1442+
]

0 commit comments

Comments
 (0)