Skip to content

Commit 4361418

Browse files
Donal Laffertysudison
Donal Lafferty
authored and
sudison
committed
Removed Dead Code from Management Server Hyper-V 2012 Support
Update ImageFormat enum to include VHDX format introduced with Hyper-V Server 2012. Remove existing Hyper-V plugin, because it does not work and is dead code. Remove references to existing Hyper-V plugin from config files. Remove Hypervisor.HypervisorType.Hyperv special cases from manager code that are unused or unsupported. Specifically, there is no CIFS secondary storage class "CifsSecondaryStorageResource". Also, the Hyper-V plugin's ServerResource is contacted by the management server and not the other way around. Add Hyperv-V support to ListHypervisorsCmd API call Signed-off-by: Edison Su <sudison@gmail.com>
1 parent 77fd76a commit 4361418

11 files changed

Lines changed: 3 additions & 1824 deletions

File tree

‎agent/src/com/cloud/agent/VmmAgentShell.java‎

Lines changed: 0 additions & 504 deletions
This file was deleted.

‎api/src/com/cloud/storage/Storage.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public static enum ImageFormat {
2626
VHD(true, true, true, "vhd"),
2727
ISO(false, false, false, "iso"),
2828
OVA(true, true, true, "ova"),
29+
VHDX(true, true, true, "vhdx"),
2930
BAREMETAL(false, false, false, "BAREMETAL"),
3031
TAR(false, false, false, "tar");
3132

‎client/tomcatconf/applicationContext.xml.in‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -537,10 +537,6 @@
537537
<property name="name" value="Lxc Discover"/>
538538
</bean>
539539

540-
<bean id="HypervServerDiscoverer" class="com.cloud.hypervisor.hyperv.HypervServerDiscoverer">
541-
<property name="name" value="SCVMMServer"/>
542-
</bean>
543-
544540
<bean id="OvmDiscoverer" class="com.cloud.ovm.hypervisor.OvmDiscoverer">
545541
<property name="name" value="Ovm Discover"/>
546542
</bean>

‎core/src/com/cloud/hypervisor/hyperv/resource/HypervResource.java‎

Lines changed: 0 additions & 978 deletions
This file was deleted.

‎engine/storage/integration-test/test/resource/component.xml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,6 @@
125125
<property name="name" value="Bare Metal Agent"/>
126126
</bean>
127127

128-
<bean id="HypervServerDiscoverer" class="com.cloud.hypervisor.hyperv.HypervServerDiscoverer">
129-
<property name="name" value="SCVMMServer"/>
130-
</bean>
131-
132-
133128
<bean id="FirstFitPlanner" class="com.cloud.deploy.FirstFitPlanner">
134129
<property name="name" value="First Fit"/>
135130
</bean>
@@ -188,10 +183,6 @@
188183
<property name="name" value="BareMetalGuru"/>
189184
</bean>
190185

191-
<bean id="HypervGuru" class="com.cloud.hypervisor.guru.HypervGuru">
192-
<property name="name" value="HypervGuru"/>
193-
</bean>
194-
195186
<!--
196187
DAO with customized configuration
197188
-->

‎plugins/network-elements/dns-notifier/resources/components-example.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ under the License.
113113
<adapter name="SecondaryStorage" class="com.cloud.storage.secondary.SecondaryStorageDiscoverer"/>
114114
<adapter name="KVM Agent" class="com.cloud.hypervisor.kvm.discoverer.KvmServerDiscoverer"/>
115115
<adapter name="Bare Metal Agent" class="com.cloud.baremetal.BareMetalDiscoverer"/>
116-
<adapter name="SCVMMServer" class="com.cloud.hypervisor.hyperv.HypervServerDiscoverer"/>
117116
<adapter name="Ovm Discover" class="com.cloud.ovm.hypervisor.OvmDiscoverer" />
118117
</adapters>
119118
<adapters key="com.cloud.deploy.DeploymentPlanner">
@@ -147,7 +146,6 @@ under the License.
147146
<adapter name="XenServerGuru" class="com.cloud.hypervisor.XenServerGuru"/>
148147
<adapter name="KVMGuru" class="com.cloud.hypervisor.KVMGuru"/>
149148
<adapter name="BareMetalGuru" class="com.cloud.baremetal.BareMetalGuru"/>
150-
<adapter name="HypervGuru" class="com.cloud.hypervisor.guru.HypervGuru"/>
151149
<adapter name="OvmGuru" class="com.cloud.ovm.hypervisor.OvmGuru" />
152150
</adapters>
153151
<adapters key="com.cloud.agent.StartupCommandProcessor">

‎server/src/com/cloud/configuration/Config.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ public enum Config {
202202
CPUOverprovisioningFactor("Advanced", ManagementServer.class, String.class, "cpu.overprovisioning.factor", "1", "Used for CPU overprovisioning calculation; available CPU will be (actualCpuCapacity * cpu.overprovisioning.factor)", null, ConfigurationParameterScope.cluster.toString()),
203203
MemOverprovisioningFactor("Advanced", ManagementServer.class, String.class, "mem.overprovisioning.factor", "1", "Used for memory overprovisioning calculation", null, ConfigurationParameterScope.cluster.toString()),
204204
LinkLocalIpNums("Advanced", ManagementServer.class, Integer.class, "linkLocalIp.nums", "10", "The number of link local ip that needed by domR(in power of 2)", null),
205-
HypervisorList("Advanced", ManagementServer.class, String.class, "hypervisor.list", HypervisorType.KVM + "," + HypervisorType.XenServer + "," + HypervisorType.VMware + "," + HypervisorType.BareMetal + "," + HypervisorType.Ovm + "," + HypervisorType.LXC, "The list of hypervisors that this deployment will use.", "hypervisorList"),
205+
HypervisorList("Advanced", ManagementServer.class, String.class, "hypervisor.list", HypervisorType.Hyperv + "," + HypervisorType.KVM + "," + HypervisorType.XenServer + "," + HypervisorType.VMware + "," + HypervisorType.BareMetal + "," + HypervisorType.Ovm + "," + HypervisorType.LXC, "The list of hypervisors that this deployment will use.", "hypervisorList"),
206206
ManagementHostIPAdr("Advanced", ManagementServer.class, String.class, "host", "localhost", "The ip address of management server", null),
207207
ManagementNetwork("Advanced", ManagementServer.class, String.class, "management.network.cidr", null, "The cidr of management server network", null),
208208
EventPurgeDelay("Advanced", ManagementServer.class, Integer.class, "event.purge.delay", "15", "Events older than specified number days will be purged. Set this value to 0 to never delete events", null),

‎server/src/com/cloud/hypervisor/guru/HypervGuru.java‎

Lines changed: 0 additions & 73 deletions
This file was deleted.

‎server/src/com/cloud/hypervisor/hyperv/HypervServerDiscoverer.java‎

Lines changed: 0 additions & 243 deletions
This file was deleted.

‎server/src/com/cloud/resource/ResourceManagerImpl.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -541,12 +541,6 @@ public List<? extends Cluster> discoverCluster(AddClusterCmd cmd) throws Illegal
541541
for (Map.Entry<? extends ServerResource, Map<String, String>> entry : resources.entrySet()) {
542542
ServerResource resource = entry.getKey();
543543

544-
// For Hyper-V, we are here means agent have already started
545-
// and connected to management server
546-
if (hypervisorType == Hypervisor.HypervisorType.Hyperv) {
547-
break;
548-
}
549-
550544
HostVO host = (HostVO) createHostAndAgent(resource, entry.getValue(), true, null, false);
551545
if (host != null) {
552546
hosts.add(host);

0 commit comments

Comments
 (0)