Merge lp:~seyeongkim/charms/trusty/swift-storage/lp1375395 into lp:~openstack-charmers-archive/charms/trusty/swift-storage/next

[Seyeong Kim]

[Seyeong Kim (seyeongkim)]

need an advice for this part

because of using - not _ on private-address, got error

#self.relation_set.assert_called_with(
# device='vdb', object_port=6000, account_port=6002,
# zone=1, container_port=6001, private-address='FE80:0000:0000:0000:0202:B3FF:FE1E:8329',
#)
# private-address : keyword can't be an expression

[Edward Hope-Morley (hopem)]

Seyeong, you could try using a dict i.e.:

args = {'device': 'vdb', 'object_port': 6000, 'account_port': 6002,
        'zone': 1, 'container_port': 6001, 'private-address': 'FE80:0000:0000:0000:0202:B3FF:FE1E:8329'}
self.relation_set.assert_called_with(**args)

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #1464 swift-storage-next for xtrusia mp247789
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/1464/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #1509 swift-storage-next for xtrusia mp247789
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
  unit_tests/test_swift_storage_utils.py:238:64: E231 missing whitespace after ':'
  make: *** [lint] Error 1

Full lint test output: http://paste.ubuntu.com/10033239/
Build: http://10.245.162.77:8080/job/charm_lint_check/1509/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #1628 swift-storage-next for xtrusia mp247789
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/1628/

[lp:~seyeongkim/charms/trusty/swift-storage/lp1375395]

59. By Seyeong Kim on 2015-02-03

fix lint error

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #1510 swift-storage-next for xtrusia mp247789
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/1510/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #1465 swift-storage-next for xtrusia mp247789
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/1465/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #1629 swift-storage-next for xtrusia mp247789
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/1629/

[Edward Hope-Morley (hopem)]

Seyeong, thanks a lot for adding in new tests it is much appreciated! I have one inline question regarding one of your tests but apart from that this looks good.

[Edward Hope-Morley (hopem)]

See inline.

[Edward Hope-Morley (hopem)]

review: Needs Fixing

[lp:~seyeongkim/charms/trusty/swift-storage/lp1375395]

60. By Seyeong Kim on 2015-02-25

fix with mock

61. By Seyeong Kim on 2015-02-25

sync rebase

Unmerged revisions

=== modified file 'unit_tests/test_swift_storage_context.py'
--- unit_tests/test_swift_storage_context.py	2014-10-06 21:45:39 +0000
+++ unit_tests/test_swift_storage_context.py	2015-02-25 09:42:59 +0000
@@ -11,6 +11,7 @@
     'relation_get',
     'relation_ids',
     'unit_private_ip',
+    'get_ipv6_addr',
 ]
 
 
@@ -46,6 +47,18 @@
         self.assertEquals({'local_ip': '10.0.0.5'}, ctxt())
         self.assertTrue(ctxt.enable_rsyncd.called)
 
+    def test_rsync_context_ipv6(self):
+        self.test_config.set('prefer-ipv6', True)
+        self.get_ipv6_addr.return_value = [
+            'FE80:0000:0000:0000:0202:B3FF:FE1E:8329', ]
+        ctxt = swift_context.RsyncContext()
+        ctxt.enable_rsyncd = MagicMock()
+        ctxt.enable_rsyncd.return_value = True
+        self.assertEquals({
+            'local_ip': 'FE80:0000:0000:0000:0202:B3FF:FE1E:8329'},
+            ctxt())
+        self.assertTrue(ctxt.enable_rsyncd.called)
+
     def test_rsync_enable_rsync(self):
         with patch_open() as (_open, _file):
             ctxt = swift_context.RsyncContext()

=== modified file 'unit_tests/test_swift_storage_relations.py'
--- unit_tests/test_swift_storage_relations.py	2015-01-09 10:21:49 +0000
+++ unit_tests/test_swift_storage_relations.py	2015-02-25 09:42:59 +0000
@@ -39,7 +39,8 @@
     'setup_rsync',
     'setup_storage',
     'register_configs',
-    'update_nrpe_config'
+    'update_nrpe_config',
+    'get_ipv6_addr',
 ]
 
 
@@ -82,19 +83,56 @@
         self.assertTrue(self.do_openstack_upgrade.called)
         self.assertTrue(self.CONFIGS.write_all.called)
 
+    def test_config_changed_nrpe_master(self):
+        self.openstack_upgrade_available.return_value = False
+        self.relations_of_type.return_value = True
+        with patch_open() as (_open, _file):
+            _file.read.return_value = "foo"
+            hooks.config_changed()
+        self.assertTrue(self.CONFIGS.write_all.called)
+        self.assertTrue(self.setup_rsync.called)
+        self.assertTrue(self.update_nrpe_config.called)
+
+    @patch.object(hooks, 'assert_charm_supports_ipv6')
+    def test_config_changed_ipv6(self, mock_assert_charm_supports_ipv6):
+        self.test_config.set('prefer-ipv6', True)
+        self.openstack_upgrade_available.return_value = False
+        self.relations_of_type.return_value = False
+        with patch_open() as (_open, _file):
+            _file.read.return_value = "foo"
+            hooks.config_changed()
+        self.assertTrue(self.CONFIGS.write_all.called)
+        self.assertTrue(self.setup_rsync.called)
+
     def test_upgrade_charm(self):
-        self.filter_installed_packages.return_value = ['python-psutil']
+        self.filter_installed_packages.return_value = [
+            'python-psutil']
         hooks.upgrade_charm()
-        self.apt_install.assert_called_with(['python-psutil'], fatal=True)
+        self.apt_install.assert_called_with([
+            'python-psutil'], fatal=True)
         self.assertTrue(self.update_nrpe_config.called)
 
     def test_storage_joined_single_device(self):
+        self.determine_block_devices.return_value = [
+            '/dev/vdb']
+        hooks.swift_storage_relation_joined()
+        self.relation_set.assert_called_with(
+            device='vdb', object_port=6000, account_port=6002,
+            zone=1, container_port=6001
+        )
+
+    def test_storage_joined_ipv6(self):
         self.determine_block_devices.return_value = ['/dev/vdb']
+        self.test_config.set('prefer-ipv6', True)
+        self.get_ipv6_addr.return_value = [
+            'FE80:0000:0000:0000:0202:B3FF:FE1E:8329', ]
         hooks.swift_storage_relation_joined()
-        self.relation_set.assert_called_with(
-            device='vdb', object_port=6000, account_port=6002,
-            zone=1, container_port=6001
-        )
+        args = {
+            'device': 'vdb', 'object_port': 6000,
+            'account_port': 6002, 'zone': 1, 'container_port': 6001,
+            'private-address': 'FE80:0000:0000:0000:0202:B3FF:FE1E:8329',
+        }
+        self.relation_set.assert_called_with(**args)
 
     def test_storage_joined_multi_device(self):
         self.determine_block_devices.return_value = ['/dev/vdb', '/dev/vdc',

=== modified file 'unit_tests/test_swift_storage_utils.py'
--- unit_tests/test_swift_storage_utils.py	2015-01-09 10:21:49 +0000
+++ unit_tests/test_swift_storage_utils.py	2015-02-25 09:42:59 +0000
@@ -26,6 +26,7 @@
     'unit_private_ip',
     'service_restart',
     '_save_script_rc',
+    'lsb_release',
 ]
 
 
@@ -223,6 +224,20 @@
         swift_utils.save_script_rc()
         self._save_script_rc.assert_called_with(**SCRIPT_RC_ENV)
 
+    def test_assert_charm_not_supports_ipv6(self):
+        self.lsb_release.return_value = {'DISTRIB_ID': 'Ubuntu',
+                                         'DISTRIB_RELEASE': '12.04',
+                                         'DISTRIB_CODENAME': 'precise',
+                                         'DISTRIB_DESCRIPTION': 'Ubuntu 12.04'}
+        self.assertRaises(Exception, swift_utils.assert_charm_supports_ipv6)
+
+    def test_assert_charm_supports_ipv6(self):
+        self.lsb_release.return_value = {'DISTRIB_ID': 'Ubuntu',
+                                         'DISTRIB_RELEASE': '14.04',
+                                         'DISTRIB_CODENAME': 'trusty',
+                                         'DISTRIB_DESCRIPTION': 'Ubuntu 14.04'}
+        swift_utils.assert_charm_supports_ipv6()
+
     @patch('charmhelpers.contrib.openstack.templating.OSConfigRenderer')
     def test_register_configs_pre_install(self, renderer):
         self.get_os_codename_package.return_value = None