Skip to content

Commit a8212d9

Browse files
Tim Mackeysebgoa
Tim Mackey
authored and
sebgoa
committed
Cleanup of Xen and XenServer terms. Cloned xen plugin creating a xenserver plugin, then removed xen plugin
Signed-off-by: Tim Mackey <tmackey@gmail.com> Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
1 parent 303e6ff commit a8212d9

90 files changed

Lines changed: 257 additions & 243 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎api/src/org/apache/cloudstack/api/ApiConstants.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ public class ApiConstants {
377377
public static final String SECURITY_GROUP_EANBLED = "securitygroupenabled";
378378
public static final String LOCAL_STORAGE_ENABLED = "localstorageenabled";
379379
public static final String GUEST_IP_TYPE = "guestiptype";
380-
public static final String XEN_NETWORK_LABEL = "xennetworklabel";
380+
public static final String XENSERVER_NETWORK_LABEL = "xenservernetworklabel";
381381
public static final String KVM_NETWORK_LABEL = "kvmnetworklabel";
382382
public static final String VMWARE_NETWORK_LABEL = "vmwarenetworklabel";
383383
public static final String HYPERV_NETWORK_LABEL = "hypervnetworklabel";

‎api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public class AddTrafficTypeCmd extends BaseAsyncCreateCmd {
5555
@Parameter(name = ApiConstants.TRAFFIC_TYPE, type = CommandType.STRING, required = true, description = "the trafficType to be added to the physical network")
5656
private String trafficType;
5757

58-
@Parameter(name = ApiConstants.XEN_NETWORK_LABEL,
58+
@Parameter(name = ApiConstants.XENSERVER_NETWORK_LABEL,
5959
type = CommandType.STRING,
6060
description = "The network name label of the physical device dedicated to this traffic on a XenServer host")
6161
private String xenLabel;

‎api/src/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class UpdateTrafficTypeCmd extends BaseAsyncCmd {
4545
@Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = TrafficTypeResponse.class, required = true, description = "traffic type id")
4646
private Long id;
4747

48-
@Parameter(name = ApiConstants.XEN_NETWORK_LABEL,
48+
@Parameter(name = ApiConstants.XENSERVER_NETWORK_LABEL,
4949
type = CommandType.STRING,
5050
description = "The network name label of the physical device dedicated to this traffic on a XenServer host")
5151
private String xenLabel;

‎api/src/org/apache/cloudstack/api/response/TrafficTypeResponse.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public class TrafficTypeResponse extends BaseResponse {
4040
@Param(description = "the physical network this belongs to")
4141
private String physicalNetworkId;
4242

43-
@SerializedName(ApiConstants.XEN_NETWORK_LABEL)
43+
@SerializedName(ApiConstants.XENSERVER_NETWORK_LABEL)
4444
@Param(description = "The network name label of the physical device dedicated to this traffic on a XenServer host")
4545
private String xenNetworkLabel;
4646

‎awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2007,9 +2007,9 @@ private EC2DescribeImagesResponse listTemplates(String templateId, EC2DescribeIm
20072007
ec2Image.setState(temp.getIsReady() ? "available" : "pending");
20082008
ec2Image.setDomainId(temp.getDomainId());
20092009
if (temp.getHyperVisor().equalsIgnoreCase("xenserver"))
2010-
ec2Image.setHypervisor("xen");
2010+
ec2Image.setHypervisor("xenserver");
20112011
else if (temp.getHyperVisor().equalsIgnoreCase("ovm"))
2012-
ec2Image.setHypervisor("ovm"); // valid values for hypervisor is 'ovm' and 'xen'
2012+
ec2Image.setHypervisor("ovm"); // valid values for hypervisor is 'ovm' and 'xenserver'
20132013
else
20142014
ec2Image.setHypervisor("");
20152015
if (temp.getDisplayText() == null)
@@ -2614,7 +2614,7 @@ else if (resourceType.equalsIgnoreCase("securityGroup"))
26142614
*/
26152615
private String mapToAmazonHypervisorType(String hypervisor) {
26162616
if (hypervisor.equalsIgnoreCase("Xenserver"))
2617-
return ("xen");
2617+
return ("xenserver");
26182618
else if (hypervisor.equalsIgnoreCase("Ovm"))
26192619
return ("ovm");
26202620
else

‎client/WEB-INF/classes/resources/messages.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1258,7 +1258,7 @@ label.weekly=Weekly
12581258
label.welcome.cloud.console=Welcome to Management Console
12591259
label.welcome=Welcome
12601260
label.what.is.cloudstack=What is CloudStack&\#8482?
1261-
label.xen.traffic.label=XenServer traffic label
1261+
label.xenserver.traffic.label=XenServer traffic label
12621262
label.yes=Yes
12631263
label.zone.details=Zone details
12641264
label.zone.id=Zone ID

‎client/WEB-INF/classes/resources/messages_fr_FR.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1476,7 +1476,7 @@ label.welcome.cloud.console=Bienvenue dans la Console d\\'Administration
14761476
label.what.is.cloudstack=Qu\\'est-ce-que CloudStack&\#8482; ?
14771477
label.xenserver.tools.version.61.plus=XenServer Tools Version 6.1\\+
14781478
label.Xenserver.Tools.Version61plus=XenServer Tools Version 6.1\\+
1479-
label.xen.traffic.label=Libell\u00e9 trafic XenServer
1479+
label.xenserver.traffic.label=Libell\u00e9 trafic XenServer
14801480
label.yes=Oui
14811481
label.zone.dedicated=Zone d\u00e9di\u00e9e
14821482
label.zone.details=D\u00e9tails de la zone

‎client/WEB-INF/classes/resources/messages_it_IT.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@ label.vsmctrlvlanid=VLAN ID di Controllo
621621
label.vsmpktvlanid=VLAN ID del Pacchetto
622622
label.vsmstoragevlanid=VLAN ID di Storage
623623
label.what.is.cloudstack=Che cosa \u00e8 CloudStack&\#8482?
624-
label.xen.traffic.label=Etichetta del traffico via XenServer
624+
label.xenserver.traffic.label=Etichetta del traffico via XenServer
625625
label.yes=S\u00ec
626626
label.zone.details=Dettagli della Zona
627627
label.zone.name=Nome Zona

‎client/WEB-INF/classes/resources/messages_ja_JP.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1453,7 +1453,7 @@ label.welcome=\u3088\u3046\u3053\u305d
14531453
label.what.is.cloudstack=CloudStack&\#8482; \u306b\u3064\u3044\u3066
14541454
label.xenserver.tools.version.61.plus=XenServer Tools Version 6.1 \u4ee5\u964d
14551455
label.Xenserver.Tools.Version61plus=XenServer Tools Version 6.1 \u4ee5\u964d
1456-
label.xen.traffic.label=XenServer \u306e\u30c8\u30e9\u30d5\u30a3\u30c3\u30af \u30e9\u30d9\u30eb
1456+
label.xenserver.traffic.label=XenServer \u306e\u30c8\u30e9\u30d5\u30a3\u30c3\u30af \u30e9\u30d9\u30eb
14571457
label.yes=\u306f\u3044
14581458
label.zone.dedicated=\u5c02\u7528\u30be\u30fc\u30f3
14591459
label.zone.details=\u30be\u30fc\u30f3\u306e\u8a73\u7d30

‎client/WEB-INF/classes/resources/messages_ko_KR.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1133,7 +1133,7 @@ label.weekly=\ub9e4\uc8fc
11331133
label.welcome.cloud.console=\uad00\ub9ac \ucf58\uc194\uc5d0 \uc624\uc2e0\uac83\uc744 \ud658\uc601\ud569\ub2c8\ub2e4\!
11341134
label.welcome=\uc5b4\uc11c \uc624\uc2ed\uc2dc\uc624
11351135
label.what.is.cloudstack=CloudStack\u2122 \uc815\ubcf4
1136-
label.xen.traffic.label=XenServer \ud2b8\ub798\ud53d \ub77c\ubca8
1136+
label.xenserver.traffic.label=XenServer \ud2b8\ub798\ud53d \ub77c\ubca8
11371137
label.yes=\uc608
11381138
label.zone.details=Zone \uc0c1\uc138
11391139
label.zone.id=Zone ID

0 commit comments

Comments
 (0)