Merge lp:~mpontillo/maas/bug-1451852-remove-legacy-esxi-probe-and-enlist into lp:~maas-committers/maas/trunk

[Mike Pontillo]

Remove legacy (never shipped) VMware probe-and-enlist option.

Remove redundant VMware probe-and-enlist option.

[Andres Rodriguez (andreserl)]

lgtm!

review: Approve

=== removed file 'etc/maas/templates/power/esxi.template'
--- etc/maas/templates/power/esxi.template	2015-02-19 17:31:32 +0000
+++ etc/maas/templates/power/esxi.template	1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-# -*- mode: shell-script -*-
-#
-# Control virtual system's "power" through virsh for ESXi
-#
-
-# Exit with failure message.
-# Parameters: exit code, and error message.
-fail() {
-    echo "$2" >&2
-    exit $1
-}
-
-issue_virsh_command() {
-python - << END
-import sys
-from provisioningserver.drivers.hardware.esxi import power_control_esxi
-try:
-    power_control_esxi(
-        {{escape_py_literal(power_address).decode("ascii") | safe}},
-        {{escape_py_literal(power_id).decode("ascii") | safe}},
-        {{escape_py_literal(power_change).decode("ascii") | safe}},
-        {{escape_py_literal(power_user).decode("ascii") | safe}},
-        {{escape_py_literal(power_pass).decode("ascii") | safe}},
-    )
-except Exception as e:
-    # This gets in the node event log: print the exception's message
-    # and not the stacktrace.
-    print(unicode(e))
-    sys.exit(1)
-END
-}
-
-query_state() {
-python - << END
-import sys
-from provisioningserver.drivers.hardware.esxi import power_state_esxi
-try:
-    print(power_state_esxi(
-        {{escape_py_literal(power_address).decode("ascii") | safe}},
-        {{escape_py_literal(power_id).decode("ascii") | safe}},
-        {{escape_py_literal(power_user).decode("ascii") | safe}},
-        {{escape_py_literal(power_pass).decode("ascii") | safe}},
-    ))
-except Exception as e:
-    # This gets in the node event log: print the exception's message
-    # and not the stacktrace.
-    print(unicode(e))
-    sys.exit(1)
-END
-}
-
-main() {
-    case $1 in
-    'on'|'off')
-        issue_virsh_command
-        ;;
-    'query')
-        query_state
-        ;;
-    *)
-        fail 2 "Unknown power command: '$1'"
-    esac
-}
-
-main "{{power_change}}"
 
=== modified file 'src/maasserver/api/nodegroups.py'
--- src/maasserver/api/nodegroups.py	2015-05-07 18:14:38 +0000
+++ src/maasserver/api/nodegroups.py	2015-05-14 16:27:22 +0000
@@ -372,11 +372,10 @@
         """Add special hardware types.
 
         :param model: The type of hardware. 'seamicro15k', 'virsh', 'vsphere',
-            'esxi', 'powerkvm', 'mscm', 'msftocs' and 'ucsm' are supported.
+            'powerkvm', 'mscm', 'msftocs' and 'ucsm' are supported.
 
             seamicro15k is the model for the Seamicro 1500 Chassis.
             virsh is the model for Virtual Machines managed by Virsh.
-            esxi is the model for Virtual Machines managed by ESXi.
             powerkvm is the model for Virtual Machines on Power KVM,
             managed by Virsh.
             mscm is the model for the Moonshot Chassis Manager.
@@ -419,20 +418,6 @@
         :param prefix_filter: Filter nodes with supplied prefix.
         :type prefix_filter: unicode
 
-        The following are required if you are probing esxi:
-
-        :param address: The IP address of the esxi machine.
-        :type address: unicode
-        :param username: esxi username.
-        :type username: unicode
-        :param password: esxi password.
-        :type password: unicode
-
-        The following are optional if you are probing esxi:
-
-        :param prefix_filter: Filter nodes with supplied prefix.
-        :type prefix_filter: unicode
-
         The following are required if you are probing mscm:
 
         :param host: IP Address for the Moonshot Chassis Manager.
@@ -514,16 +499,6 @@
                 user, host, username, password, port=port,
                 protocol=protocol, prefix_filter=prefix_filter,
                 accept_all=accept_all)
-        elif model == 'esxi':
-            poweraddr = get_mandatory_param(request.data, 'address')
-            poweruser = get_mandatory_param(request.data, 'username')
-            password = get_mandatory_param(request.data, 'password')
-            prefix_filter = get_optional_param(
-                request.data, 'prefix_filter', default=None)
-
-            nodegroup.add_esxi(
-                user, poweruser, poweraddr, password=password,
-                prefix_filter=prefix_filter, accept_all=accept_all)
         else:
             return HttpResponse(status=httplib.BAD_REQUEST)
 
 
=== modified file 'src/maasserver/api/tests/test_nodegroup.py'
--- src/maasserver/api/tests/test_nodegroup.py	2015-05-07 18:14:38 +0000
+++ src/maasserver/api/tests/test_nodegroup.py	2015-05-14 16:27:22 +0000
@@ -57,7 +57,6 @@
 )
 from mock import Mock
 from provisioningserver.rpc.cluster import (
-    AddESXi,
     AddSeaMicro15k,
     AddVirsh,
     AddVsphere,
@@ -447,45 +446,6 @@
                 port=None, prefix_filter=prefix_filter,
                 accept_all=True))
 
-    def test_probe_and_enlist_hardware_adds_esxi(self):
-        self.become_admin()
-        user = self.logged_in_user
-        nodegroup = factory.make_NodeGroup()
-        model = 'esxi'
-        poweraddr = factory.make_ipv4_address()
-        password = factory.make_name('password')
-        poweruser = factory.make_name('poweruser')
-        prefix_filter = factory.make_name('filter')
-        accept_all = True
-
-        getClientFor = self.patch(nodegroup_module, 'getClientFor')
-        client = getClientFor.return_value
-        nodegroup = factory.make_NodeGroup()
-
-        response = self.client.post(
-            reverse('nodegroup_handler', args=[nodegroup.uuid]),
-            {
-                'op': 'probe_and_enlist_hardware',
-                'model': model,
-                'user': user.username,
-                'address': poweraddr,
-                'username': poweruser,
-                'password': password,
-                'prefix_filter': prefix_filter,
-                'accept_all': accept_all,
-            })
-
-        self.assertEqual(
-            httplib.OK, response.status_code,
-            explain_unexpected_response(httplib.OK, response))
-
-        self.expectThat(
-            client,
-            MockCalledOnceWith(
-                AddESXi, user=user.username, poweruser=poweruser,
-                poweraddr=poweraddr, password=password,
-                prefix_filter=prefix_filter, accept_all=True))
-
     def test_probe_and_enlist_hardware_adds_msftocs(self):
         self.become_admin()
         user = self.logged_in_user
 
=== modified file 'src/maasserver/models/nodegroup.py'
--- src/maasserver/models/nodegroup.py	2015-05-07 18:14:38 +0000
+++ src/maasserver/models/nodegroup.py	2015-05-14 16:27:22 +0000
@@ -50,7 +50,6 @@
 )
 from provisioningserver.dhcp.omshell import generate_omapi_key
 from provisioningserver.rpc.cluster import (
-    AddESXi,
     AddSeaMicro15k,
     AddVirsh,
     AddVsphere,
@@ -437,32 +436,6 @@
                 password=password, protocol=protocol, port=port,
                 prefix_filter=prefix_filter, accept_all=accept_all)
 
-    def add_esxi(self, user, poweruser, poweraddr, password,
-                 prefix_filter=None, accept_all=False):
-        """ Add all of the virtual machines inside a virsh controller.
-
-        :param user: user for the ESXi host.
-        :param poweraddr: IP address of esxi host string.
-        :param password: password.
-        :param prefix_filter: import based on prefix.
-        :param accept_all: commission enlisted nodes.
-
-        :raises NoConnectionsAvailable: If no connections to the cluster
-            are available.
-        """
-        try:
-            client = getClientFor(self.uuid, timeout=1)
-        except NoConnectionsAvailable:
-            # No connection to the cluster so we can't do anything. We
-            # let the caller handle the error, since we don't want to
-            # just drop it.
-            raise
-        else:
-            return client(
-                AddESXi, user=user, poweruser=poweruser, poweraddr=poweraddr,
-                password=password, prefix_filter=prefix_filter,
-                accept_all=accept_all)
-
     def enlist_nodes_from_ucsm(self, user, url, username,
                                password, accept_all=False):
         """ Add the servers from a Cicso UCS Manager.
 
=== modified file 'src/maasserver/models/tests/test_nodegroup.py'
--- src/maasserver/models/tests/test_nodegroup.py	2015-05-07 18:14:38 +0000
+++ src/maasserver/models/tests/test_nodegroup.py	2015-05-14 16:27:22 +0000
@@ -54,7 +54,6 @@
 )
 from provisioningserver.dhcp.omshell import generate_omapi_key
 from provisioningserver.rpc.cluster import (
-    AddESXi,
     AddSeaMicro15k,
     AddVirsh,
     AddVsphere,
@@ -683,59 +682,6 @@
             username, password, protocol=None, port=None,
             prefix_filter=None, accept_all=True)
 
-    def test_add_esxi_end_to_end(self):
-        nodegroup = factory.make_NodeGroup(status=NODEGROUP_STATUS.ACCEPTED)
-
-        self.useFixture(RegionEventLoopFixture("rpc"))
-        self.useFixture(RunningEventLoopFixture())
-        fixture = self.useFixture(MockLiveRegionToClusterRPCFixture())
-        protocol = fixture.makeCluster(nodegroup, AddESXi)
-        protocol.AddESXi.return_value = defer.succeed(
-            {'system_id': factory.make_name('system-id')})
-
-        user = factory.make_name('user')
-        poweruser = factory.make_name('poweruser')
-        poweraddr = factory.make_name('poweraddr')
-        password = factory.make_name('password')
-        nodegroup.add_esxi(
-            user, poweruser, poweraddr, password, None, True).wait(10)
-
-        self.expectThat(
-            protocol.AddESXi,
-            MockCalledOnceWith(
-                ANY, user=user, poweruser=poweruser, poweraddr=poweraddr,
-                password=password, prefix_filter=None, accept_all=True))
-
-    def test_add_esxi_calls_client_with_resource_endpoint(self):
-        getClientFor = self.patch(nodegroup_module, 'getClientFor')
-        client = getClientFor.return_value
-        nodegroup = factory.make_NodeGroup()
-
-        user = factory.make_name('user')
-        poweruser = factory.make_name('poweruser')
-        poweraddr = factory.make_name('poweraddr')
-        password = factory.make_name('password')
-        nodegroup.add_esxi(user, poweruser, poweraddr, password, None, True)
-
-        self.expectThat(
-            client,
-            MockCalledOnceWith(
-                AddESXi, user=user, poweruser=poweruser, poweraddr=poweraddr,
-                password=password, prefix_filter=None, accept_all=True))
-
-    def test_add_esxi_raises_if_no_connection_to_cluster(self):
-        getClientFor = self.patch(nodegroup_module, 'getClientFor')
-        getClientFor.side_effect = NoConnectionsAvailable()
-        nodegroup = factory.make_NodeGroup()
-
-        user = factory.make_name('user')
-        poweraddr = factory.make_name('poweraddr')
-        password = factory.make_name('password')
-
-        self.assertRaises(
-            NoConnectionsAvailable, nodegroup.add_esxi, user,
-            poweraddr, password, True)
-
     def test_add_seamicro15k_end_to_end(self):
         nodegroup = factory.make_NodeGroup(status=NODEGROUP_STATUS.ACCEPTED)
 
 
=== modified file 'src/maasserver/static/js/angular/controllers/add_hardware.js'
--- src/maasserver/static/js/angular/controllers/add_hardware.js	2015-05-07 15:00:36 +0000
+++ src/maasserver/static/js/angular/controllers/add_hardware.js	2015-05-14 16:27:22 +0000
@@ -172,46 +172,8 @@
                 fields: virshFields
             },
             {
-                name: 'esxi',
-                description: 'VMWare ESXi (virsh)',
-                fields: [
-                    {
-                        name: 'address',
-                        label: 'Address',
-                        field_type: 'string',
-                        "default": '',
-                        choices: [],
-                        required: true
-                    },
-                    {
-                        name: 'username',
-                        label: 'Username',
-                        field_type: 'string',
-                        "default": '',
-                        choices: [],
-                        required: true
-                    },
-                    {
-                        name: 'password',
-                        label: 'Password',
-                        field_type: 'string',
-                        "default": '',
-                        choices: [],
-                        required: true
-                    },
-                    {
-                        name: 'prefix_filter',
-                        label: 'Prefix filter',
-                        field_type: 'string',
-                        "default": '',
-                        choices: [],
-                        required: false
-                    }
-                ]
-            },
-            {
                 name: 'vsphere',
-                description: 'VMWare (python-vmomi)',
+                description: 'VMWare',
                 fields: [
                     {
                         name: 'host',
 
=== modified file 'src/maastesting/tests/test_scss.py'
--- src/maastesting/tests/test_scss.py	2015-05-12 12:38:12 +0000
+++ src/maastesting/tests/test_scss.py	2015-05-14 16:27:22 +0000
@@ -70,4 +70,4 @@
         tmp_css = self.read_content(
             os.path.join(output_dir, "maas-styles.css"))
         if in_tree_css != tmp_css:
-            self.fail("maas-styles.css is out-of-date.")
+            self.fail("maas-styles.css is out-of-date. (run 'make styles')")
 
=== removed file 'src/provisioningserver/drivers/hardware/esxi.py'
--- src/provisioningserver/drivers/hardware/esxi.py	2015-05-07 18:14:38 +0000
+++ src/provisioningserver/drivers/hardware/esxi.py	1970-01-01 00:00:00 +0000
@@ -1,116 +0,0 @@
-# Copyright 2015 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-from __future__ import (
-    absolute_import,
-    print_function,
-    unicode_literals,
-    )
-
-str = None
-
-__metaclass__ = type
-__all__ = [
-    'probe_esxi_and_enlist',
-    ]
-
-from provisioningserver.drivers.hardware.virsh import (
-    VirshSSH,
-    VirshVMState,
-    VM_STATE_TO_POWER_STATE,
-)
-from provisioningserver.utils import (
-    commission_node,
-    create_node,
-)
-from provisioningserver.utils.twisted import synchronous
-
-
-class ESXiError(Exception):
-    """Failure communicating to ESXi. """
-
-
-def compose_esxi_url(poweruser, poweraddr):
-    return "esx://%s@%s/?no_verify=1" % (poweruser, poweraddr)
-
-
-@synchronous
-def probe_esxi_and_enlist(
-        user, poweruser, poweraddr, password,
-        prefix_filter=None, accept_all=False):
-    """Extracts all of the virtual machines from virsh and enlists them
-    into MAAS.
-
-    :param user: user for the nodes.
-    :param poweraddr: IP Address of ESXi host.
-    :param password: password connection string.
-    :param prefix_filter: only enlist nodes that have the prefix.
-    :param accept_all: if True, commission enlisted nodes.
-    """
-    conn = VirshSSH(dom_prefix=prefix_filter)
-    virsh_poweraddr = compose_esxi_url(poweruser, poweraddr)
-    if not conn.login(virsh_poweraddr, password):
-        raise ESXiError('Failed to login to virsh console.')
-
-    for machine in conn.list():
-        arch = conn.get_arch(machine)
-        state = conn.get_state(machine)
-        macs = conn.get_mac_addresses(machine)
-
-        # Force the machine off, as MAAS will control the machine
-        # and it needs to be in a known state of off.
-        if state == VirshVMState.ON:
-            conn.poweroff(machine)
-
-        params = {
-            'power_address': poweraddr,
-            'power_user': poweruser,
-            'power_id': machine,
-            'power_pass': password,
-        }
-        system_id = create_node(macs, arch, 'esxi', params).wait(30)
-
-        if accept_all:
-            commission_node(system_id, user).wait(30)
-
-    conn.logout()
-
-
-def power_control_esxi(poweraddr, machine, power_change, poweruser, password):
-    """Powers controls a virtual machine using virsh."""
-
-    conn = VirshSSH()
-    virsh_poweraddr = compose_esxi_url(poweruser, poweraddr)
-    if not conn.login(virsh_poweraddr, password):
-        raise ESXiError('Failed to login to virsh console.')
-
-    state = conn.get_state(machine)
-    if state is None:
-        raise ESXiError('Failed to get virtual domain: %s' % machine)
-
-    if state == VirshVMState.OFF:
-        if power_change == 'on':
-            if not conn.poweron(machine):
-                raise ESXiError('Failed to power on domain: %s' % machine)
-    elif state == VirshVMState.ON:
-        if power_change == 'off':
-            if not conn.poweroff(machine):
-                raise ESXiError('Failed to power off domain: %s' % machine)
-
-
-def power_state_esxi(poweraddr, machine, poweruser, password):
-    """Return the power state for the virtual machine using virsh."""
-
-    conn = VirshSSH()
-    virsh_poweraddr = compose_esxi_url(poweruser, poweraddr)
-    if not conn.login(virsh_poweraddr, password):
-        raise ESXiError('Failed to login to virsh console.')
-
-    state = conn.get_state(machine)
-    if state is None:
-        raise ESXiError('Failed to get domain: %s' % machine)
-
-    try:
-        return VM_STATE_TO_POWER_STATE[state]
-    except KeyError:
-        raise ESXiError('Unknown power state: %s' % state)
 
=== removed file 'src/provisioningserver/drivers/hardware/tests/test_esxi.py'
--- src/provisioningserver/drivers/hardware/tests/test_esxi.py	2015-05-07 18:14:38 +0000
+++ src/provisioningserver/drivers/hardware/tests/test_esxi.py	1970-01-01 00:00:00 +0000
@@ -1,315 +0,0 @@
-# Copyright 2015 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""Tests for `provisioningserver.drivers.hardware.esxi`.
-"""
-
-from __future__ import (
-    absolute_import,
-    print_function,
-    unicode_literals,
-    )
-
-str = None
-
-__metaclass__ = type
-__all__ = []
-
-from textwrap import dedent
-
-from maastesting.factory import factory
-from maastesting.matchers import (
-    MockCalledOnceWith,
-    MockCalledWith,
-    MockCallsMatch,
-)
-from maastesting.testcase import (
-    MAASTestCase,
-    MAASTwistedRunTest,
-)
-from mock import call
-from provisioningserver.drivers.hardware import esxi as virsh
-from provisioningserver.utils.twisted import asynchronous
-from testtools.testcase import ExpectedException
-from twisted.internet.defer import inlineCallbacks
-from twisted.internet.threads import deferToThread
-
-
-SAMPLE_IFLIST = dedent("""
-    Interface  Type       Source     Model       MAC
-    -------------------------------------------------------
-    -          bridge     br0        e1000       %s
-    -          bridge     br1        e1000       %s
-    """)
-
-SAMPLE_DUMPXML = dedent("""
-    <domain type='kvm'>
-      <name>test</name>
-      <memory unit='KiB'>4096576</memory>
-      <currentMemory unit='KiB'>4096576</currentMemory>
-      <vcpu placement='static'>1</vcpu>
-      <os>
-        <type arch='%s'>hvm</type>
-        <boot dev='network'/>
-      </os>
-    </domain>
-    """)
-
-
-class TestESXi(MAASTestCase):
-    """Tests for `probe_esxi_and_enlist`."""
-
-    run_tests_with = MAASTwistedRunTest.make_factory(timeout=5)
-
-    @inlineCallbacks
-    def test_probe_and_enlist(self):
-        # Patch VirshSSH list so that some machines are returned
-        # with some fake architectures.
-        user = factory.make_name('user')
-        system_id = factory.make_name('system_id')
-        machines = [factory.make_name('machine') for _ in range(3)]
-        self.patch(virsh.VirshSSH, 'list').return_value = machines
-        fake_arch = factory.make_name('arch')
-        mock_arch = self.patch(virsh.VirshSSH, 'get_arch')
-        mock_arch.return_value = fake_arch
-
-        # Patch get_state so that one of the machines is on, so we
-        # can check that it will be forced off.
-        fake_states = [
-            virsh.VirshVMState.ON,
-            virsh.VirshVMState.OFF,
-            virsh.VirshVMState.OFF
-            ]
-        mock_state = self.patch(virsh.VirshSSH, 'get_state')
-        mock_state.side_effect = fake_states
-
-        # Setup the power parameters that we should expect to be
-        # the output of the probe_and_enlist
-        fake_password = factory.make_string()
-        poweruser = factory.make_name('poweruser')
-        poweraddr = factory.make_name('poweraddr')
-        esx_poweraddr = "esx://%s@%s/?no_verify=1" % (user, poweraddr)
-        called_params = []
-        fake_macs = []
-        for machine in machines:
-            macs = [factory.make_mac_address() for _ in range(3)]
-            fake_macs.append(macs)
-            called_params.append({
-                'power_address': poweraddr,
-                'power_id': machine,
-                'power_pass': fake_password,
-                'power_user': poweruser,
-                })
-
-        # Patch the get_mac_addresses so we get a known list of
-        # mac addresses for each machine.
-        mock_macs = self.patch(virsh.VirshSSH, 'get_mac_addresses')
-        mock_macs.side_effect = fake_macs
-
-        # Patch the poweroff and create as we really don't want these
-        # actions to occur, but want to also check that they are called.
-        mock_poweroff = self.patch(virsh.VirshSSH, 'poweroff')
-        mock_create_node = self.patch(virsh, 'create_node')
-        mock_create_node.side_effect = asynchronous(lambda *args: system_id)
-        mock_commission_node = self.patch(virsh, 'commission_node')
-
-        # Patch login and logout so that we don't really contact
-        # a server at the fake poweraddr
-        mock_login = self.patch(virsh.VirshSSH, 'login')
-        mock_login.return_value = True
-        mock_logout = self.patch(virsh.VirshSSH, 'logout')
-
-        # Perform the probe and enlist
-        yield deferToThread(
-            virsh.probe_esxi_and_enlist, user, poweruser, poweraddr,
-            password=fake_password, accept_all=True)
-
-        # Check that login was called with the provided poweraddr and
-        # password.
-        self.expectThat(
-            mock_login, MockCalledOnceWith(esx_poweraddr, fake_password))
-
-        # The first machine should have poweroff called on it, as it
-        # was initial in the on state.
-        self.expectThat(
-            mock_poweroff, MockCalledOnceWith(machines[0]))
-
-        # Check that the create command had the correct parameters for
-        # each machine.
-        self.expectThat(
-            mock_create_node, MockCallsMatch(
-                call(
-                    fake_macs[0], fake_arch, 'esxi', called_params[0]),
-                call(
-                    fake_macs[1], fake_arch, 'esxi', called_params[1]),
-                call(
-                    fake_macs[2], fake_arch,
-                    'esxi', called_params[2])))
-        mock_logout.assert_called()
-        self.expectThat(
-            mock_commission_node,
-            MockCalledWith(system_id, user))
-
-    @inlineCallbacks
-    def test_probe_and_enlist_login_failure(self):
-        user = factory.make_name('user')
-        poweruser = factory.make_name('poweruser')
-        poweraddr = factory.make_name('poweraddr')
-        mock_login = self.patch(virsh.VirshSSH, 'login')
-        mock_login.return_value = False
-        with ExpectedException(virsh.ESXiError):
-            yield deferToThread(
-                virsh.probe_esxi_and_enlist,
-                user, poweruser, poweraddr, password=factory.make_string())
-
-
-class TestESXiPowerControl(MAASTestCase):
-    """Tests for `power_control_esxi`."""
-
-    def test_power_control_login_failure(self):
-        mock_login = self.patch(virsh.VirshSSH, 'login')
-        mock_login.return_value = False
-        self.assertRaises(
-            virsh.ESXiError, virsh.power_control_esxi,
-            factory.make_name('poweraddr'), factory.make_name('machine'), 'on',
-            factory.make_name('username'), password=factory.make_string())
-
-    def test_power_control_on(self):
-        mock_login = self.patch(virsh.VirshSSH, 'login')
-        mock_login.return_value = True
-        mock_state = self.patch(virsh.VirshSSH, 'get_state')
-        mock_state.return_value = virsh.VirshVMState.OFF
-        mock_poweron = self.patch(virsh.VirshSSH, 'poweron')
-
-        poweraddr = factory.make_name('poweraddr')
-        machine = factory.make_name('machine')
-        username = factory.make_name('user')
-        password = factory.make_string()
-        esx_poweraddr = "esx://%s@%s/?no_verify=1" % (username, poweraddr)
-        virsh.power_control_esxi(poweraddr, machine, 'on', username, password)
-
-        self.assertThat(
-            mock_login, MockCalledOnceWith(esx_poweraddr, password))
-        self.assertThat(
-            mock_state, MockCalledOnceWith(machine))
-        self.assertThat(
-            mock_poweron, MockCalledOnceWith(machine))
-
-    def test_power_control_off(self):
-        mock_login = self.patch(virsh.VirshSSH, 'login')
-        mock_login.return_value = True
-        mock_state = self.patch(virsh.VirshSSH, 'get_state')
-        mock_state.return_value = virsh.VirshVMState.ON
-        mock_poweroff = self.patch(virsh.VirshSSH, 'poweroff')
-
-        poweraddr = factory.make_name('poweraddr')
-        machine = factory.make_name('machine')
-        username = factory.make_name('user')
-        password = factory.make_string()
-        esx_poweraddr = "esx://%s@%s/?no_verify=1" % (username, poweraddr)
-        virsh.power_control_esxi(poweraddr, machine, 'off', username, password)
-
-        self.assertThat(
-            mock_login, MockCalledOnceWith(esx_poweraddr, password))
-        self.assertThat(
-            mock_state, MockCalledOnceWith(machine))
-        self.assertThat(
-            mock_poweroff, MockCalledOnceWith(machine))
-
-    def test_power_control_bad_domain(self):
-        mock_login = self.patch(virsh.VirshSSH, 'login')
-        mock_login.return_value = True
-        mock_state = self.patch(virsh.VirshSSH, 'get_state')
-        mock_state.return_value = None
-
-        poweraddr = factory.make_name('poweraddr')
-        machine = factory.make_name('machine')
-        username = factory.make_name('user')
-        password = factory.make_string()
-        self.assertRaises(
-            virsh.ESXiError, virsh.power_control_esxi,
-            poweraddr, machine, 'on', username, password)
-
-    def test_power_control_power_failure(self):
-        mock_login = self.patch(virsh.VirshSSH, 'login')
-        mock_login.return_value = True
-        mock_state = self.patch(virsh.VirshSSH, 'get_state')
-        mock_state.return_value = virsh.VirshVMState.ON
-        mock_poweroff = self.patch(virsh.VirshSSH, 'poweroff')
-        mock_poweroff.return_value = False
-
-        poweraddr = factory.make_name('poweraddr')
-        machine = factory.make_name('machine')
-        username = factory.make_name('user')
-        password = factory.make_string()
-        self.assertRaises(
-            virsh.ESXiError, virsh.power_control_esxi,
-            poweraddr, machine, 'off', username, password)
-
-
-class TestESXiPowerState(MAASTestCase):
-    """Tests for `power_state_esxi`."""
-
-    def test_power_state_login_failure(self):
-        mock_login = self.patch(virsh.VirshSSH, 'login')
-        mock_login.return_value = False
-        self.assertRaises(
-            virsh.ESXiError, virsh.power_state_esxi,
-            factory.make_name('poweraddr'), factory.make_name('machine'),
-            factory.make_name('user'), password=factory.make_string())
-
-    def test_power_state_get_on(self):
-        mock_login = self.patch(virsh.VirshSSH, 'login')
-        mock_login.return_value = True
-        mock_state = self.patch(virsh.VirshSSH, 'get_state')
-        mock_state.return_value = virsh.VirshVMState.ON
-
-        poweraddr = factory.make_name('poweraddr')
-        machine = factory.make_name('machine')
-        username = factory.make_name('user')
-        password = factory.make_string()
-        self.assertEqual(
-            'on', virsh.power_state_esxi(poweraddr, machine,
-                                         username, password))
-
-    def test_power_state_get_off(self):
-        mock_login = self.patch(virsh.VirshSSH, 'login')
-        mock_login.return_value = True
-        mock_state = self.patch(virsh.VirshSSH, 'get_state')
-        mock_state.return_value = virsh.VirshVMState.OFF
-
-        poweraddr = factory.make_name('poweraddr')
-        machine = factory.make_name('machine')
-        username = factory.make_name('user')
-        password = factory.make_string()
-        self.assertEqual(
-            'off', virsh.power_state_esxi(poweraddr, machine,
-                                          username, password))
-
-    def test_power_control_bad_domain(self):
-        mock_login = self.patch(virsh.VirshSSH, 'login')
-        mock_login.return_value = True
-        mock_state = self.patch(virsh.VirshSSH, 'get_state')
-        mock_state.return_value = None
-
-        poweraddr = factory.make_name('poweraddr')
-        machine = factory.make_name('machine')
-        username = factory.make_name('user')
-        password = factory.make_string()
-        self.assertRaises(
-            virsh.ESXiError, virsh.power_state_esxi,
-            poweraddr, machine, username, password)
-
-    def test_power_state_error_on_unknown_state(self):
-        mock_login = self.patch(virsh.VirshSSH, 'login')
-        mock_login.return_value = True
-        mock_state = self.patch(virsh.VirshSSH, 'get_state')
-        mock_state.return_value = 'unknown'
-
-        poweraddr = factory.make_name('poweraddr')
-        machine = factory.make_name('machine')
-        username = factory.make_name('user')
-        password = factory.make_string()
-        self.assertRaises(
-            virsh.ESXiError, virsh.power_state_esxi,
-            poweraddr, machine, username, password)
 
=== modified file 'src/provisioningserver/power_schema.py'
--- src/provisioningserver/power_schema.py	2015-05-07 18:14:38 +0000
+++ src/provisioningserver/power_schema.py	2015-05-14 16:27:22 +0000
@@ -174,18 +174,8 @@
         ],
     },
     {
-        'name': 'esxi',
-        'description': 'VMWare ESXi (virsh)',
-        'fields': [
-            make_json_field('power_address', "Power address"),
-            make_json_field('power_id', "Power ID"),
-            make_json_field('power_user', "Power user"),
-            make_json_field('power_pass', "Power password"),
-        ],
-    },
-    {
         'name': 'vsphere',
-        'description': 'VMWare (python-pyvmomi)',
+        'description': 'VMWare',
         'fields': [
             make_json_field(
                 'power_vm_name', "VM Name (if UUID unknown)", required=False),
 
=== modified file 'src/provisioningserver/rpc/clusterservice.py'
--- src/provisioningserver/rpc/clusterservice.py	2015-05-07 18:14:38 +0000
+++ src/provisioningserver/rpc/clusterservice.py	2015-05-14 16:27:22 +0000
@@ -34,7 +34,6 @@
     ArchitectureRegistry,
     PowerTypeRegistry,
 )
-from provisioningserver.drivers.hardware.esxi import probe_esxi_and_enlist
 from provisioningserver.drivers.hardware.mscm import probe_and_enlist_mscm
 from provisioningserver.drivers.hardware.msftocs import (
     probe_and_enlist_msftocs,
@@ -368,19 +367,6 @@
         d.addErrback(partial(catch_probe_and_enlist_error, "virsh"))
         return {}
 
-    @cluster.AddESXi.responder
-    def add_esxi(self, user, poweruser, poweraddr,
-                 password, prefix_filter, accept_all):
-        """add_esxi()
-
-        Implementation of :py:class:`~provisioningserver.rpc.cluster.AddESXi`.
-        """
-        d = deferToThread(
-            probe_esxi_and_enlist,
-            user, poweruser, poweraddr, password, prefix_filter, accept_all)
-        d.addErrback(partial(catch_probe_and_enlist_error, "esxi"))
-        return {}
-
     @cluster.AddSeaMicro15k.responder
     def add_seamicro15k(self, user, mac, username,
                         password, power_control, accept_all):
@@ -417,7 +403,7 @@
             port=port, protocol=protocol, prefix_filter=prefix_filter,
             accept_all=accept_all)
         d.addErrback(
-            partial(catch_probe_and_enlist_error, "vSphere"))
+            partial(catch_probe_and_enlist_error, "VMware"))
         return {}
 
     @cluster.EnlistNodesFromMSCM.responder
 
=== modified file 'src/provisioningserver/rpc/power.py'
--- src/provisioningserver/rpc/power.py	2015-05-12 16:12:15 +0000
+++ src/provisioningserver/rpc/power.py	2015-05-14 16:27:22 +0000
@@ -67,7 +67,6 @@
 QUERY_POWER_TYPES = [
     'amt',
     'dli',
-    'esxi',
     'ipmi',
     'mscm',
     'msftocs',
 
=== modified file 'src/provisioningserver/rpc/tests/test_clusterservice.py'
--- src/provisioningserver/rpc/tests/test_clusterservice.py	2015-05-07 18:14:38 +0000
+++ src/provisioningserver/rpc/tests/test_clusterservice.py	2015-05-14 16:27:22 +0000
@@ -2082,63 +2082,7 @@
             clusterservice.maaslog.error,
             MockAnyCall(
                 "Failed to probe and enlist %s nodes: %s",
-                "vSphere", fake_error))
-
-
-class TestClusterProtocol_AddESXi(MAASTestCase):
-
-    def test__is_registered(self):
-        protocol = Cluster()
-        responder = protocol.locateResponder(
-            cluster.AddESXi.commandName)
-        self.assertIsNotNone(responder)
-
-    def test__calls_deferToThread_with_probe_esxi_and_enlist(self):
-        mock_deferToThread = self.patch_autospec(
-            clusterservice, 'deferToThread')
-        user = factory.make_name('user')
-        poweruser = factory.make_name('poweruser')
-        poweraddr = factory.make_name('poweraddr')
-        password = factory.make_name('password')
-        prefix_filter = factory.make_name('prefix_filter')
-        call_responder(Cluster(), cluster.AddESXi, {
-            "user": user,
-            "poweruser": poweruser,
-            "poweraddr": poweraddr,
-            "password": password,
-            "prefix_filter": prefix_filter,
-            "accept_all": True,
-            })
-        self.assertThat(
-            mock_deferToThread, MockCalledOnceWith(
-                clusterservice.probe_esxi_and_enlist,
-                user, poweruser, poweraddr, password,
-                prefix_filter, True))
-
-    def test__logs_error_to_maaslog(self):
-        fake_error = factory.make_name('error')
-        self.patch(clusterservice, 'maaslog')
-        mock_deferToThread = self.patch_autospec(
-            clusterservice, 'deferToThread')
-        mock_deferToThread.return_value = fail(Exception(fake_error))
-        user = factory.make_name('user')
-        poweruser = factory.make_name('poweruser')
-        poweraddr = factory.make_name('poweraddr')
-        password = factory.make_name('password')
-        prefix_filter = factory.make_name('prefix_filter')
-        call_responder(Cluster(), cluster.AddESXi, {
-            "user": user,
-            "poweruser": poweruser,
-            "poweraddr": poweraddr,
-            "password": password,
-            "prefix_filter": prefix_filter,
-            "accept_all": True,
-            })
-        self.assertThat(
-            clusterservice.maaslog.error,
-            MockAnyCall(
-                "Failed to probe and enlist %s nodes: %s",
-                "esxi", fake_error))
+                "VMware", fake_error))
 
 
 class TestClusterProtocol_AddSeaMicro15k(MAASTestCase):