<fix>[mevoco]: delete vcenter.mac.conflict.strategy

conf/errorElaborations/Elaboration.json

@@ -1112,14 +1112,6 @@
     "message_cn": "无法连接到 vCenter，请确保vCenter处于运行状态。",
     "message_en": "Failed to connect to vCenter. Please ensure vCenter host is running."
   },
-  {
-    "category": "VCENTER",
-    "code": "1005",
-    "method": "regex",
-    "regex": "Detected .* MAC address conflict, current mac address conflicting strategy is: strict, .*",
-    "message_cn": "与当前已纳管的 vCenter 环境存在重复的 MAC 地址，当前的 MAC 地址冲突处理策略是“strict”。",
-    "message_en": "Duplicated MAC address with that in the currently managed vCenter environment, and current mac address conflicting strategy is 'strict'."
-  },
   {
     "category": "VCENTER",
     "code": "1006",

conf/i18n.json

@@ -35020,21 +35020,6 @@
     "line": 368,
     "fileName": "src/main/java/org/zstack/vmware/VCenterHostAllocatorFilterExtensionPoint.java"
   },
-  {
-    "raw": "Duplicated mac address[%s] on VM[uuid: %s, name: %s] and VM[uuid: %s, name: %s], and current mac address conflicting strategy is: %s.",
-    "en_US": "Duplicated mac address[{0}] on VM[uuid: {1}, name: {2}] and VM[uuid: {3}, name: {4}], and current mac address conflicting strategy is: {5}.",
-    "zh_CN": "云主机[uuid：{1}，名称：{2}]和云主机 [uuid：{3}，名称：{4}]中存在重复的mac地址[{0}]，当前的 MAC 地址冲突策略是：{5}。",
-    "arguments": [
-      "nNic.getMac()",
-      "nVm.getUuid()",
-      "nVm.getName()",
-      "eVm.getUuid()",
-      "eVm.getName()",
-      "VCENTER_MAC_CONFLICT_STRATEGY_STRICT"
-    ],
-    "line": 1040,
-    "fileName": "src/main/java/org/zstack/vmware/VCenterManagerImpl.java"
-  },
   {
     "raw": "can\u0027t sync before datastores are separated",
     "en_US": "can\u0027t sync before datastores are separated",

conf/i18n/messages_en_US.properties

@@ -13838,10 +13838,6 @@ not\ supported\ yet = not supported yet
 # args: 
 no\ candidate\ host\ for\ vcenter\ vm = no candidate host for vcenter vm
 
-# at: src/main/java/org/zstack/vmware/VCenterManagerImpl.java:1040
-# args: nNic.getMac(),nVm.getUuid(),nVm.getName(),eVm.getUuid(),eVm.getName(),VCENTER_MAC_CONFLICT_STRATEGY_STRICT
-Duplicated\ mac\ address[%s]\ on\ VM[uuid\:\ %s,\ name\:\ %s]\ and\ VM[uuid\:\ %s,\ name\:\ %s],\ and\ current\ mac\ address\ conflicting\ strategy\ is\:\ %s. = Duplicated mac address[{0}] on VM[uuid: {1}, name: {2}] and VM[uuid: {3}, name: {4}], and current mac address conflicting strategy is: {5}.
-
 # at: src/main/java/org/zstack/vmware/VCenterManagerImpl.java:2040
 # args: 
 can't\ sync\ before\ datastores\ are\ separated = can't sync before datastores are separated

conf/i18n/messages_zh_CN.properties

@@ -13838,10 +13838,6 @@ not\ supported\ yet = 尚不支持
 # args: 
 no\ candidate\ host\ for\ vcenter\ vm = 找不到VCenter的物理机去启动vm
 
-# at: src/main/java/org/zstack/vmware/VCenterManagerImpl.java:1040
-# args: nNic.getMac(),nVm.getUuid(),nVm.getName(),eVm.getUuid(),eVm.getName(),VCENTER_MAC_CONFLICT_STRATEGY_STRICT
-Duplicated\ mac\ address[%s]\ on\ VM[uuid\:\ %s,\ name\:\ %s]\ and\ VM[uuid\:\ %s,\ name\:\ %s],\ and\ current\ mac\ address\ conflicting\ strategy\ is\:\ %s. = 云主机[uuid：{1}，名称：{2}]和云主机 [uuid：{3}，名称：{4}]中存在重复的mac地址[{0}]，当前的 MAC 地址冲突策略是：{5}。
-
 # at: src/main/java/org/zstack/vmware/VCenterManagerImpl.java:2040
 # args: 
 can't\ sync\ before\ datastores\ are\ separated = 在分离主存储之前无法同步

sdk/src/main/java/SourceClassMap.java

@@ -629,7 +629,6 @@ public class SourceClassMap {
 			put("org.zstack.usbDevice.UsbDeviceState", "org.zstack.sdk.UsbDeviceState");
 			put("org.zstack.v2v.V2VConversionHostInventory", "org.zstack.sdk.V2VConversionHostInventory");
 			put("org.zstack.vmware.ESXHostInventory", "org.zstack.sdk.ESXHostInventory");
-			put("org.zstack.vmware.SkippedResources", "org.zstack.sdk.SkippedResources");
 			put("org.zstack.vmware.VCenterBackupStorageInventory", "org.zstack.sdk.VCenterBackupStorageInventory");
 			put("org.zstack.vmware.VCenterClusterInventory", "org.zstack.sdk.VCenterClusterInventory");
 			put("org.zstack.vmware.VCenterDatacenterInventory", "org.zstack.sdk.VCenterDatacenterInventory");
@@ -1177,7 +1176,6 @@ public class SourceClassMap {
 			put("org.zstack.sdk.ShellResult", "org.zstack.kvm.APIKvmRunShellEvent$ShellResult");
 			put("org.zstack.sdk.ShrinkResult", "org.zstack.header.storage.snapshot.ShrinkResult");
 			put("org.zstack.sdk.SimulatorHostInventory", "org.zstack.header.simulator.SimulatorHostInventory");
-			put("org.zstack.sdk.SkippedResources", "org.zstack.vmware.SkippedResources");
 			put("org.zstack.sdk.SlbGroupInventory", "org.zstack.network.service.slb.SlbGroupInventory");
 			put("org.zstack.sdk.SlbGroupL3NetworkRefInventory", "org.zstack.network.service.slb.SlbGroupL3NetworkRefInventory");
 			put("org.zstack.sdk.SlbLoadBalancerInventory", "org.zstack.network.service.slb.SlbLoadBalancerInventory");

sdk/src/main/java/org/zstack/sdk/AddVCenterResult.java

@@ -1,7 +1,6 @@
 package org.zstack.sdk;
 
 import org.zstack.sdk.VCenterInventory;
-import org.zstack.sdk.SkippedResources;
 
 public class AddVCenterResult {
     public VCenterInventory inventory;
@@ -12,12 +11,4 @@ public VCenterInventory getInventory() {
         return this.inventory;
     }
 
-    public SkippedResources skippedResources;
-    public void setSkippedResources(SkippedResources skippedResources) {
-        this.skippedResources = skippedResources;
-    }
-    public SkippedResources getSkippedResources() {
-        return this.skippedResources;
-    }
-
 }

sdk/src/main/java/org/zstack/sdk/SyncVCenterResult.java

@@ -1,14 +1,7 @@
 package org.zstack.sdk;
 
-import org.zstack.sdk.SkippedResources;
+
 
 public class SyncVCenterResult {
-    public SkippedResources skippedResources;
-    public void setSkippedResources(SkippedResources skippedResources) {
-        this.skippedResources = skippedResources;
-    }
-    public SkippedResources getSkippedResources() {
-        return this.skippedResources;
-    }
 
 }