You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/06/24 10:24:27 UTC
[11/11] git commit: updated refs/heads/master to c79ab57
Revert "CLOUDSTACK-6967: Initial OVM3 drop"
This reverts commit 8a485b9b59e4108e862022baf7477f768380b325.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c79ab570
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c79ab570
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c79ab570
Branch: refs/heads/master
Commit: c79ab570b0f80caeaba301e0aa4a5758f676b346
Parents: be02897
Author: Daan Hoogland <da...@onecht.net>
Authored: Tue Jun 24 10:24:01 2014 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Tue Jun 24 10:24:01 2014 +0200
----------------------------------------------------------------------
api/src/com/cloud/hypervisor/Hypervisor.java | 5 --
api/src/com/cloud/network/NetworkService.java | 4 +-
.../network/PhysicalNetworkTrafficType.java | 2 -
.../org/apache/cloudstack/api/ApiConstants.java | 4 -
.../command/admin/cluster/AddClusterCmd.java | 18 +---
.../command/admin/usage/AddTrafficTypeCmd.java | 11 +--
.../admin/usage/UpdateTrafficTypeCmd.java | 11 +--
.../api/response/ClusterResponse.java | 12 ---
.../api/response/TrafficTypeResponse.java | 12 ---
.../classes/resources/messages.properties | 4 -
client/pom.xml | 5 --
.../dao/PhysicalNetworkTrafficTypeDaoImpl.java | 9 --
.../dao/PhysicalNetworkTrafficTypeVO.java | 16 +---
.../storage/snapshot/SnapshotObject.java | 10 +--
plugins/pom.xml | 1 -
.../storage/secondary/cloud-install-sys-tmplt | 27 +++---
scripts/storage/secondary/createtmplt.sh | 2 +-
server/src/com/cloud/configuration/Config.java | 10 +--
.../configuration/ConfigurationManagerImpl.java | 2 +-
.../src/com/cloud/network/NetworkModelImpl.java | 13 +--
.../com/cloud/network/NetworkServiceImpl.java | 12 +--
.../VirtualNetworkApplianceManagerImpl.java | 1 -
.../com/cloud/resource/ResourceManagerImpl.java | 8 --
.../com/cloud/server/ManagementServerImpl.java | 7 +-
.../storage/listener/StoragePoolMonitor.java | 3 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 6 +-
.../com/cloud/vpc/MockNetworkManagerImpl.java | 6 +-
setup/db/create-schema.sql | 3 -
setup/db/db/schema-410to420.sql | 3 +-
setup/db/templates.sql | 20 +----
ui/dictionary.jsp | 3 -
ui/scripts/docs.js | 12 ---
ui/scripts/system.js | 89 ++------------------
ui/scripts/templates.js | 6 --
ui/scripts/zoneWizard.js | 43 +---------
35 files changed, 47 insertions(+), 353 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c79ab570/api/src/com/cloud/hypervisor/Hypervisor.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/hypervisor/Hypervisor.java b/api/src/com/cloud/hypervisor/Hypervisor.java
index f8868af..f8b98cf 100644
--- a/api/src/com/cloud/hypervisor/Hypervisor.java
+++ b/api/src/com/cloud/hypervisor/Hypervisor.java
@@ -31,7 +31,6 @@ public class Hypervisor {
BareMetal,
Simulator,
Ovm,
- Ovm3,
LXC,
Any; /*If you don't care about the hypervisor type*/
@@ -58,8 +57,6 @@ public class Hypervisor {
return HypervisorType.Simulator;
} else if (hypervisor.equalsIgnoreCase("Ovm")) {
return HypervisorType.Ovm;
- } else if (hypervisor.equalsIgnoreCase("Ovm3")) {
- return HypervisorType.Ovm3;
} else if (hypervisor.equalsIgnoreCase("LXC")) {
return HypervisorType.LXC;
} else if (hypervisor.equalsIgnoreCase("Any")) {
@@ -84,8 +81,6 @@ public class Hypervisor {
return ImageFormat.OVA;
} else if (hyperType == HypervisorType.Ovm) {
return ImageFormat.RAW;
- } else if (hyperType == HypervisorType.Ovm3) {
- return ImageFormat.RAW;
} else {
return null;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c79ab570/api/src/com/cloud/network/NetworkService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/NetworkService.java b/api/src/com/cloud/network/NetworkService.java
index 646dcb6..1e126f5 100755
--- a/api/src/com/cloud/network/NetworkService.java
+++ b/api/src/com/cloud/network/NetworkService.java
@@ -111,11 +111,11 @@ public interface NetworkService {
long findPhysicalNetworkId(long zoneId, String tag, TrafficType trafficType);
PhysicalNetworkTrafficType addTrafficTypeToPhysicalNetwork(Long physicalNetworkId, String trafficType, String isolationMethod, String xenLabel, String kvmLabel, String vmwareLabel,
- String simulatorLabel, String vlan, String hypervLabel, String ovm3Label);
+ String simulatorLabel, String vlan, String hypervLabel);
PhysicalNetworkTrafficType getPhysicalNetworkTrafficType(Long id);
- PhysicalNetworkTrafficType updatePhysicalNetworkTrafficType(Long id, String xenLabel, String kvmLabel, String vmwareLabel, String hypervLabel, String ovm3Label);
+ PhysicalNetworkTrafficType updatePhysicalNetworkTrafficType(Long id, String xenLabel, String kvmLabel, String vmwareLabel, String hypervLabel);
boolean deletePhysicalNetworkTrafficType(Long id);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c79ab570/api/src/com/cloud/network/PhysicalNetworkTrafficType.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/PhysicalNetworkTrafficType.java b/api/src/com/cloud/network/PhysicalNetworkTrafficType.java
index 9676bad..a50aa37 100644
--- a/api/src/com/cloud/network/PhysicalNetworkTrafficType.java
+++ b/api/src/com/cloud/network/PhysicalNetworkTrafficType.java
@@ -39,6 +39,4 @@ public interface PhysicalNetworkTrafficType extends InternalIdentity, Identity {
String getSimulatorNetworkLabel();
String getHypervNetworkLabel();
-
- String getOvm3NetworkLabel();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c79ab570/api/src/org/apache/cloudstack/api/ApiConstants.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/ApiConstants.java b/api/src/org/apache/cloudstack/api/ApiConstants.java
index 70ba144..adda5f4 100755
--- a/api/src/org/apache/cloudstack/api/ApiConstants.java
+++ b/api/src/org/apache/cloudstack/api/ApiConstants.java
@@ -379,7 +379,6 @@ public class ApiConstants {
public static final String LOCAL_STORAGE_ENABLED = "localstorageenabled";
public static final String GUEST_IP_TYPE = "guestiptype";
public static final String XENSERVER_NETWORK_LABEL = "xenservernetworklabel";
- public static final String OVM3_NETWORK_LABEL = "ovm3networklabel";
public static final String KVM_NETWORK_LABEL = "kvmnetworklabel";
public static final String VMWARE_NETWORK_LABEL = "vmwarenetworklabel";
public static final String HYPERV_NETWORK_LABEL = "hypervnetworklabel";
@@ -462,9 +461,6 @@ public class ApiConstants {
public static final String VSM_CONFIG_MODE = "vsmconfigmode";
public static final String VSM_CONFIG_STATE = "vsmconfigstate";
public static final String VSM_DEVICE_STATE = "vsmdevicestate";
- public static final String OVM3_POOL = "ovm3pool";
- public static final String OVM3_CLUSTER = "ovm3cluster";
- public static final String OVM3_VIP = "ovm3vip";
public static final String VCENTER = "vcenter";
public static final String ADD_VSM_FLAG = "addvsmflag";
public static final String END_POINT = "endpoint";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c79ab570/api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java
index c42886c..b9df18e 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java
@@ -66,7 +66,7 @@ public class AddClusterCmd extends BaseCmd {
@Parameter(name = ApiConstants.HYPERVISOR,
type = CommandType.STRING,
required = true,
- description = "hypervisor type of the cluster: XenServer,KVM,VMware,Hyperv,BareMetal,Simulator,Ovm3")
+ description = "hypervisor type of the cluster: XenServer,KVM,VMware,Hyperv,BareMetal,Simulator")
private String hypervisor;
@Parameter(name = ApiConstants.CLUSTER_TYPE, type = CommandType.STRING, required = true, description = "type of the cluster: CloudManaged, ExternalManaged")
@@ -75,22 +75,6 @@ public class AddClusterCmd extends BaseCmd {
@Parameter(name = ApiConstants.ALLOCATION_STATE, type = CommandType.STRING, description = "Allocation state of this cluster for allocation of new resources")
private String allocationState;
- @Parameter(name = ApiConstants.OVM3_POOL, type = CommandType.STRING, required = false, description = "Ovm3 native pooling enabled for cluster")
- private String ovm3pool;
- @Parameter(name = ApiConstants.OVM3_CLUSTER, type = CommandType.STRING, required = false, description = "Ovm3 native OCFS2 clustering enabled for cluster")
- private String ovm3cluster;
- @Parameter(name = ApiConstants.OVM3_VIP, type = CommandType.STRING, required = false, description = "Ovm3 vip to use for pool (and cluster)")
- private String ovm3vip;
- public String getOvm3Pool() {
- return ovm3pool;
- }
- public String getOvm3Cluster() {
- return ovm3cluster;
- }
- public String getOvm3Vip() {
- return ovm3vip;
- }
-
@Parameter(name = ApiConstants.VSM_USERNAME, type = CommandType.STRING, required = false, description = "the username for the VSM associated with this cluster")
private String vsmusername;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c79ab570/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java
index ba9015f..5f1188e 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java
@@ -65,11 +65,6 @@ public class AddTrafficTypeCmd extends BaseAsyncCreateCmd {
description = "The network name label of the physical device dedicated to this traffic on a KVM host")
private String kvmLabel;
- @Parameter(name = ApiConstants.OVM3_NETWORK_LABEL,
- type = CommandType.STRING,
- description = "The network name of the physical device dedicated to this traffic on an OVM3 host")
- private String ovm3Label;
-
@Parameter(name = ApiConstants.VMWARE_NETWORK_LABEL,
type = CommandType.STRING,
description = "The network name label of the physical device dedicated to this traffic on a VMware host")
@@ -107,10 +102,6 @@ public class AddTrafficTypeCmd extends BaseAsyncCreateCmd {
return kvmLabel;
}
- public String getOvm3Label() {
- return ovm3Label;
- }
-
public String getVmwareLabel() {
return vmwareLabel;
}
@@ -171,7 +162,7 @@ public class AddTrafficTypeCmd extends BaseAsyncCreateCmd {
public void create() throws ResourceAllocationException {
PhysicalNetworkTrafficType result =
_networkService.addTrafficTypeToPhysicalNetwork(getPhysicalNetworkId(), getTrafficType(), getIsolationMethod(), getXenLabel(), getKvmLabel(), getVmwareLabel(),
- getSimulatorLabel(), getVlan(), getHypervLabel(), getOvm3Label());
+ getSimulatorLabel(), getVlan(), getHypervLabel());
if (result != null) {
setEntityId(result.getId());
setEntityUuid(result.getUuid());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c79ab570/api/src/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java
index 8a8aeb2..68a9431 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java
@@ -55,11 +55,6 @@ public class UpdateTrafficTypeCmd extends BaseAsyncCmd {
description = "The network name label of the physical device dedicated to this traffic on a KVM host")
private String kvmLabel;
- @Parameter(name = ApiConstants.OVM3_NETWORK_LABEL,
- type = CommandType.STRING,
- description = "The network name of the physical device dedicated to this traffic on an OVM3 host")
- private String ovm3Label;
-
@Parameter(name = ApiConstants.VMWARE_NETWORK_LABEL,
type = CommandType.STRING,
description = "The network name label of the physical device dedicated to this traffic on a VMware host")
@@ -86,10 +81,6 @@ public class UpdateTrafficTypeCmd extends BaseAsyncCmd {
return kvmLabel;
}
- public String getOvm3Label() {
- return ovm3Label;
- }
-
public String getVmwareLabel() {
return vmwareLabel;
}
@@ -114,7 +105,7 @@ public class UpdateTrafficTypeCmd extends BaseAsyncCmd {
@Override
public void execute() {
- PhysicalNetworkTrafficType result = _networkService.updatePhysicalNetworkTrafficType(getId(), getXenLabel(), getKvmLabel(), getVmwareLabel(), getHypervLabel(), getOvm3Label());
+ PhysicalNetworkTrafficType result = _networkService.updatePhysicalNetworkTrafficType(getId(), getXenLabel(), getKvmLabel(), getVmwareLabel(), getHypervLabel());
if (result != null) {
TrafficTypeResponse response = _responseGenerator.createTrafficTypeResponse(result);
response.setResponseName(getCommandName());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c79ab570/api/src/org/apache/cloudstack/api/response/ClusterResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ClusterResponse.java b/api/src/org/apache/cloudstack/api/response/ClusterResponse.java
index df01e09..0890309 100644
--- a/api/src/org/apache/cloudstack/api/response/ClusterResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ClusterResponse.java
@@ -82,10 +82,6 @@ public class ClusterResponse extends BaseResponse {
@Param(description = "The memory overcommit ratio of the cluster")
private String memoryovercommitratio;
- @SerializedName("ovm3vip")
- @Param(description = "Ovm3 VIP to use for pooling and/or clustering")
- private String ovm3vip;
-
public String getId() {
return id;
}
@@ -189,12 +185,4 @@ public class ClusterResponse extends BaseResponse {
public String getMemoryOvercommitRatio() {
return memoryovercommitratio;
}
-
- public void setOvm3Vip(String ovm3vip) {
- this.ovm3vip = ovm3vip;
- }
-
- public String getOvm3Vip() {
- return ovm3vip;
- }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c79ab570/api/src/org/apache/cloudstack/api/response/TrafficTypeResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/TrafficTypeResponse.java b/api/src/org/apache/cloudstack/api/response/TrafficTypeResponse.java
index d8a9878..84ed2e6 100644
--- a/api/src/org/apache/cloudstack/api/response/TrafficTypeResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/TrafficTypeResponse.java
@@ -48,10 +48,6 @@ public class TrafficTypeResponse extends BaseResponse {
@Param(description = "The network name label of the physical device dedicated to this traffic on a KVM host")
private String kvmNetworkLabel;
- @SerializedName(ApiConstants.OVM3_NETWORK_LABEL)
- @Param(description = "The network name of the physical device dedicated to this traffic on an OVM3 host")
- private String ovm3NetworkLabel;
-
@SerializedName(ApiConstants.VMWARE_NETWORK_LABEL)
@Param(description = "The network name label of the physical device dedicated to this traffic on a VMware host")
private String vmwareNetworkLabel;
@@ -97,10 +93,6 @@ public class TrafficTypeResponse extends BaseResponse {
return kvmNetworkLabel;
}
- public String getOvm3Label() {
- return ovm3NetworkLabel;
- }
-
public String getHypervLabel() {
return hypervNetworkLabel;
}
@@ -117,10 +109,6 @@ public class TrafficTypeResponse extends BaseResponse {
this.kvmNetworkLabel = kvmLabel;
}
- public void setOvm3Label(String ovm3Label) {
- this.ovm3NetworkLabel = ovm3Label;
- }
-
public void setVmwareLabel(String vmwareNetworkLabel) {
this.vmwareNetworkLabel = vmwareNetworkLabel;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c79ab570/client/WEB-INF/classes/resources/messages.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 9ab3509..b504a18 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -378,10 +378,6 @@ label.affinity.groups=Affinity Groups
label.affinity=Affinity
label.agent.password=Agent Password
label.agent.username=Agent Username
-label.agent.port=Agent Port
-label.ovm3.vip=Master Vip IP
-label.ovm3.pool=Native Pooling
-label.ovm3.cluster=Native Clustering
label.agree=Agree
label.alert=Alert
label.algorithm=Algorithm
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c79ab570/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index cfa1bec..29fef4f 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -167,11 +167,6 @@
</dependency>
<dependency>
<groupId>org.apache.cloudstack</groupId>
- <artifactId>cloud-plugin-hypervisor-ovm3</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-plugin-hypervisor-kvm</artifactId>
<version>${project.version}</version>
<exclusions>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c79ab570/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java
index fe7d49c..4e8e017 100755
--- a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java
@@ -43,7 +43,6 @@ public class PhysicalNetworkTrafficTypeDaoImpl extends GenericDaoBase<PhysicalNe
final GenericSearchBuilder<PhysicalNetworkTrafficTypeVO, String> simulatorAllFieldsSearch;
final GenericSearchBuilder<PhysicalNetworkTrafficTypeVO, String> ovmAllFieldsSearch;
final GenericSearchBuilder<PhysicalNetworkTrafficTypeVO, String> hypervAllFieldsSearch;
- final GenericSearchBuilder<PhysicalNetworkTrafficTypeVO, String> ovm3AllFieldsSearch;
protected PhysicalNetworkTrafficTypeDaoImpl() {
super();
@@ -87,12 +86,6 @@ public class PhysicalNetworkTrafficTypeDaoImpl extends GenericDaoBase<PhysicalNe
ovmAllFieldsSearch.and("trafficType", ovmAllFieldsSearch.entity().getTrafficType(), Op.EQ);
ovmAllFieldsSearch.selectFields(ovmAllFieldsSearch.entity().getSimulatorNetworkLabel());
ovmAllFieldsSearch.done();
-
- ovm3AllFieldsSearch = createSearchBuilder(String.class);
- ovm3AllFieldsSearch.and("physicalNetworkId", ovm3AllFieldsSearch.entity().getPhysicalNetworkId(), Op.EQ);
- ovm3AllFieldsSearch.and("trafficType", ovm3AllFieldsSearch.entity().getTrafficType(), Op.EQ);
- ovm3AllFieldsSearch.selectFields(ovm3AllFieldsSearch.entity().getOvm3NetworkLabel());
- ovm3AllFieldsSearch.done();
}
@Override
@@ -131,8 +124,6 @@ public class PhysicalNetworkTrafficTypeDaoImpl extends GenericDaoBase<PhysicalNe
return null;
} else if (hType == HypervisorType.Hyperv) {
sc = hypervAllFieldsSearch.create();
- } else if (hType == HypervisorType.Ovm3) {
- sc = ovm3AllFieldsSearch.create();
} else {
assert (false) : "We don't handle this hypervisor type";
return null;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c79ab570/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeVO.java b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeVO.java
index 19e1acb..3fe9881 100644
--- a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeVO.java
+++ b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeVO.java
@@ -54,10 +54,6 @@ public class PhysicalNetworkTrafficTypeVO implements PhysicalNetworkTrafficType
@Column(name = "kvm_network_label")
private String kvmNetworkLabel;
- /* should perhaps have it's own label ? */
- @Column(name = "ovm_network_label")
- private String ovm3NetworkLabel;
-
@Column(name = "vmware_network_label")
private String vmwareNetworkLabel;
@@ -74,7 +70,7 @@ public class PhysicalNetworkTrafficTypeVO implements PhysicalNetworkTrafficType
}
public PhysicalNetworkTrafficTypeVO(long physicalNetworkId, TrafficType trafficType, String xenLabel, String kvmLabel, String vmwareLabel, String simulatorLabel,
- String vlan, String hypervLabel, String ovm3Label) {
+ String vlan, String hypervLabel) {
this.physicalNetworkId = physicalNetworkId;
this.trafficType = trafficType;
this.xenNetworkLabel = xenLabel;
@@ -82,7 +78,6 @@ public class PhysicalNetworkTrafficTypeVO implements PhysicalNetworkTrafficType
this.vmwareNetworkLabel = vmwareLabel;
this.simulatorNetworkLabel = simulatorLabel;
this.hypervNetworkLabel = hypervLabel;
- this.ovm3NetworkLabel = ovm3Label;
this.setVlan(vlan);
this.uuid = UUID.randomUUID().toString();
}
@@ -165,13 +160,4 @@ public class PhysicalNetworkTrafficTypeVO implements PhysicalNetworkTrafficType
return hypervNetworkLabel;
}
- public void setOvm3NetworkLabel(String ovm3NetworkLabel) {
- this.ovm3NetworkLabel = ovm3NetworkLabel;
-
- }
-
- @Override
- public String getOvm3NetworkLabel() {
- return ovm3NetworkLabel;
- }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c79ab570/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java
----------------------------------------------------------------------
diff --git a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java
index 4eb9bb0..da8d341 100644
--- a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java
+++ b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java
@@ -286,13 +286,9 @@ public class SnapshotObject implements SnapshotInfo {
} else if (answer instanceof CopyCmdAnswer) {
SnapshotObjectTO snapshotTO = (SnapshotObjectTO)((CopyCmdAnswer)answer).getNewData();
snapshotStore.setInstallPath(snapshotTO.getPath());
- // DEBUG [o.a.c.s.s.SnapshotServiceImpl] (Job-Executor-10:ctx-edd5ff44 ctx-822f2b0b) Failed to update snapshot state
- // java.lang.NullPointerException
- // at org.apache.cloudstack.storage.snapshot.SnapshotObject.processEvent(SnapshotObject.java:289)
- if (snapshotTO.getPhysicalSize() == null) {
- snapshotStore.setSize(0L);
- } else {
- snapshotStore.setSize(snapshotTO.getPhysicalSize());
+ if (snapshotTO.getPhysicalSize() != null) {
+ // For S3 delta snapshot, physical size is currently not set
+ snapshotStore.setSize(snapshotTO.getPhysicalSize());
}
if (snapshotTO.getParentSnapshotPath() == null) {
snapshotStore.setParentSnapshotId(0L);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c79ab570/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 9501858..b5e6a61 100755
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -50,7 +50,6 @@
<module>dedicated-resources</module>
<module>hypervisors/ovm</module>
<module>hypervisors/xenserver</module>
- <module>hypervisors/ovm3</module>
<module>hypervisors/kvm</module>
<module>event-bus/rabbitmq</module>
<module>event-bus/inmemory</module>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c79ab570/scripts/storage/secondary/cloud-install-sys-tmplt
----------------------------------------------------------------------
diff --git a/scripts/storage/secondary/cloud-install-sys-tmplt b/scripts/storage/secondary/cloud-install-sys-tmplt
index a6de3ad..96b11de 100755
--- a/scripts/storage/secondary/cloud-install-sys-tmplt
+++ b/scripts/storage/secondary/cloud-install-sys-tmplt
@@ -20,9 +20,9 @@
usage() {
- printf "Usage: %s: -m <secondary storage mount point> -f <system vm template file> [-h <hypervisor name: kvm|vmware|xenserver|hyperv|ovm3> ] [ -s <mgmt server secret key, if you specified any when running cloudstack-setup-database, default is password>][-u <Url to system vm template>] [-F <clean up system templates of specified hypervisor>] [-e <Template suffix, e.g vhd, ova, qcow2, raw>] [-o <Database server hostname or ip, e.g localhost>] [-r <Database user name, e.g root>] [-d <Database password. Fllowed by nothing if the password is empty>]\n" $(basename $0) >&2
+ printf "Usage: %s: -m <secondary storage mount point> -f <system vm template file> [-h <hypervisor name: kvm|vmware|xenserver|hyperv> ] [ -s <mgmt server secret key, if you specified any when running cloudstack-setup-database, default is password>][-u <Url to system vm template>] [-F <clean up system templates of specified hypervisor>] [-e <Template suffix, e.g vhd, ova, qcow2>] [-o <Database server hostname or ip, e.g localhost>] [-r <Database user name, e.g root>] [-d <Database password. Fllowed by nothing if the password is empty>]\n" $(basename $0) >&2
printf "or\n" >&2
- printf "%s: -m <secondary storage mount point> -u <http url for system vm template> [-h <hypervisor name: kvm|vmware|xenserver|hyperv|ovm3> ] [ -s <mgmt server secret key>]\n" $(basename $0) >&2
+ printf "%s: -m <secondary storage mount point> -u <http url for system vm template> [-h <hypervisor name: kvm|vmware|xenserver|hyperv> ] [ -s <mgmt server secret key>]\n" $(basename $0) >&2
}
failed() {
@@ -36,7 +36,7 @@ ext="vhd"
templateId=
hyper=
msKey=password
-DISKSPACE=512000 #free disk space required in kilobytes
+DISKSPACE=5120000 #free disk space required in kilobytes
dbHost=
dbUser=
dbPassword=
@@ -48,7 +48,7 @@ do
mntpoint="$OPTARG"
;;
f) fflag=1
- mytmpltimg="$OPTARG"
+ tmpltimg="$OPTARG"
;;
u) uflag=1
url="$OPTARG"
@@ -96,9 +96,9 @@ then
failed 4
fi
-if [[ "$fflag" == "1" && ! -f $mytmpltimg ]]
+if [[ "$fflag" == "1" && ! -f $tmpltimg ]]
then
- echo "template image file $mytmpltimg doesn't exist"
+ echo "template image file $tmpltimg doesn't exist"
failed 3
fi
@@ -165,10 +165,6 @@ then
then
ext="vhd"
templateId=(`mysql -h $dbHost --user=$dbUser --password=$dbPassword --skip-column-names -U cloud -e "select max(id) from cloud.vm_template where type = \"SYSTEM\" and hypervisor_type = \"Hyperv\" and removed is null"`)
- elif [ "$hyper" == "ovm3" ]
- then
- ext="raw"
- templateId=(`mysql -h $dbHost --user=$dbUser --password=$dbPassword --skip-column-names -U cloud -e "select max(id) from cloud.vm_template where type = \"SYSTEM\" and hypervisor_type = \"Ovm3\" and removed is null"`)
else
usage
failed 2
@@ -181,10 +177,7 @@ then
failed 8
fi
-_uuid=$(uuidgen)
-localfile=$_uuid.$ext
-
-_res=(`mysql -h $dbHost --user=$dbUser --password=$dbPassword --skip-column-names -U cloud -e "update cloud.vm_template set uuid=\"$_uuid\" where id=\"$templateId\""`)
+localfile=$(uuidgen).$ext
mntpoint=`echo "$mntpoint" | sed 's|/*$||'`
@@ -249,7 +242,7 @@ fi
if [ "$fflag" == "1" ]
then
- cp $mytmpltimg $tmpfile
+ cp $tmpltimg $tmpfile
if [ $? -ne 0 ]
then
printf "Failed to create temporary file in directory $(dirname $0) -- is it read-only or full?\n"
@@ -262,7 +255,7 @@ installrslt=$($(dirname $0)/createtmplt.sh -s 2 -d 'SystemVM Template' -n $local
if [ $? -ne 0 ]
then
- echo "Failed to install system vm template $mytmpltimg to $destdir: $installrslt"
+ echo "Failed to install system vm template $tmpltimg to $destdir: $installrslt"
failed 7
fi
@@ -283,4 +276,4 @@ echo "$ext.virtualsize=$tmpltsize" >> $destdir/template.properties
echo "virtualsize=$tmpltsize" >> $destdir/template.properties
echo "$ext.size=$tmpltsize" >> $destdir/template.properties
-echo "Successfully installed system VM template $_uuid to $destdir"
+echo "Successfully installed system VM template $tmpltimg to $destdir"
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c79ab570/scripts/storage/secondary/createtmplt.sh
----------------------------------------------------------------------
diff --git a/scripts/storage/secondary/createtmplt.sh b/scripts/storage/secondary/createtmplt.sh
index 838ce92..6b31232 100755
--- a/scripts/storage/secondary/createtmplt.sh
+++ b/scripts/storage/secondary/createtmplt.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c79ab570/server/src/com/cloud/configuration/Config.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java
index d52dbf2..196db93 100755
--- a/server/src/com/cloud/configuration/Config.java
+++ b/server/src/com/cloud/configuration/Config.java
@@ -715,7 +715,7 @@ public enum Config {
String.class,
"system.vm.default.hypervisor",
null,
- "Hypervisor type used to create system vm, valid values are: XenServer, KVM, VMware, Hyperv, VirtualBox, Parralels, BareMetal, Ovm, Ovm3, LXC, Any",
+ "Hypervisor type used to create system vm, valid values are: XenServer, KVM, VMware, Hyperv, VirtualBox, Parralels, BareMetal, Ovm, LXC, Any",
null),
SystemVMRandomPassword(
"Advanced",
@@ -732,7 +732,7 @@ public enum Config {
String.class,
"hypervisor.list",
HypervisorType.Hyperv + "," + HypervisorType.KVM + "," + HypervisorType.XenServer + "," + HypervisorType.VMware + "," + HypervisorType.BareMetal + "," +
- HypervisorType.Ovm + "," + HypervisorType.Ovm3 + "," + HypervisorType.LXC,
+ HypervisorType.Ovm + "," + HypervisorType.LXC,
"The list of hypervisors that this deployment will use.",
"hypervisorList"),
ManagementNetwork("Advanced", ManagementServer.class, String.class, "management.network.cidr", null, "The cidr of management server network", null),
@@ -1077,12 +1077,6 @@ public enum Config {
OvmPrivateNetwork("Hidden", ManagementServer.class, String.class, "ovm.private.network.device", null, "Specify the private bridge on host for private network", null),
OvmGuestNetwork("Hidden", ManagementServer.class, String.class, "ovm.guest.network.device", null, "Specify the private bridge on host for private network", null),
- // Ovm3
- Ovm3PublicNetwork("Hidden", ManagementServer.class, String.class, "ovm3.public.network.device", null, "Specify the public bridge on host for public network", null),
- Ovm3PrivateNetwork("Hidden", ManagementServer.class, String.class, "ovm3.private.network.device", null, "Specify the private bridge on host for private network", null),
- Ovm3GuestNetwork("Hidden", ManagementServer.class, String.class, "ovm3.guest.network.device", null, "Specify the guest bridge on host for guest network", null),
- Ovm3StorageNetwork("Hidden", ManagementServer.class, String.class, "ovm3.storage.network.device", null, "Specify the storage bridge on host for storage network", null),
-
// XenServer
XenServerPublicNetwork(
"Hidden",
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c79ab570/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index a7b2f2a..bb32c37 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -1734,7 +1734,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
PhysicalNetworkTrafficTypeVO mgmtTraffic = _trafficTypeDao.findBy(mgmtPhyNetwork.getId(), TrafficType.Management);
_networkSvc.addTrafficTypeToPhysicalNetwork(mgmtPhyNetwork.getId(), TrafficType.Storage.toString(), "vlan", mgmtTraffic.getXenNetworkLabel(),
mgmtTraffic.getKvmNetworkLabel(), mgmtTraffic.getVmwareNetworkLabel(), mgmtTraffic.getSimulatorNetworkLabel(), mgmtTraffic.getVlan(),
- mgmtTraffic.getHypervNetworkLabel(), mgmtTraffic.getOvm3NetworkLabel());
+ mgmtTraffic.getHypervNetworkLabel());
s_logger.info("No storage traffic type was specified by admin, create default storage traffic on physical network " + mgmtPhyNetwork.getId()
+ " with same configure of management traffic type");
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c79ab570/server/src/com/cloud/network/NetworkModelImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkModelImpl.java b/server/src/com/cloud/network/NetworkModelImpl.java
index 96af84f..0ef5cb9 100755
--- a/server/src/com/cloud/network/NetworkModelImpl.java
+++ b/server/src/com/cloud/network/NetworkModelImpl.java
@@ -1222,9 +1222,6 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel {
case Hyperv:
label = mgmtTraffic.getHypervNetworkLabel();
break;
- case Ovm3:
- label = mgmtTraffic.getOvm3NetworkLabel();
- break;
}
return label;
}
@@ -1257,9 +1254,6 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel {
case Hyperv:
label = storageTraffic.getHypervNetworkLabel();
break;
- case Ovm3:
- label = storageTraffic.getOvm3NetworkLabel();
- break;
}
return label;
}
@@ -1620,9 +1614,6 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel {
case Hyperv:
label = publicTraffic.getHypervNetworkLabel();
break;
- case Ovm3:
- label = publicTraffic.getOvm3NetworkLabel();
- break;
}
return label;
}
@@ -1655,9 +1646,7 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel {
case Hyperv:
label = guestTraffic.getHypervNetworkLabel();
break;
- case Ovm3:
- label = guestTraffic.getOvm3NetworkLabel();
- break;
+
}
return label;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c79ab570/server/src/com/cloud/network/NetworkServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java
index c29980a..a574f10 100755
--- a/server/src/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -3557,7 +3557,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
@DB
@ActionEvent(eventType = EventTypes.EVENT_TRAFFIC_TYPE_CREATE, eventDescription = "Creating Physical Network TrafficType", create = true)
public PhysicalNetworkTrafficType addTrafficTypeToPhysicalNetwork(Long physicalNetworkId, String trafficTypeStr, String isolationMethod, String xenLabel, String kvmLabel, String vmwareLabel,
- String simulatorLabel, String vlan, String hypervLabel, String ovm3Label) {
+ String simulatorLabel, String vlan, String hypervLabel) {
// verify input parameters
PhysicalNetworkVO network = _physicalNetworkDao.findById(physicalNetworkId);
@@ -3609,7 +3609,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
xenLabel = getDefaultXenNetworkLabel(trafficType);
}
PhysicalNetworkTrafficTypeVO pNetworktrafficType = new PhysicalNetworkTrafficTypeVO(physicalNetworkId, trafficType, xenLabel, kvmLabel, vmwareLabel, simulatorLabel,
- vlan, hypervLabel, ovm3Label);
+ vlan, hypervLabel);
pNetworktrafficType = _pNTrafficTypeDao.persist(pNetworktrafficType);
// For public traffic, get isolation method of physical network and update the public network accordingly
@@ -3669,7 +3669,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
@Override
@ActionEvent(eventType = EventTypes.EVENT_TRAFFIC_TYPE_UPDATE, eventDescription = "Updating physical network TrafficType", async = true)
- public PhysicalNetworkTrafficType updatePhysicalNetworkTrafficType(Long id, String xenLabel, String kvmLabel, String vmwareLabel, String hypervLabel, String ovm3Label) {
+ public PhysicalNetworkTrafficType updatePhysicalNetworkTrafficType(Long id, String xenLabel, String kvmLabel, String vmwareLabel, String hypervLabel) {
PhysicalNetworkTrafficTypeVO trafficType = _pNTrafficTypeDao.findById(id);
@@ -3702,12 +3702,6 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
}
trafficType.setHypervNetworkLabel(hypervLabel);
}
- if (ovm3Label != null) {
- if ("".equals(ovm3Label)) {
- ovm3Label = null;
- }
- trafficType.setOvm3NetworkLabel(ovm3Label);
- }
_pNTrafficTypeDao.update(id, trafficType);
return trafficType;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c79ab570/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index bb152c6..7991d7e 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -2847,7 +2847,6 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V
router.setTemplateVersion(versionAnswer.getTemplateVersion());
router.setScriptsVersion(versionAnswer.getScriptsVersion());
router = _routerDao.persist(router, guestNetworks);
-
}
return result;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c79ab570/server/src/com/cloud/resource/ResourceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java
index e8548ce..68c9286 100755
--- a/server/src/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -419,7 +419,6 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
throw new InvalidParameterValueException("Unable to resolve " + cmd.getHypervisor() + " to a supported ");
}
- /* check if OVM3 supports this */
if (zone.isSecurityGroupEnabled() && zone.getNetworkType().equals(NetworkType.Advanced)) {
if (hypervisorType != HypervisorType.KVM && hypervisorType != HypervisorType.XenServer && hypervisorType != HypervisorType.Simulator) {
throw new InvalidParameterValueException("Don't support hypervisor type " + hypervisorType + " in advanced security enabled zone");
@@ -478,13 +477,6 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
if (clusterType == Cluster.ClusterType.CloudManaged) {
Map<String, String> details = new HashMap<String, String>();
- // should do this nicer perhaps ?
- if (hypervisorType == HypervisorType.Ovm3) {
- Map<String, String> allParams = cmd.getFullUrlParams();
- details.put("ovm3vip", allParams.get("ovm3vip"));
- details.put("ovm3pool", allParams.get("ovm3pool"));
- details.put("ovm3cluster", allParams.get("ovm3cluster"));
- }
details.put("cpuOvercommitRatio", CapacityManager.CpuOverprovisioningFactor.value().toString());
details.put("memoryOvercommitRatio", CapacityManager.MemOverprovisioningFactor.value().toString());
_clusterDetailsDao.persist(cluster.getId(), details);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c79ab570/server/src/com/cloud/server/ManagementServerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index 9d03ac6..fb214b7 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -1120,12 +1120,11 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
}
if (!vm.getHypervisorType().equals(HypervisorType.XenServer) && !vm.getHypervisorType().equals(HypervisorType.VMware) && !vm.getHypervisorType().equals(HypervisorType.KVM)
- && !vm.getHypervisorType().equals(HypervisorType.Ovm) && !vm.getHypervisorType().equals(HypervisorType.Hyperv)
- && !vm.getHypervisorType().equals(HypervisorType.Ovm3)) {
+ && !vm.getHypervisorType().equals(HypervisorType.Ovm) && !vm.getHypervisorType().equals(HypervisorType.Hyperv)) {
if (s_logger.isDebugEnabled()) {
- s_logger.debug(vm + " is not XenServer/VMware/KVM/OVM/Hyperv/Ovm3, cannot migrate this VM.");
+ s_logger.debug(vm + " is not XenServer/VMware/KVM/OVM/Hyperv, cannot migrate this VM.");
}
- throw new InvalidParameterValueException("Unsupported Hypervisor Type for VM migration, we support " + "XenServer/VMware/KVM/Ovm/Hyperv/Ovm3 only");
+ throw new InvalidParameterValueException("Unsupported Hypervisor Type for VM migration, we support " + "XenServer/VMware/KVM/Ovm/Hyperv only");
}
long srcHostId = vm.getHostId();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c79ab570/server/src/com/cloud/storage/listener/StoragePoolMonitor.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/listener/StoragePoolMonitor.java b/server/src/com/cloud/storage/listener/StoragePoolMonitor.java
index 812aadd..9f6b5fb 100755
--- a/server/src/com/cloud/storage/listener/StoragePoolMonitor.java
+++ b/server/src/com/cloud/storage/listener/StoragePoolMonitor.java
@@ -76,8 +76,7 @@ public class StoragePoolMonitor implements Listener {
StartupRoutingCommand scCmd = (StartupRoutingCommand)cmd;
if (scCmd.getHypervisorType() == HypervisorType.XenServer || scCmd.getHypervisorType() == HypervisorType.KVM ||
scCmd.getHypervisorType() == HypervisorType.VMware || scCmd.getHypervisorType() == HypervisorType.Simulator ||
- scCmd.getHypervisorType() == HypervisorType.Ovm || scCmd.getHypervisorType() == HypervisorType.Hyperv ||
- scCmd.getHypervisorType() == HypervisorType.Ovm3) {
+ scCmd.getHypervisorType() == HypervisorType.Ovm || scCmd.getHypervisorType() == HypervisorType.Hyperv) {
List<StoragePoolVO> pools = _poolDao.listBy(host.getDataCenterId(), host.getPodId(), host.getClusterId(), ScopeType.CLUSTER);
List<StoragePoolVO> zoneStoragePoolsByTags = _poolDao.findZoneWideStoragePoolsByTags(host.getDataCenterId(), null);
List<StoragePoolVO> zoneStoragePoolsByHypervisor = _poolDao.findZoneWideStoragePoolsByHypervisor(host.getDataCenterId(), scCmd.getHypervisorType());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c79ab570/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 8af84c1..25c3eeb 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -3824,11 +3824,11 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
if (!vm.getHypervisorType().equals(HypervisorType.XenServer) && !vm.getHypervisorType().equals(HypervisorType.VMware) && !vm.getHypervisorType().equals(HypervisorType.KVM)
&& !vm.getHypervisorType().equals(HypervisorType.Ovm) && !vm.getHypervisorType().equals(HypervisorType.Hyperv)
- && !vm.getHypervisorType().equals(HypervisorType.Simulator) && !vm.getHypervisorType().equals(HypervisorType.Ovm3)) {
+ && !vm.getHypervisorType().equals(HypervisorType.Simulator)) {
if (s_logger.isDebugEnabled()) {
- s_logger.debug(vm + " is not XenServer/VMware/KVM/Ovm/Hyperv/Ovm3, cannot migrate this VM.");
+ s_logger.debug(vm + " is not XenServer/VMware/KVM/Ovm/Hyperv, cannot migrate this VM.");
}
- throw new InvalidParameterValueException("Unsupported Hypervisor Type for VM migration, we support XenServer/VMware/KVM/Ovm/Hyperv/Ovm3 only");
+ throw new InvalidParameterValueException("Unsupported Hypervisor Type for VM migration, we support XenServer/VMware/KVM/Ovm/Hyperv only");
}
if (isVMUsingLocalStorage(vm)) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c79ab570/server/test/com/cloud/vpc/MockNetworkManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vpc/MockNetworkManagerImpl.java b/server/test/com/cloud/vpc/MockNetworkManagerImpl.java
index d338cdf..387a710 100644
--- a/server/test/com/cloud/vpc/MockNetworkManagerImpl.java
+++ b/server/test/com/cloud/vpc/MockNetworkManagerImpl.java
@@ -403,11 +403,11 @@ public class MockNetworkManagerImpl extends ManagerBase implements NetworkOrches
}
/* (non-Javadoc)
- * @see com.cloud.network.NetworkService#addTrafficTypeToPhysicalNetwork(java.lang.Long, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+ * @see com.cloud.network.NetworkService#addTrafficTypeToPhysicalNetwork(java.lang.Long, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)
*/
@Override
public PhysicalNetworkTrafficType addTrafficTypeToPhysicalNetwork(Long physicalNetworkId, String trafficType, String isolationMethod, String xenLabel, String kvmLabel, String vmwareLabel,
- String simulatorLabel, String vlan, String hypervLabel, String ovm3Label) {
+ String simulatorLabel, String vlan, String hypervLabel) {
// TODO Auto-generated method stub
return null;
}
@@ -425,7 +425,7 @@ public class MockNetworkManagerImpl extends ManagerBase implements NetworkOrches
* @see com.cloud.network.NetworkService#updatePhysicalNetworkTrafficType(java.lang.Long, java.lang.String, java.lang.String, java.lang.String)
*/
@Override
- public PhysicalNetworkTrafficType updatePhysicalNetworkTrafficType(Long id, String xenLabel, String kvmLabel, String vmwareLabel, String hypervLabel, String ovm3Label) {
+ public PhysicalNetworkTrafficType updatePhysicalNetworkTrafficType(Long id, String xenLabel, String kvmLabel, String vmwareLabel, String hypervLabel) {
// TODO Auto-generated method stub
return null;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c79ab570/setup/db/create-schema.sql
----------------------------------------------------------------------
diff --git a/setup/db/create-schema.sql b/setup/db/create-schema.sql
index 9d4bef9..fe5cd0a 100755
--- a/setup/db/create-schema.sql
+++ b/setup/db/create-schema.sql
@@ -1683,9 +1683,6 @@ INSERT IGNORE INTO `cloud`.`hypervisor_capabilities`(hypervisor_type, hypervisor
INSERT IGNORE INTO `cloud`.`hypervisor_capabilities`(hypervisor_type, hypervisor_version, max_guests_limit, security_group_enabled) VALUES ('KVM', 'default', 50, 1);
INSERT IGNORE INTO `cloud`.`hypervisor_capabilities`(hypervisor_type, hypervisor_version, max_guests_limit, security_group_enabled) VALUES ('Ovm', 'default', 25, 1);
INSERT IGNORE INTO `cloud`.`hypervisor_capabilities`(hypervisor_type, hypervisor_version, max_guests_limit, security_group_enabled) VALUES ('Ovm', '2.3', 25, 1);
-INSERT IGNORE INTO `cloud`.`hypervisor_capabilities`(hypervisor_type, hypervisor_version, max_guests_limit, security_group_enabled) VALUES ('Ovm3', 'default', 25, 1);$
-INSERT IGNORE INTO `cloud`.`hypervisor_capabilities`(hypervisor_type, hypervisor_version, max_guests_limit, security_group_enabled) VALUES ('Ovm3', '3.0', 50, 1);$
-
CREATE TABLE `cloud`.`launch_permission` (
`id` bigint unsigned NOT NULL auto_increment,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c79ab570/setup/db/db/schema-410to420.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql
index 4a74db7..ebbcfef 100644
--- a/setup/db/db/schema-410to420.sql
+++ b/setup/db/db/schema-410to420.sql
@@ -546,7 +546,6 @@ update `cloud`.`volumes` v, `cloud`.`storage_pool` s, `cloud`.`cluster` c se
update `cloud`.`volumes` v, `cloud`.`storage_pool` s, `cloud`.`cluster` c set v.format='OVA' where v.pool_id=s.id and s.cluster_id=c.id and c.hypervisor_type='VMware';
update `cloud`.`volumes` v, `cloud`.`storage_pool` s, `cloud`.`cluster` c set v.format='QCOW2' where v.pool_id=s.id and s.cluster_id=c.id and c.hypervisor_type='KVM';
update `cloud`.`volumes` v, `cloud`.`storage_pool` s, `cloud`.`cluster` c set v.format='RAW' where v.pool_id=s.id and s.cluster_id=c.id and c.hypervisor_type='Ovm';
-update `cloud`.`volumes` v, `cloud`.`storage_pool` s, `cloud`.`cluster` c set v.format='RAW' where v.pool_id=s.id and s.cluster_id=c.id and c.hypervisor_type='Ovm3';
ALTER TABLE `cloud`.`networks` ADD COLUMN `display_network` tinyint(1) NOT NULL DEFAULT 1 COMMENT 'Should network be displayed to the end user';
@@ -667,7 +666,7 @@ ALTER TABLE `cloud`.`remote_access_vpn` ADD COLUMN `uuid` varchar(40) UNIQUE;
INSERT IGNORE INTO `cloud`.`hypervisor_capabilities`(uuid, hypervisor_type, hypervisor_version, max_guests_limit, security_group_enabled) VALUES (UUID(), 'LXC', 'default', 50, 1);
ALTER TABLE `cloud`.`physical_network_traffic_types` ADD COLUMN `lxc_network_label` varchar(255) DEFAULT 'cloudbr0' COMMENT 'The network name label of the physical device dedicated to this traffic on a LXC host';
-UPDATE configuration SET value='KVM,XenServer,VMware,BareMetal,Ovm,Ovm3,LXC' WHERE name='hypervisor.list';
+UPDATE configuration SET value='KVM,XenServer,VMware,BareMetal,Ovm,LXC' WHERE name='hypervisor.list';
INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type)
VALUES (10, UUID(), 'routing-10', 'SystemVM Template (LXC)', 0, now(), 'SYSTEM', 0, 64, 1, 'http://download.cloud.com/templates/acton/acton-systemvm-02062012.qcow2.bz2', '2755de1f9ef2ce4d6f2bee2efbb4da92', 0, 'SystemVM Template (LXC)', 'QCOW2', 15, 0, 1, 'LXC');
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c79ab570/setup/db/templates.sql
----------------------------------------------------------------------
diff --git a/setup/db/templates.sql b/setup/db/templates.sql
index 011a5f2..6a74633 100755
--- a/setup/db/templates.sql
+++ b/setup/db/templates.sql
@@ -30,9 +30,6 @@ INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created,
INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type, extractable)
VALUES (5, UUID(), 'centos56-x86_64-xen', 'CentOS 5.6(64-bit) no GUI (XenServer)', 1, now(), 'BUILTIN', 0, 64, 1, 'http://download.cloud.com/templates/builtin/centos56-x86_64.vhd.bz2', '905cec879afd9c9d22ecc8036131a180', 0, 'CentOS 5.6(64-bit) no GUI (XenServer)', 'VHD', 142, 1, 1, 'XenServer', 1);
--- INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type)
--- VALUES (6, UUID(), 'centos64-x64', 'CentOS 6.4(64-bit) GUI (Hyperv)', 1, now(), 'BUILTIN', 0, 64, 1, 'http://download.cloud.com/releases/4.3/centos6_4_64bit.vhd.bz2', 'eef6b9940ea3ed01221d963d4a012d0a', 0, 'CentOS 6.4 (64-bit) GUI (Hyperv)', 'VHD', 182, 1, 1, 'Hyperv', 1);
-
INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type, extractable)
VALUES (7, UUID(), 'centos53-x64', 'CentOS 5.3(64-bit) no GUI (vSphere)', 1, now(), 'BUILTIN', 0, 64, 1, 'http://download.cloud.com/releases/2.2.0/CentOS5.3-x86_64.ova', 'f6f881b7f2292948d8494db837fe0f47', 0, 'CentOS 5.3(64-bit) no GUI (vSphere)', 'OVA', 12, 1, 1, 'VMware', 1);
@@ -42,9 +39,8 @@ INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created,
INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type)
VALUES (9, UUID(), 'routing-9', 'SystemVM Template (HyperV)', 0, now(), 'SYSTEM', 0, 64, 1, 'http://download.cloud.com/templates/4.3/systemvm64template-2013-12-23-hyperv.vhd.bz2', '5df45ee6ebe1b703a8805f4e1f4d0818', 0, 'SystemVM Template (HyperV)', 'VHD', 15, 0, 1, 'Hyperv' );
--- 1- already taken, the upgrade 410 to 420 breaks...
-INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type)
- VALUES (11, UUID(), 'routing-11', 'SystemVM Template (Ovm3)', 0, now(), 'SYSTEM', 0, 32, 1, 'http://nibbler/~funs/iso/systemvmtemplate-4.2-ovm.vhd.bz2', '4425688804dbcf0abc9e9e56c53070d7', 0, 'SystemVM Template (Ovm3)', 'RAW', 183, 0, 1, 'Ovm3' );
+INSERT INTO `cloud`.`vm_template` (id, uuid, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type, extractable)
+ VALUES (6, UUID(), 'centos64-x64', 'CentOS 6.4(64-bit) GUI (Hyperv)', 1, now(), 'BUILTIN', 0, 64, 1, 'http://download.cloud.com/releases/4.3/centos6_4_64bit.vhd.bz2', 'eef6b9940ea3ed01221d963d4a012d0a', 0, 'CentOS 6.4 (64-bit) GUI (Hyperv)', 'VHD', 182, 1, 1, 'Hyperv', 1);
INSERT INTO `cloud`.`guest_os_category` (id, uuid, name) VALUES (1, UUID(), 'CentOS');
INSERT INTO `cloud`.`guest_os_category` (id, uuid, name) VALUES (2, UUID(), 'Debian');
@@ -598,15 +594,3 @@ INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest
INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ('KVM', 'Other', 60);
INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ('KVM', 'Other', 103);
-INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("Ovm3", 'Sun Solaris 10(32-bit)', 79);
-INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("Ovm3", 'Sun Solaris 10(64-bit)', 80);
-INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("Ovm3", 'Sun Solaris 11(32-bit)', 158);
-INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("Ovm3", 'Sun Solaris 11(64-bit)', 159);
-INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("Ovm3", 'Other Linux (32-bit)', 98);
-INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("Ovm3", 'Other Linux (64-bit)', 99);
-INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ('Ovm3', 'Other PV (32-bit)', 139);
-INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ('Ovm3', 'Other PV (64-bit)', 140);
-INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ('Ovm3', 'DOS', 102);
-INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("Ovm3", 'Windows 8 (32-bit)', 165);
-INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("Ovm3", 'Windows 8 (64-bit)', 166);
-INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("Ovm3", 'Windows Server 2012 (64-bit)', 167);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c79ab570/ui/dictionary.jsp
----------------------------------------------------------------------
diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp
index 4a21bee..9026a36 100644
--- a/ui/dictionary.jsp
+++ b/ui/dictionary.jsp
@@ -388,9 +388,6 @@ dictionary = {
'label.affinity.groups': '<fmt:message key="label.affinity.groups" />',
'label.agent.password': '<fmt:message key="label.agent.password" />',
'label.agent.username': '<fmt:message key="label.agent.username" />',
-'label.ovm3.pool': '<fmt:message key="label.ovm3.pool" />',
-'label.ovm3.cluster': '<fmt:message key="label.ovm3.cluster" />',
-'label.ovm3.vip': '<fmt:message key="label.ovm3.vip" />',
'label.agree': '<fmt:message key="label.agree" />',
'label.alert': '<fmt:message key="label.alert" />',
'label.algorithm': '<fmt:message key="label.algorithm" />',
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c79ab570/ui/scripts/docs.js
----------------------------------------------------------------------
diff --git a/ui/scripts/docs.js b/ui/scripts/docs.js
index 306da88..aad358b 100755
--- a/ui/scripts/docs.js
+++ b/ui/scripts/docs.js
@@ -1227,17 +1227,5 @@ cloudStack.docs = {
helpVpcOfferingDescription: {
desc: 'A short description of the offering that can be displayed to users',
externalLink: ''
- },
- helpOvm3pool: {
- desc: 'Pool the Ovm3 nodes in this cluster, required for vm node migrations',
- externalLink: ''
- },
- helpOvm3cluster: {
- desc: 'Use the native Ovm3 OCFS2 clustering, required for native HA and requires pooling',
- externalLink: ''
- },
- helpOvm3Vip: {
- desc: 'The VIP used by the pool and cluster',
- externalLink: ''
}
};
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c79ab570/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 513781f..7d49d8d 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -12694,12 +12694,7 @@
'vsmpassword_req'];
return $.inArray($(this).attr('rel'), nexusDvsReqFields) > -1;
});
- if ($form.find('.form-item[rel=hypervisor] select').val() == 'Ovm3') {
- $form.find('.form-item[rel=ovm3pool]').css('display', 'inline-block');
- $form.find('.form-item[rel=ovm3cluster]').css('display', 'inline-block');
- $form.find('.form-item[rel=ovm3vip]').css('display', 'inline-block');
- }
-
+
if ($form.find('.form-item[rel=hypervisor] select').val() == 'VMware') {
$form.find('.form-item[rel=vCenterHost]').css('display', 'inline-block');
$form.find('.form-item[rel=vCenterUsername]').css('display', 'inline-block');
@@ -12945,30 +12940,6 @@
required: false
}
},
-
- //hypervisor==Ovm3 begins here
- ovm3pool: {
- label: 'label.ovm3.pool',
- isHidden: true,
- isBoolean: true,
- isChecked: true,
- docID: 'helpOvm3pool'
- },
- ovm3cluster: {
- label: 'label.ovm3.cluster',
- isHidden: true,
- isBoolean: true,
- isChecked: false,
- docID: 'helpOvm3cluster'
- },
- ovm3vip: {
- label: 'label.ovm3.vip',
- isHidden: true,
- docID: 'helpOvm3Vip',
- validation: {
- required: false
- }
- },
//hypervisor==VMWare begins here
vCenterHost: {
@@ -13009,6 +12980,7 @@
docID: 'helpOverridePublicNetwork'
},
+
vSwitchPublicType: {
label: 'label.public.traffic.vswitch.type',
select: function (args) {
@@ -13198,11 +13170,7 @@
array1.push("&podId=" + args.data.podId);
var clusterName = args.data.name;
- if (args.data.hypervisor == "Ovm3") {
- array1.push("&ovm3pool=" + todb(args.data.ovm3pool));
- array1.push("&ovm3cluster=" + todb(args.data.ovm3cluster));
- array1.push("&ovm3vip=" + todb(args.data.ovm3vip));
- }
+
if (args.data.hypervisor == "VMware") {
array1.push("&username=" + todb(args.data.vCenterUsername));
array1.push("&password=" + todb(args.data.vCenterPassword));
@@ -14240,18 +14208,6 @@
$form.find('.form-item[rel=agentUsername]').css('display', 'inline-block');
$form.find('.form-item[rel=agentUsername]').find('input').val("oracle");
$form.find('.form-item[rel=agentPassword]').css('display', 'inline-block');
- } else if (selectedClusterObj.hypervisortype == "Ovm3") {
- //$('li[input_group="general"]', $dialogAddHost).show();
- $form.find('.form-item[rel=hostname]').css('display', 'inline-block');
- $form.find('.form-item[rel=username]').css('display', 'inline-block');
- $form.find('.form-item[rel=password]').css('display', 'inline-block');
-
- //$('li[input_group="Ovm3"]', $dialogAddHost).show();
- $form.find('.form-item[rel=agentUsername]').css('display', 'inline-block');
- $form.find('.form-item[rel=agentUsername]').find('input').val("oracle");
- $form.find('.form-item[rel=agentPassword]').css('display', 'inline-block');
- $form.find('.form-item[rel=agentPort]').css('display', 'inline-block');
- $form.find('.form-item[rel=agentPort]').find('input').val("8899");
} else {
//$('li[input_group="general"]', $dialogAddHost).show();
$form.find('.form-item[rel=hostname]').css('display', 'inline-block');
@@ -14414,16 +14370,6 @@
isPassword: true
},
//input_group="OVM" ends here
-
- //input_group="OVM3" starts here
- agentPort: {
- label: 'label.agent.port',
- validation: {
- required: false
- },
- isHidden: true
- },
- //input_group="OVM3" ends here
//always appear (begin)
hosttags: {
@@ -14488,16 +14434,9 @@
} else if (selectedClusterObj.hypervisortype == "Ovm") {
$.extend(data, {
agentusername: args.data.agentUsername,
- agentpassword: args.data.agentPassword,
- });
- } else if (selectedClusterObj.hypervisortype == "Ovm3") {
- $.extend(data, {
- agentusername: args.data.agentUsername,
- agentpassword: args.data.agentPassword,
- agentport: args.data.agentPort,
- });
- }
-
+ agentpassword: args.data.agentPassword
+ });
+ }
}
var hostId = null;
@@ -15588,22 +15527,6 @@
args.response.success({
data: items
});
- } else if (selectedClusterObj.hypervisortype == "Ovm3") {
- var items =[];
- items.push({
- id: "nfs",
- description: "nfs"
- });
- /*
- items.push({
- id: "ocfs2",
- description: "ocfs2"
- });
- */
- args.response.success({
- data: items
- });
-
} else if (selectedClusterObj.hypervisortype == "LXC") {
var items =[];
items.push({
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c79ab570/ui/scripts/templates.js
----------------------------------------------------------------------
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index 222e02c..e12927c 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -382,12 +382,6 @@
id: 'RAW',
description: 'RAW'
});
- } else if (args.hypervisor == "Ovm3") {
- //formatSelect.append("<option value='RAW'>RAW</option>");
- items.push({
- id: 'RAW',
- description: 'RAW'
- });
} else if (args.hypervisor == "LXC") {
//formatSelect.append("<option value='TAR'>TAR</option>");
items.push({
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c79ab570/ui/scripts/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index 9f5ae60..0a84bdb 100755
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -88,9 +88,6 @@
case 'Ovm':
hypervisorAttr = 'ovmnetworklabel';
break;
- case 'Ovm3':
- hypervisorAttr = 'ovmnetworklabel';
- break;
case 'LXC':
hypervisorAttr = 'lxcnetworklabel';
break;
@@ -477,7 +474,6 @@
nonSupportedHypervisors["BareMetal"] = 1;
nonSupportedHypervisors["Hyperv"] = 1;
nonSupportedHypervisors["Ovm"] = 1;
- nonSupportedHypervisors["Ovm3"] = 1;
nonSupportedHypervisors["LXC"] = 1;
}
@@ -940,15 +936,6 @@
return $.inArray($(this).attr('rel'), vsmFields) > -1;
});
- if ($(this).val() == "Ovm3") {
- $form.find('.form-item[rel=ovm3pool]').css('display', 'inline-block');
- $form.find('.form-item[rel=ovm3pool]').find('input[type=checkbox]').removeAttr('checked');
-
- $form.find('.form-item[rel=ovm3cluster]').css('display', 'inline-block');
- $form.find('.form-item[rel=ovm3cluster]').find('input[type=checkbox]').removeAttr('checked');
- $form.find('[rel=ovm3vip]').css('display', 'block');$
- }
-
if ($(this).val() == "VMware") {
//$('li[input_sub_group="external"]', $dialogAddCluster).show();
if (dvSwitchEnabled) {
@@ -1301,18 +1288,6 @@
$form.find('[rel=agentUsername]').css('display', 'block');
$form.find('[rel=agentUsername]').find('input').val("oracle");
$form.find('[rel=agentPassword]').css('display', 'block');
- } else if (selectedClusterObj.hypervisortype == "Ovm3") {
- //$('li[input_group="general"]', $dialogAddHost).show();
- $form.find('.form-item[rel=hostname]').css('display', 'inline-block');
- $form.find('.form-item[rel=username]').css('display', 'inline-block');
- $form.find('.form-item[rel=password]').css('display', 'inline-block');
-
- //$('li[input_group="Ovm3"]', $dialogAddHost).show();
- $form.find('.form-item[rel=agentUsername]').css('display', 'inline-block');
- $form.find('.form-item[rel=agentUsername]').find('input').val("oracle");
- $form.find('.form-item[rel=agentPassword]').css('display', 'inline-block');
- $form.find('.form-item[rel=agentPort]').css('display', 'inline-block');
- $form.find('.form-item[rel=agentPort]').find('input').val("8899");
} else {
//$('li[input_group="general"]', $dialogAddHost).show();
$form.find('[rel=hostname]').css('display', 'block');
@@ -1419,16 +1394,6 @@
},
//input_group="OVM" ends here
- //input_group="OVM3" starts here
- agentPort: {
- label: 'label.agent.port',
- validation: {
- required: false
- },
- isHidden: true
- },
- //input_group="OVM3" ends here
-
//always appear (begin)
hosttags: {
label: 'label.host.tags',
@@ -1567,7 +1532,7 @@
args.response.success({
data: items
});
- } else if (selectedClusterObj.hypervisortype == "Ovm" || selectedClusterObj.hypervisortype == "Ovm3") {
+ } else if (selectedClusterObj.hypervisortype == "Ovm") {
var items = [];
items.push({
id: "nfs",
@@ -4448,12 +4413,6 @@
agentusername: args.data.host.agentUsername,
agentpassword: args.data.host.agentPassword
});
- } else if (selectedClusterObj.hypervisortype == "Ovm3") {
- $.extend(data, {
- agentusername: args.data.agentUsername,
- agentpassword: args.data.agentPassword,
- agentport: args.data.agentPort,
- });
}
$.ajax({