Revert "CLOUDSTACK-6967: Initial OVM3 drop"

This reverts commit 8a485b9.

Author: DaanHoogland

api/src/com/cloud/hypervisor/Hypervisor.java

@@ -31,7 +31,6 @@ public static enum HypervisorType {
         BareMetal,
         Simulator,
         Ovm,
-        Ovm3,
         LXC,
 
         Any; /*If you don't care about the hypervisor type*/
@@ -58,8 +57,6 @@ public static HypervisorType getType(String 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 static ImageFormat getSupportedImageFormat(HypervisorType hyperType) {
                 return ImageFormat.OVA;
             } else if (hyperType == HypervisorType.Ovm) {
                 return ImageFormat.RAW;
-            } else if (hyperType == HypervisorType.Ovm3) {
-                return ImageFormat.RAW;
             } else {
                 return null;
             }

api/src/com/cloud/network/NetworkService.java

@@ -111,11 +111,11 @@ Pair<List<? extends PhysicalNetworkServiceProvider>, Integer> listNetworkService
     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);
 

api/src/com/cloud/network/PhysicalNetworkTrafficType.java

@@ -39,6 +39,4 @@ public interface PhysicalNetworkTrafficType extends InternalIdentity, Identity {
     String getSimulatorNetworkLabel();
 
     String getHypervNetworkLabel();
-
-    String getOvm3NetworkLabel();
 }

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";

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;
 

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 String getKvmLabel() {
         return kvmLabel;
     }
 
-    public String getOvm3Label() {
-        return ovm3Label;
-    }
-
     public String getVmwareLabel() {
         return vmwareLabel;
     }
@@ -171,7 +162,7 @@ public void execute() {
     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());

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 String getKvmLabel() {
         return kvmLabel;
     }
 
-    public String getOvm3Label() {
-        return ovm3Label;
-    }
-
     public String getVmwareLabel() {
         return vmwareLabel;
     }
@@ -114,7 +105,7 @@ public long getEntityOwnerId() {
 
     @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());

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 void setMemoryOvercommitRatio(String memoryovercommitratio) {
     public String getMemoryOvercommitRatio() {
         return memoryovercommitratio;
     }
-
-    public void setOvm3Vip(String ovm3vip) {
-        this.ovm3vip = ovm3vip;
-    }
-
-    public String getOvm3Vip() {
-        return ovm3vip;
-    }
 }

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 String getKvmLabel() {
         return kvmNetworkLabel;
     }
 
-    public String getOvm3Label() {
-        return ovm3NetworkLabel;
-    }
-
     public String getHypervLabel() {
         return hypervNetworkLabel;
     }
@@ -117,10 +109,6 @@ public void setKvmLabel(String kvmLabel) {
         this.kvmNetworkLabel = kvmLabel;
     }
 
-    public void setOvm3Label(String ovm3Label) {
-        this.ovm3NetworkLabel = ovm3Label;
-    }
-
     public void setVmwareLabel(String vmwareNetworkLabel) {
         this.vmwareNetworkLabel = vmwareNetworkLabel;
     }

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