Merge lp:~mew/charm-helpers/private-ip into lp:charm-helpers

[Matthew Wedgwood]

Provide an easy way to get the unit's IP

Provide an easy way to get the unit's IP

[Haw Loeung (hloeung)]

Looks good to me, +1

review: Approve

[Matthew Wedgwood (mew)]

-1, try harder.

Should use the existing "unit_get" python function rather than calling out to "unit-get"

review: Needs Fixing

[lp:~mew/charm-helpers/private-ip]

15. By Matthew Wedgwood on 2013-05-31

Use existing unit_get function

[Haw Loeung (hloeung)]

Looks good, +1

review: Approve

=== modified file 'charmhelpers/core/hookenv.py'
--- charmhelpers/core/hookenv.py	2013-05-31 08:31:56 +0000
+++ charmhelpers/core/hookenv.py	2013-05-31 10:29:28 +0000
@@ -234,6 +234,10 @@
     return subprocess.check_output(_args).strip()
 
 
+def unit_private_ip():
+    return unit_get('private-address')
+
+
 class UnregisteredHookError(Exception):
     pass
 

=== modified file 'tests/core/test_hookenv.py'
--- tests/core/test_hookenv.py	2013-05-31 08:37:38 +0000
+++ tests/core/test_hookenv.py	2013-05-31 10:29:28 +0000
@@ -135,6 +135,12 @@
 
         self.assertEqual(hookenv.local_unit(), 'foo')
 
+    @patch('charmhelpers.core.hookenv.unit_get')
+    def test_gets_unit_private_ip(self, _unitget):
+        _unitget.return_value = 'foo'
+        self.assertEqual("foo", hookenv.unit_private_ip())
+        _unitget.assert_called_with('private-address')
+
     @patch('charmhelpers.core.hookenv.os')
     def test_checks_that_is_running_in_relation_hook(self, os_):
         os_.environ = {