1
=== modified file 'hooks/nova_cc_utils.py'
2
--- hooks/nova_cc_utils.py	2015-10-02 12:05:06 +0000
3
+++ hooks/nova_cc_utils.py	2015-10-06 15:50:49 +0000
4
@@ -728,10 +728,17 @@
5
728
        # The first line of output is like '# Host xx found: line 1 type RSA',
728
        # The first line of output is like '# Host xx found: line 1 type RSA',
6
729
        # which should be excluded.
729
        # which should be excluded.
7
730
        output = subprocess.check_output(cmd).strip()
730
        output = subprocess.check_output(cmd).strip()
8
731
        return output.split('\n')[1]
9
732
    except subprocess.CalledProcessError:
731
    except subprocess.CalledProcessError:
10
733
        return None
732
        return None
11
734
733
12
734
    if output:
13
735
        # Bug #1500589 cmd has 0 rc on precise if entry not present
14
736
        lines = output.split('\n')
15
737
        if len(lines) > 1:
16
738
            return lines[1]
17
739
18
740
    return None
19
741
20
735
742
21
736
def remove_known_host(host, unit=None, user=None):
743
def remove_known_host(host, unit=None, user=None):
22
737
    log('Removing SSH known host entry for compute host at %s' % host)
744
    log('Removing SSH known host entry for compute host at %s' % host)
23
738
745
24
=== modified file 'unit_tests/test_nova_cc_utils.py'
25
--- unit_tests/test_nova_cc_utils.py	2015-09-24 16:29:26 +0000
26
+++ unit_tests/test_nova_cc_utils.py	2015-10-06 15:50:49 +0000
27
@@ -602,6 +602,16 @@
28
602
        _known_hosts.assert_called_with('bar', None)
602
        _known_hosts.assert_called_with('bar', None)
29
603
603
30
604
    @patch.object(utils, 'known_hosts')
604
    @patch.object(utils, 'known_hosts')
31
605
    @patch('subprocess.check_output')
32
606
    def test_ssh_known_host_key_bug1500589(self, _check_output, _known_hosts):
33
607
        """On precise ssh-keygen does not error if host not found in file. So
34
608
         check charm processes empty output properly"""
35
609
        _known_hosts.return_value = '/foo/known_hosts'
36
610
        _check_output.return_value = ''
37
611
        key = utils.ssh_known_host_key('test')
38
612
        self.assertEquals(key, None)
39
613
40
614
    @patch.object(utils, 'known_hosts')
41
605
    @patch('subprocess.check_call')
615
    @patch('subprocess.check_call')
42
606
    def test_remove_known_host(self, _check_call, _known_hosts):
616
    def test_remove_known_host(self, _check_call, _known_hosts):
43
607
        _known_hosts.return_value = '/foo/known_hosts'
617
        _known_hosts.return_value = '/foo/known_hosts'
Status:	Merged
Merged at revision:	198
Proposed branch:	lp:~gnuoy/charms/trusty/nova-cloud-controller/lp1500589
Merge into:	lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next
Diff against target:	43 lines (+18/-1) 2 files modified hooks/nova_cc_utils.py (+8/-1) unit_tests/test_nova_cc_utils.py (+10/-0)
To merge this branch:	bzr merge lp:~gnuoy/charms/trusty/nova-cloud-controller/lp1500589
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Edward Hope-Morley		2015-10-06	Approve on 2015-10-07
Review via email: mp+273508@code.launchpad.net
1	=== modified file 'hooks/nova_cc_utils.py'
2	--- hooks/nova_cc_utils.py 2015-10-02 12:05:06 +0000
3	+++ hooks/nova_cc_utils.py 2015-10-06 15:50:49 +0000
4	@@ -728,10 +728,17 @@
5	728	# The first line of output is like '# Host xx found: line 1 type RSA',	728	# The first line of output is like '# Host xx found: line 1 type RSA',
6	729	# which should be excluded.	729	# which should be excluded.
7	730	output = subprocess.check_output(cmd).strip()	730	output = subprocess.check_output(cmd).strip()
8	731	return output.split('\n')[1]
9	732	except subprocess.CalledProcessError:	731	except subprocess.CalledProcessError:
10	733	return None	732	return None
11	734		733
12			734	if output:
13			735	# Bug #1500589 cmd has 0 rc on precise if entry not present
14			736	lines = output.split('\n')
15			737	if len(lines) > 1:
16			738	return lines[1]
17			739
18			740	return None
19			741
20	735		742
21	736	def remove_known_host(host, unit=None, user=None):	743	def remove_known_host(host, unit=None, user=None):
22	737	log('Removing SSH known host entry for compute host at %s' % host)	744	log('Removing SSH known host entry for compute host at %s' % host)
23	738		745
24	=== modified file 'unit_tests/test_nova_cc_utils.py'
25	--- unit_tests/test_nova_cc_utils.py 2015-09-24 16:29:26 +0000
26	+++ unit_tests/test_nova_cc_utils.py 2015-10-06 15:50:49 +0000
27	@@ -602,6 +602,16 @@
28	602	_known_hosts.assert_called_with('bar', None)	602	_known_hosts.assert_called_with('bar', None)
29	603		603
30	604	@patch.object(utils, 'known_hosts')	604	@patch.object(utils, 'known_hosts')
31			605	@patch('subprocess.check_output')
32			606	def test_ssh_known_host_key_bug1500589(self, _check_output, _known_hosts):
33			607	"""On precise ssh-keygen does not error if host not found in file. So
34			608	check charm processes empty output properly"""
35			609	_known_hosts.return_value = '/foo/known_hosts'
36			610	_check_output.return_value = ''
37			611	key = utils.ssh_known_host_key('test')
38			612	self.assertEquals(key, None)
39			613
40			614	@patch.object(utils, 'known_hosts')
41	605	@patch('subprocess.check_call')	615	@patch('subprocess.check_call')
42	606	def test_remove_known_host(self, _check_call, _known_hosts):	616	def test_remove_known_host(self, _check_call, _known_hosts):
43	607	_known_hosts.return_value = '/foo/known_hosts'	617	_known_hosts.return_value = '/foo/known_hosts'