Merge lp:~ltrager/maas/lp1637401_2.1 into lp:maas/2.1

[Lee Trager]

Backport r5579 from trunk: During probe and enlist of virsh only power off and commission new nodes.

Previously probe_virsh_and_enlist would power off each node before requesting a new node row was created. If the machine already exists or there was some issue creating the new node row the node was still powered off. This meant reprobing a virsh host would power off all known nodes. Power off now only happens if a new row was successfully created, existing nodes are ignored and left untouched.

[Lee Trager (ltrager)]

Reviewed in https://code.launchpad.net/~ltrager/maas/lp1637401/+merge/312098

review: Approve

[MAAS Lander (maas-lander)]

The attempt to merge lp:~ltrager/maas/lp1637401_2.1 into lp:maas/2.1 failed. Below is the output from the failed tests.

Get:1 http://security.ubuntu.com/ubuntu xenial-security InRelease [102 kB]
Hit:2 http://prodstack-zone-1.clouds.archive.ubuntu.com/ubuntu xenial InRelease
Get:3 http://prodstack-zone-1.clouds.archive.ubuntu.com/ubuntu xenial-updates InRelease [102 kB]
Get:4 http://prodstack-zone-1.clouds.archive.ubuntu.com/ubuntu xenial-backports InRelease [102 kB]
Get:5 http://security.ubuntu.com/ubuntu xenial-security/main Sources [50.6 kB]
Get:6 http://security.ubuntu.com/ubuntu xenial-security/main amd64 Packages [181 kB]
Get:7 http://security.ubuntu.com/ubuntu xenial-security/universe amd64 Packages [64.0 kB]
Get:8 http://prodstack-zone-1.clouds.archive.ubuntu.com/ubuntu xenial-updates/main Sources [207 kB]
Get:9 http://prodstack-zone-1.clouds.archive.ubuntu.com/ubuntu xenial-updates/main amd64 Packages [429 kB]
Get:10 http://prodstack-zone-1.clouds.archive.ubuntu.com/ubuntu xenial-updates/main Translation-en [166 kB]
Get:11 http://prodstack-zone-1.clouds.archive.ubuntu.com/ubuntu xenial-updates/universe amd64 Packages [366 kB]
Fetched 1,770 kB in 0s (2,413 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
    --no-install-recommends install apache2 archdetect-deb authbind avahi-utils bash bind9 bind9utils build-essential bzr bzr-builddeb chromium-browser chromium-chromedriver curl daemontools debhelper dh-apport dh-systemd distro-info dnsutils firefox freeipmi-tools git gjs ipython isc-dhcp-common isc-dhcp-server libjs-angularjs libjs-jquery libjs-jquery-hotkeys libjs-yui3-full libjs-yui3-min libpq-dev make nodejs-legacy npm postgresql pxelinux python3-all python3-apt python3-attr python3-bson python3-convoy python3-crochet python3-cssselect python3-curtin python3-dev python3-distro-info python3-django python3-django-nose python3-django-piston3 python3-dnspython python3-docutils python3-formencode python3-hivex python3-httplib2 python3-jinja2 python3-jsonschema python3-lxml python3-netaddr python3-netifaces python3-novaclient python3-oauth python3-oauthlib python3-openssl python3-paramiko python3-petname python3-pexpect python3-psycopg2 python3-pyinotify python3-pyparsing python3-pyvmomi python3-requests python3-seamicroclient python3-setuptools python3-simplestreams python3-sphinx python3-tempita python3-twisted python3-txtftp python3-tz python3-yaml python3-zope.interface python-bson python-crochet python-django python-django-piston python-djorm-ext-pgarray python-formencode python-lxml python-netaddr python-netifaces python-pocket-lint python-psycopg2 python-simplejson python-tempita python-twisted python-yaml socat syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading package lists...
Building dependency tree...
Reading state information...
authbind is already the newest version (2.1.1+nmu1).
avahi-utils is already the newest version (0.6.32~rc+dfsg-1ubuntu2).
build-essential is already the newest version (12.1ubuntu2).
debhelper is already the newest version (9.20160115ubuntu3).
distro-info is already the newest version (0.14build1).
freeipmi-tools is already the newest version (1.4.11-1ubu...

=== modified file 'src/provisioningserver/drivers/hardware/tests/test_virsh.py'
--- src/provisioningserver/drivers/hardware/tests/test_virsh.py	2016-05-12 19:07:37 +0000
+++ src/provisioningserver/drivers/hardware/tests/test_virsh.py	2016-11-30 23:24:27 +0000
@@ -13,9 +13,7 @@
 from lxml import etree
 from maastesting.factory import factory
 from maastesting.matchers import (
-    MockAnyCall,
     MockCalledOnceWith,
-    MockCalledWith,
     MockCallsMatch,
 )
 from maastesting.testcase import (
@@ -267,7 +265,7 @@
         # with some fake architectures.
         user = factory.make_name('user')
         system_id = factory.make_name('system_id')
-        machines = [factory.make_name('machine') for _ in range(4)]
+        machines = [factory.make_name('machine') for _ in range(5)]
         self.patch(virsh.VirshSSH, 'list').return_value = machines
         fake_arch = factory.make_name('arch')
         mock_arch = self.patch(virsh.VirshSSH, 'get_arch')
@@ -281,6 +279,7 @@
             virsh.VirshVMState.OFF,
             virsh.VirshVMState.OFF,
             virsh.VirshVMState.ON,
+            virsh.VirshVMState.ON,
             ]
         mock_state = self.patch(virsh.VirshSSH, 'get_state')
         mock_state.side_effect = fake_states
@@ -310,7 +309,7 @@
         mock_poweroff = self.patch(virsh.VirshSSH, 'poweroff')
         mock_create_node = self.patch(virsh, 'create_node')
         mock_create_node.side_effect = asynchronous(
-            lambda *args, **kwargs: system_id)
+            lambda *args, **kwargs: None if machines[4] in args else system_id)
         mock_commission_node = self.patch(virsh, 'commission_node')
 
         # Patch login and logout so that we don't really contact
@@ -324,6 +323,7 @@
             SAMPLE_DUMPXML_2,
             SAMPLE_DUMPXML_3,
             SAMPLE_DUMPXML_4,
+            SAMPLE_DUMPXML,
         ]
 
         mock_run = self.patch(virsh.VirshSSH, 'run')
@@ -339,12 +339,6 @@
         self.expectThat(
             mock_login, MockCalledOnceWith(poweraddr, fake_password))
 
-        # The first and last machine should have poweroff called on it, as it
-        # was initial in the on state.
-        self.expectThat(mock_poweroff, MockAnyCall(machines[0]))
-
-        self.expectThat(mock_poweroff, MockAnyCall(machines[3]))
-
         # Check that the create command had the correct parameters for
         # each machine.
         self.expectThat(
@@ -361,11 +355,27 @@
                 call(
                     fake_macs[3], fake_arch, 'virsh', called_params[3],
                     domain, machines[3]),
-            ))
+                call(
+                    fake_macs[4], fake_arch, 'virsh', called_params[4],
+                    domain, machines[4]),
+            ))
+
+        # The first and last machine should have poweroff called on it, as it
+        # was initial in the on state.
+        self.expectThat(
+            mock_poweroff, MockCallsMatch(
+                call(machines[0]),
+                call(machines[3]),
+            ))
+
         self.assertThat(mock_logout, MockCalledOnceWith())
         self.expectThat(
-            mock_commission_node,
-            MockCalledWith(system_id, user))
+            mock_commission_node, MockCallsMatch(
+                call(system_id, user),
+                call(system_id, user),
+                call(system_id, user),
+                call(system_id, user),
+            ))
 
     @inlineCallbacks
     def test_probe_and_enlist_login_failure(self):
 
=== modified file 'src/provisioningserver/drivers/hardware/virsh.py'
--- src/provisioningserver/drivers/hardware/virsh.py	2016-05-12 19:07:37 +0000
+++ src/provisioningserver/drivers/hardware/virsh.py	2016-11-30 23:24:27 +0000
@@ -282,11 +282,6 @@
         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_id': machine,
@@ -296,8 +291,17 @@
         system_id = create_node(
             macs, arch, 'virsh', params, domain, machine).wait(30)
 
-        if system_id is not None:
-            conn.configure_pxe_boot(machine)
+        # If the system_id is None an error occured when creating the machine.
+        # Most likely the error is the node already exists.
+        if system_id is None:
+            continue
+
+        # 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)
+
+        conn.configure_pxe_boot(machine)
 
         if accept_all:
             commission_node(system_id, user).wait(30)