Skip to content

Commit 60563d3

Browse files
author
Anthony Xu
committed
Revert "change below file names for consistency"
This reverts commit 9493b4d.
1 parent 553630b commit 60563d3

3 files changed

Lines changed: 13 additions & 13 deletions

File tree

‎plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
import com.cloud.hypervisor.xen.resource.XenServer610Resource;
7474
import com.cloud.hypervisor.xen.resource.XenServer620Resource;
7575
import com.cloud.hypervisor.xen.resource.XenServerConnectionPool;
76-
import com.cloud.hypervisor.xen.resource.XenServer625Resource;
76+
import com.cloud.hypervisor.xen.resource.Xenserver625Resource;
7777
import com.cloud.resource.Discoverer;
7878
import com.cloud.resource.DiscovererBase;
7979
import com.cloud.resource.ResourceStateAdapter;
@@ -384,7 +384,7 @@ protected CitrixResourceBase createServerResource(long dcId, Long podId, Host.Re
384384
return new XcpServerResource();
385385
} else if (prodBrand.equals("XCP") && prodVersion.startsWith("1.6")) {
386386
return new XcpServer16Resource();
387-
} // Citrix XenServer group of hypervisors
387+
} // Citrix Xenserver group of hypervisors
388388
else if (prodBrand.equals("XenServer") && prodVersion.equals("5.6.0"))
389389
return new XenServer56Resource();
390390
else if (prodBrand.equals("XenServer") && prodVersion.equals("6.0.0"))
@@ -403,7 +403,7 @@ else if (prodBrand.equals("XenServer") && prodVersion.equals("6.2.0")) {
403403
}*/
404404
boolean hotfix = xenserverHotFixEnabled();
405405
if (hotfix) {
406-
return new XenServer625Resource();
406+
return new Xenserver625Resource();
407407
} else {
408408
return new XenServer620Resource();
409409
}
@@ -419,7 +419,7 @@ else if (prodBrand.equals("XenServer") && prodVersion.equals("6.2.0")) {
419419
}
420420

421421
String msg =
422-
"Only support XCP 1.0.0, 1.1.0, 1.4.x, 1.5 beta, 1.6.x; XenServer 5.6, XenServer 5.6 FP1, XenServer 5.6 SP2, XenServer 6.0, 6.0.2, 6.1.0, 6.2.0 but this one is " +
422+
"Only support XCP 1.0.0, 1.1.0, 1.4.x, 1.5 beta, 1.6.x; XenServer 5.6, XenServer 5.6 FP1, XenServer 5.6 SP2, Xenserver 6.0, 6.0.2, 6.1.0, 6.2.0 but this one is " +
423423
prodBrand + " " + prodVersion;
424424
_alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_HOST, dcId, podId, msg, msg);
425425
s_logger.debug(msg);
@@ -562,7 +562,7 @@ public void processConnect(com.cloud.host.Host agent, StartupCommand cmd, boolea
562562
} else if (prodBrand.equals("XenServer") && prodVersion.equals("6.2.0")) {
563563
String hotfix = details.get("Xenserer620HotFix");
564564
if (hotfix != null && hotfix.equalsIgnoreCase("Xenserver-Vdi-Copy-HotFix")) {
565-
resource = XenServer625Resource.class.getName();
565+
resource = Xenserver625Resource.class.getName();
566566
} else {
567567
resource = XenServer620Resource.class.getName();
568568
}
@@ -579,7 +579,7 @@ public void processConnect(com.cloud.host.Host agent, StartupCommand cmd, boolea
579579

580580
if (resource == null) {
581581
String msg =
582-
"Only support XCP 1.0.0, 1.1.0, 1.4.x, 1.5 beta, 1.6.x; XenServer 5.6, 5.6 FP1, 5.6 SP2 and XenServer 6.0 , 6.0.2, 6.1.0, 6.2.0 but this one is " +
582+
"Only support XCP 1.0.0, 1.1.0, 1.4.x, 1.5 beta, 1.6.x; XenServer 5.6, 5.6 FP1, 5.6 SP2 and Xenserver 6.0 , 6.0.2, 6.1.0, 6.2.0 but this one is " +
583583
prodBrand + " " + prodVersion;
584584
s_logger.debug(msg);
585585
throw new RuntimeException(msg);

plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer625Resource.java renamed to plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/Xenserver625Resource.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@
3939
import com.cloud.utils.script.Script;
4040

4141
@Local(value=ServerResource.class)
42-
public class XenServer625Resource extends XenServerResourceNewBase {
43-
private static final Logger s_logger = Logger.getLogger(XenServer625Resource.class);
42+
public class Xenserver625Resource extends XenServerResourceNewBase {
43+
private static final Logger s_logger = Logger.getLogger(Xenserver625Resource.class);
4444

45-
public XenServer625Resource() {
45+
public Xenserver625Resource() {
4646
super();
4747
}
4848

@@ -102,7 +102,7 @@ public long getStaticMin(String os, boolean b, long dynamicMinRam, long dynamicM
102102

103103
@Override
104104
protected StorageSubsystemCommandHandler getStorageHandler() {
105-
XenServerStorageProcessor processor = new XenServer625StorageProcessor(this);
105+
XenServerStorageProcessor processor = new Xenserver625StorageProcessor(this);
106106
return new StorageSubsystemCommandHandlerBase(processor);
107107
}
108108

@@ -112,4 +112,4 @@ protected void umountSnapshotDir(Connection conn, Long dcId) {
112112
}
113113

114114

115-
}
115+
}

plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer625StorageProcessor.java renamed to plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/Xenserver625StorageProcessor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@
5454
import com.xensource.xenapi.Types;
5555
import com.xensource.xenapi.VDI;
5656

57-
public class XenServer625StorageProcessor extends XenServerStorageProcessor {
57+
public class Xenserver625StorageProcessor extends XenServerStorageProcessor {
5858
private static final Logger s_logger = Logger.getLogger(XenServerStorageProcessor.class);
5959

60-
public XenServer625StorageProcessor(CitrixResourceBase resource) {
60+
public Xenserver625StorageProcessor(CitrixResourceBase resource) {
6161
super(resource);
6262
}
6363
protected boolean mountNfs(Connection conn, String remoteDir, String localDir) {

0 commit comments

Comments
 (0)