Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E16CE11D3B for ; Mon, 23 Jun 2014 10:39:52 +0000 (UTC) Received: (qmail 92836 invoked by uid 500); 23 Jun 2014 10:39:52 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 92787 invoked by uid 500); 23 Jun 2014 10:39:52 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 92768 invoked by uid 99); 23 Jun 2014 10:39:52 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Jun 2014 10:39:52 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id DF98188729A; Mon, 23 Jun 2014 10:39:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dahn@apache.org To: commits@cloudstack.apache.org Date: Mon, 23 Jun 2014 10:39:51 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/8] git commit: updated refs/heads/master to 189972b Repository: cloudstack Updated Branches: refs/heads/master bbcffbbab -> 189972bc7 CLOUDSTACK-6967: Initial OVM3 drop Signed-off-by: Sebastien Goasguen (cherry picked from commit ed47763e2525a21fa4578d199492462d0fb1c7ef) Conflicts: api/src/com/cloud/network/NetworkService.java api/src/org/apache/cloudstack/api/ApiConstants.java api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java plugins/pom.xml server/src/com/cloud/network/NetworkServiceImpl.java server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java server/test/com/cloud/vpc/MockNetworkManagerImpl.java ui/scripts/docs.js Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8a485b9b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8a485b9b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8a485b9b Branch: refs/heads/master Commit: 8a485b9b59e4108e862022baf7477f768380b325 Parents: bbcffbb Author: Funs Authored: Fri Jun 20 13:22:19 2014 +0200 Committer: Daan Hoogland Committed: Mon Jun 23 12:39:10 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/hypervisors/ovm3 | 1 + 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 +++++++++- 36 files changed, 354 insertions(+), 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8a485b9b/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 f8b98cf..f8868af 100644 --- a/api/src/com/cloud/hypervisor/Hypervisor.java +++ b/api/src/com/cloud/hypervisor/Hypervisor.java @@ -31,6 +31,7 @@ public class Hypervisor { BareMetal, Simulator, Ovm, + Ovm3, LXC, Any; /*If you don't care about the hypervisor type*/ @@ -57,6 +58,8 @@ 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")) { @@ -81,6 +84,8 @@ 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/8a485b9b/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 1e126f5..646dcb6 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 simulatorLabel, String vlan, String hypervLabel, String ovm3Label); PhysicalNetworkTrafficType getPhysicalNetworkTrafficType(Long id); - PhysicalNetworkTrafficType updatePhysicalNetworkTrafficType(Long id, String xenLabel, String kvmLabel, String vmwareLabel, String hypervLabel); + PhysicalNetworkTrafficType updatePhysicalNetworkTrafficType(Long id, String xenLabel, String kvmLabel, String vmwareLabel, String hypervLabel, String ovm3Label); boolean deletePhysicalNetworkTrafficType(Long id); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8a485b9b/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 a50aa37..9676bad 100644 --- a/api/src/com/cloud/network/PhysicalNetworkTrafficType.java +++ b/api/src/com/cloud/network/PhysicalNetworkTrafficType.java @@ -39,4 +39,6 @@ public interface PhysicalNetworkTrafficType extends InternalIdentity, Identity { String getSimulatorNetworkLabel(); String getHypervNetworkLabel(); + + String getOvm3NetworkLabel(); } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8a485b9b/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 adda5f4..70ba144 100755 --- a/api/src/org/apache/cloudstack/api/ApiConstants.java +++ b/api/src/org/apache/cloudstack/api/ApiConstants.java @@ -379,6 +379,7 @@ 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"; @@ -461,6 +462,9 @@ 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/8a485b9b/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 b9df18e..c42886c 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") + description = "hypervisor type of the cluster: XenServer,KVM,VMware,Hyperv,BareMetal,Simulator,Ovm3") private String hypervisor; @Parameter(name = ApiConstants.CLUSTER_TYPE, type = CommandType.STRING, required = true, description = "type of the cluster: CloudManaged, ExternalManaged") @@ -75,6 +75,22 @@ 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/8a485b9b/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 5f1188e..ba9015f 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,6 +65,11 @@ 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") @@ -102,6 +107,10 @@ public class AddTrafficTypeCmd extends BaseAsyncCreateCmd { return kvmLabel; } + public String getOvm3Label() { + return ovm3Label; + } + public String getVmwareLabel() { return vmwareLabel; } @@ -162,7 +171,7 @@ public class AddTrafficTypeCmd extends BaseAsyncCreateCmd { public void create() throws ResourceAllocationException { PhysicalNetworkTrafficType result = _networkService.addTrafficTypeToPhysicalNetwork(getPhysicalNetworkId(), getTrafficType(), getIsolationMethod(), getXenLabel(), getKvmLabel(), getVmwareLabel(), - getSimulatorLabel(), getVlan(), getHypervLabel()); + getSimulatorLabel(), getVlan(), getHypervLabel(), getOvm3Label()); if (result != null) { setEntityId(result.getId()); setEntityUuid(result.getUuid()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8a485b9b/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 68a9431..8a8aeb2 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,6 +55,11 @@ 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") @@ -81,6 +86,10 @@ public class UpdateTrafficTypeCmd extends BaseAsyncCmd { return kvmLabel; } + public String getOvm3Label() { + return ovm3Label; + } + public String getVmwareLabel() { return vmwareLabel; } @@ -105,7 +114,7 @@ public class UpdateTrafficTypeCmd extends BaseAsyncCmd { @Override public void execute() { - PhysicalNetworkTrafficType result = _networkService.updatePhysicalNetworkTrafficType(getId(), getXenLabel(), getKvmLabel(), getVmwareLabel(), getHypervLabel()); + PhysicalNetworkTrafficType result = _networkService.updatePhysicalNetworkTrafficType(getId(), getXenLabel(), getKvmLabel(), getVmwareLabel(), getHypervLabel(), getOvm3Label()); if (result != null) { TrafficTypeResponse response = _responseGenerator.createTrafficTypeResponse(result); response.setResponseName(getCommandName()); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8a485b9b/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 0890309..df01e09 100644 --- a/api/src/org/apache/cloudstack/api/response/ClusterResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ClusterResponse.java @@ -82,6 +82,10 @@ 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; } @@ -185,4 +189,12 @@ 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/8a485b9b/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 84ed2e6..d8a9878 100644 --- a/api/src/org/apache/cloudstack/api/response/TrafficTypeResponse.java +++ b/api/src/org/apache/cloudstack/api/response/TrafficTypeResponse.java @@ -48,6 +48,10 @@ 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; @@ -93,6 +97,10 @@ public class TrafficTypeResponse extends BaseResponse { return kvmNetworkLabel; } + public String getOvm3Label() { + return ovm3NetworkLabel; + } + public String getHypervLabel() { return hypervNetworkLabel; } @@ -109,6 +117,10 @@ 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/8a485b9b/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 b504a18..9ab3509 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -378,6 +378,10 @@ 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/8a485b9b/client/pom.xml ---------------------------------------------------------------------- diff --git a/client/pom.xml b/client/pom.xml index 29fef4f..cfa1bec 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -167,6 +167,11 @@ org.apache.cloudstack + cloud-plugin-hypervisor-ovm3 + ${project.version} + + + org.apache.cloudstack cloud-plugin-hypervisor-kvm ${project.version} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8a485b9b/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 4e8e017..fe7d49c 100755 --- a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java +++ b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java @@ -43,6 +43,7 @@ public class PhysicalNetworkTrafficTypeDaoImpl extends GenericDaoBase simulatorAllFieldsSearch; final GenericSearchBuilder ovmAllFieldsSearch; final GenericSearchBuilder hypervAllFieldsSearch; + final GenericSearchBuilder ovm3AllFieldsSearch; protected PhysicalNetworkTrafficTypeDaoImpl() { super(); @@ -86,6 +87,12 @@ public class PhysicalNetworkTrafficTypeDaoImpl extends GenericDaoBasededicated-resources hypervisors/ovm hypervisors/xenserver + hypervisors/ovm3 hypervisors/kvm event-bus/rabbitmq event-bus/inmemory http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8a485b9b/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 96b11de..a6de3ad 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 -f [-h ] [ -s ][-u ] [-F ] [-e