Merge lp:~james-page/charms/trusty/neutron-api-odl/fatal-install into lp:~openstack-charmers/charms/trusty/neutron-api-odl/vpp

[James Page]

[lp:~james-page/charms/trusty/neutron-api-odl/fatal-install]

7. By James Page on 2015-11-03

Tidy lint

[Liam Young (gnuoy)]

Approve

review: Approve

=== modified file 'hooks/odl_utils.py'
--- hooks/odl_utils.py	2015-07-16 14:40:01 +0000
+++ hooks/odl_utils.py	2015-11-03 16:58:31 +0000
@@ -19,10 +19,11 @@
 
 
 def install_packages(servicename):
-    pkgs = filter_installed_packages(determine_packages())
+    pkgs = determine_packages()
     if os_release('neutron-common') >= 'kilo':
         pkgs.extend(['python-networking-odl'])
-    apt_install(pkgs)
+    pkgs = filter_installed_packages(pkgs)
+    apt_install(pkgs, fatal=True)
 
 
 def determine_packages(node_type=None):

=== modified file 'unit_tests/test_odl_data.py'
--- unit_tests/test_odl_data.py	2015-06-24 12:44:33 +0000
+++ unit_tests/test_odl_data.py	2015-11-03 16:58:31 +0000
@@ -132,24 +132,24 @@
 
     def test_config_default(self):
         ctxt = odl_data.ConfigTranslation()
-        self.assertEqual(ctxt, {'use_syslog': False,
-                                'vlan_ranges': 'physnet1:1000:2000',
-                                'overlay_network_type': 'gre'})
+        self.assertEqual(ctxt, {'vlan_ranges': 'physnet1:1000:2000',
+                                'overlay_network_type': 'gre',
+                                'security_groups': False})
 
-        self.test_config.set('use-syslog', True)
+        self.test_config.set('security-groups', True)
         ctxt = odl_data.ConfigTranslation()
-        self.assertEqual(ctxt, {'use_syslog': True,
-                                'vlan_ranges': 'physnet1:1000:2000',
-                                'overlay_network_type': 'gre'})
+        self.assertEqual(ctxt, {'vlan_ranges': 'physnet1:1000:2000',
+                                'overlay_network_type': 'gre',
+                                'security_groups': True})
 
         self.test_config.set('vlan-ranges', 'physnet1:1000:3000')
         ctxt = odl_data.ConfigTranslation()
-        self.assertEqual(ctxt, {'use_syslog': True,
-                                'vlan_ranges': 'physnet1:1000:3000',
-                                'overlay_network_type': 'gre'})
+        self.assertEqual(ctxt, {'vlan_ranges': 'physnet1:1000:3000',
+                                'overlay_network_type': 'gre',
+                                'security_groups': True})
 
         self.test_config.set('overlay-network-type', 'vxlan')
         ctxt = odl_data.ConfigTranslation()
-        self.assertEqual(ctxt, {'use_syslog': True,
-                                'vlan_ranges': 'physnet1:1000:3000',
-                                'overlay_network_type': 'vxlan'})
+        self.assertEqual(ctxt, {'vlan_ranges': 'physnet1:1000:3000',
+                                'overlay_network_type': 'vxlan',
+                                'security_groups': True})

=== modified file 'unit_tests/test_odl_utils.py'
--- unit_tests/test_odl_utils.py	2015-06-24 12:44:33 +0000
+++ unit_tests/test_odl_utils.py	2015-11-03 16:58:31 +0000
@@ -3,8 +3,8 @@
 
 TO_PATCH = [
     'apt_install',
-    'config',
     'filter_installed_packages',
+    'os_release',
 ]
 
 
@@ -12,7 +12,6 @@
 
     def setUp(self):
         super(VPPUtilsTest, self).setUp(odl_utils, TO_PATCH)
-        self.config.side_effect = self.test_config.get
 
     def tearDown(self):
         super(VPPUtilsTest, self).tearDown()
@@ -21,9 +20,22 @@
         def _filter(pkg_list):
             return pkg_list
         self.filter_installed_packages.side_effect = _filter
-        odl_utils.install_packages('neutron-api')
-        self.apt_install.assert_called_with(['neutron-common',
-                                             'neutron-plugin-ml2'])
+        self.os_release.return_value = 'icehouse'
+        odl_utils.install_packages('neutron-api')
+        self.apt_install.assert_called_with(['neutron-common',
+                                             'neutron-plugin-ml2'],
+                                            fatal=True)
+
+    def test_install_packages_kilo(self):
+        def _filter(pkg_list):
+            return pkg_list
+        self.filter_installed_packages.side_effect = _filter
+        self.os_release.return_value = 'kilo'
+        odl_utils.install_packages('neutron-api')
+        self.apt_install.assert_called_with(['neutron-common',
+                                             'neutron-plugin-ml2',
+                                             'python-networking-odl'],
+                                            fatal=True)
 
     def test_determine_packages(self):
         self.assertEqual(odl_utils.determine_packages(),