remove some extra stuff

Author: Daan Hoogland

.github/boring-cyborg.yml

@@ -46,8 +46,6 @@ labelPRBasedOnFilePath:
   "component:dpdk":
     - server/src/main/java/com/cloud/hypervisor/kvm/dpdk/*
     - plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/dpdk/*
-  "component:hyperv":
-    - plugins/hypervisors/hyperv/*
   "component:integration-test":
     - test/integration/*
   "component:ipv6":

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

@@ -47,7 +47,6 @@ public enum Functionality {
         public static final HypervisorType XenServer = new HypervisorType("XenServer", ImageFormat.VHD, EnumSet.of(RootDiskSizeOverride, VmStorageMigration));
         public static final HypervisorType KVM = new HypervisorType("KVM", ImageFormat.QCOW2, EnumSet.of(DirectDownloadTemplate, RootDiskSizeOverride, VmStorageMigration));
         public static final HypervisorType VMware = new HypervisorType("VMware", ImageFormat.OVA, EnumSet.of(RootDiskSizeOverride, VmStorageMigration, VmStorageMigrationWithSnapshots));
-        public static final HypervisorType Hyperv = new HypervisorType("Hyperv");
         public static final HypervisorType VirtualBox = new HypervisorType("VirtualBox");
         public static final HypervisorType Parralels = new HypervisorType("Parralels");
         public static final HypervisorType BareMetal = new HypervisorType("BareMetal");

api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java

@@ -65,7 +65,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,External")
+               description = "Hypervisor type of the cluster: XenServer,KVM,VMware,BareMetal,Simulator,External")
     private String hypervisor;
 
     @Parameter(name = ApiConstants.ARCH, type = CommandType.STRING,

api/src/main/java/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java

@@ -104,7 +104,7 @@ public class ListHostsCmd extends BaseListCmd {
     @Parameter(name = ApiConstants.HA_HOST, type = CommandType.BOOLEAN, description = "If true, list only hosts dedicated to HA")
     private Boolean haHost;
 
-    @Parameter(name = ApiConstants.HYPERVISOR, type = CommandType.STRING, description = "Hypervisor type of host: XenServer,KVM,VMware,Hyperv,BareMetal,Simulator")
+    @Parameter(name = ApiConstants.HYPERVISOR, type = CommandType.STRING, description = "Hypervisor type of host: XenServer,KVM,VMware,BareMetal,Simulator")
     private String hypervisor;
 
     @Parameter(name = ApiConstants.MANAGEMENT_SERVER_ID, type = CommandType.UUID, entityType = ManagementServerResponse.class, description = "the id of the management server", since="4.21.0")

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

@@ -67,11 +67,13 @@ public class AddTrafficTypeCmd extends BaseAsyncCreateCmd {
                description = "The network name label of the physical device dedicated to this traffic on a VMware host")
     private String vmwareLabel;
 
+    @Deprecated
     @Parameter(name = ApiConstants.HYPERV_NETWORK_LABEL,
                type = CommandType.STRING,
                description = "The network name label of the physical device dedicated to this traffic on a Hyperv host")
     private String hypervLabel;
 
+    @Deprecated
     @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")
@@ -108,19 +110,11 @@ public String getVmwareLabel() {
         return vmwareLabel;
     }
 
-    public String getHypervLabel() {
-        return hypervLabel;
-    }
-
     public String getSimulatorLabel() {
         //simulators will have no labels
         return null;
     }
 
-    public String getOvm3Label() {
-        return ovm3Label;
-    }
-
     public void setVlan(String vlan) {
         this.vlan = vlan;
     }
@@ -163,7 +157,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(), null, null);
         if (result != null) {
             setEntityId(result.getId());
             setEntityUuid(result.getUuid());

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

@@ -57,11 +57,13 @@ public class UpdateTrafficTypeCmd extends BaseAsyncCmd {
                description = "The network name label of the physical device dedicated to this traffic on a VMware host")
     private String vmwareLabel;
 
+    @Deprecated
     @Parameter(name = ApiConstants.HYPERV_NETWORK_LABEL,
                type = CommandType.STRING,
                description = "The network name label of the physical device dedicated to this traffic on a Hyperv host")
     private String hypervLabel;
 
+    @Deprecated
     @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")
@@ -87,14 +89,6 @@ public String getVmwareLabel() {
         return vmwareLabel;
     }
 
-    public String getHypervLabel() {
-        return hypervLabel;
-    }
-
-    public String getOvm3Label() {
-        return ovm3Label;
-    }
-
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
@@ -106,7 +100,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(), null, null);
         if (result != null) {
             TrafficTypeResponse response = _responseGenerator.createTrafficTypeResponse(result);
             response.setResponseName(getCommandName());

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

@@ -52,10 +52,6 @@ public class TrafficTypeResponse extends BaseResponse {
     @Param(description = "The Network name label of the physical device dedicated to this traffic on a VMware host")
     private String vmwareNetworkLabel;
 
-    @SerializedName(ApiConstants.HYPERV_NETWORK_LABEL)
-    @Param(description = "The Network name label of the physical device dedicated to this traffic on a HyperV host")
-    private String hypervNetworkLabel;
-
     @SerializedName(ApiConstants.VLAN)
     @Param(description = "The VLAN id to be used for Management traffic by VMware host")
     private String vlan;
@@ -64,10 +60,6 @@ public class TrafficTypeResponse extends BaseResponse {
     @Param(description = "isolation methods for the physical network traffic")
     private String isolationMethods;
 
-    @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;
-
     @Override
     public String getObjectId() {
         return this.id;
@@ -105,18 +97,10 @@ public String getKvmLabel() {
         return kvmNetworkLabel;
     }
 
-    public String getHypervLabel() {
-        return hypervNetworkLabel;
-    }
-
     public void setXenLabel(String xenLabel) {
         this.xenNetworkLabel = xenLabel;
     }
 
-    public void setHypervLabel(String hypervLabel) {
-        this.hypervNetworkLabel = hypervLabel;
-    }
-
     public void setKvmLabel(String kvmLabel) {
         this.kvmNetworkLabel = kvmLabel;
     }
@@ -129,14 +113,6 @@ public String getVmwareLabel() {
         return vmwareNetworkLabel;
     }
 
-    public String getOvm3Label() {
-        return ovm3NetworkLabel;
-    }
-
-    public void setOvm3Label(String ovm3Label) {
-        this.ovm3NetworkLabel = ovm3Label;
-    }
-
     public String getIsolationMethods() {
         return isolationMethods;
     }

engine/orchestration/pom.xml

@@ -78,6 +78,12 @@
             <artifactId>cloud-plugin-hypervisor-external</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.cloudstack</groupId>
+            <artifactId>cloud-api</artifactId>
+            <version>4.23.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java

@@ -2010,7 +2010,7 @@ public boolean getExecuteInSequence(final HypervisorType hypervisorType) {
             return ExecuteInSequence.value();
         }
 
-        if (Set.of(HypervisorType.KVM, HypervisorType.XenServer, HypervisorType.Hyperv, HypervisorType.LXC).contains(hypervisorType)) {
+        if (Set.of(HypervisorType.KVM, HypervisorType.XenServer, HypervisorType.LXC).contains(hypervisorType)) {
             return false;
         } else if (hypervisorType.equals(HypervisorType.VMware)) {
             return StorageManager.shouldExecuteInSequenceOnVmware();
@@ -5406,8 +5406,7 @@ private void handlePowerOffReportWithNoPendingJobsOnVM(final VMInstanceVO vm) {
                             , vm, vm.getState(), vm.getPowerState());
             if((HighAvailabilityManager.ForceHA.value() || vm.isHaEnabled()) && vm.getState() == State.Running
                     && HaVmRestartHostUp.value()
-                    && vm.getHypervisorType() != HypervisorType.VMware
-                    && vm.getHypervisorType() != HypervisorType.Hyperv) {
+                    && vm.getHypervisorType() != HypervisorType.VMware) {
                 logger.info("Detected out-of-band stop of a HA enabled VM {}, will schedule restart.", vm);
                 if (!_haMgr.hasPendingHaWork(vm.getId())) {
                     _haMgr.scheduleRestart(vm, true);

engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java

@@ -1156,24 +1156,14 @@ private ImageFormat getSupportedImageFormatForCluster(HypervisorType hyperType)
             return ImageFormat.OVA;
         } else if (hyperType == HypervisorType.Ovm) {
             return ImageFormat.RAW;
-        } else if (hyperType == HypervisorType.Hyperv) {
-            return ImageFormat.VHDX;
         } else {
             return null;
         }
     }
 
     private boolean isSupportedImageFormatForCluster(VolumeInfo volume, HypervisorType rootDiskHyperType) {
         ImageFormat volumeFormat = volume.getFormat();
-        if (rootDiskHyperType == HypervisorType.Hyperv) {
-            if (volumeFormat.equals(ImageFormat.VHDX) || volumeFormat.equals(ImageFormat.VHD)) {
-                return true;
-            } else {
-                return false;
-            }
-        } else {
-            return volume.getFormat().equals(getSupportedImageFormatForCluster(rootDiskHyperType));
-        }
+        return volume.getFormat().equals(getSupportedImageFormatForCluster(rootDiskHyperType));
     }
 
     private VolumeInfo copyVolume(StoragePool rootDiskPool, VolumeInfo volumeInfo, VirtualMachine vm, VirtualMachineTemplate rootDiskTmplt, DataCenter dcVO, Pod pod, DiskOffering diskVO,