Merge lp:~hazmat/pyjuju/unlocalize-network into lp:pyjuju

[Kapil Thangavelu]

Libvirt network integration requires unlocalizing to parse output

Else we can't reliably detect the network status, and we end up
trying to start something that's already running.

[Benjamin Saller (bcsaller)]

lgtm +1

[Jim Baker (jimbaker)]

+1, looks good to me

review: Approve

=== modified file 'juju/providers/local/network.py'
--- juju/providers/local/network.py	2011-09-16 21:02:21 +0000
+++ juju/providers/local/network.py	2011-10-15 16:06:24 +0000
@@ -100,7 +100,8 @@
     Parsing the above would return::
     {"default": True, "juju-test": False, "foobar": False}
     """
-    output = subprocess.check_output(["virsh", "net-list", "--all"])
+    output = subprocess.check_output(
+        ["virsh", "net-list", "--all"], env={"LC_ALL": "C"})
     networks = {}
     # Take the header off and normalize whitespace.
     net_lines = [n.strip() for n in output.splitlines()[2:]]
@@ -132,7 +133,8 @@
   </ip>
 </network>
     """
-    output = subprocess.check_output(["virsh", "net-dumpxml", name])
+    output = subprocess.check_output(
+        ["virsh", "net-dumpxml", name], env={"LC_ALL": "C"})
     attrs = {}
     etree = ElementTree.fromstring(output)
     attrs["name"] = etree.findtext("name")

=== modified file 'juju/providers/local/tests/test_network.py'
--- juju/providers/local/tests/test_network.py	2011-09-27 16:51:50 +0000
+++ juju/providers/local/tests/test_network.py	2011-10-15 16:06:24 +0000
@@ -46,7 +46,8 @@
     def test_get_network_attributes(self):
         network_dumpxml_mock = self.mocker.mock()
         self.patch(subprocess,  "check_output", network_dumpxml_mock)
-        network_dumpxml_mock(["virsh", "net-dumpxml", "default"])
+        network_dumpxml_mock(["virsh", "net-dumpxml", "default"],
+                             env={"LC_ALL": "C"})
         self.mocker.result(network_dump_xml_default_output)
         self.mocker.replay()
 
@@ -81,7 +82,7 @@
         self.patch(subprocess,  "check_output", network_list_mock)
         self.patch(subprocess, "check_call", network_start_mock)
 
-        network_list_mock(["virsh", "net-list", "--all"])
+        network_list_mock(["virsh", "net-list", "--all"], env={"LC_ALL": "C"})
         self.mocker.result(network_list_default_output)
 
         network_start_mock(MATCH(check_definition))
@@ -95,7 +96,7 @@
     def test_start_stoppped_network(self):
         network_list_mock = self.mocker.mock()
         self.patch(subprocess, "check_output", network_list_mock)
-        network_list_mock(["virsh", "net-list", "--all"])
+        network_list_mock(["virsh", "net-list", "--all"], env={"LC_ALL": "C"})
 
         self.mocker.result(
             network_list_output_template % dict(
@@ -113,7 +114,7 @@
     def test_start_started_network(self):
         network_list_mock = self.mocker.mock()
         self.patch(subprocess, "check_output", network_list_mock)
-        network_list_mock(["virsh", "net-list", "--all"])
+        network_list_mock(["virsh", "net-list", "--all"], env={"LC_ALL": "C"})
 
         self.mocker.result(
             network_list_output_template % dict(
@@ -133,7 +134,7 @@
         self.patch(subprocess, "check_output", network_list_mock)
         self.patch(subprocess, "check_call", network_stop_mock)
 
-        network_list_mock(["virsh", "net-list", "--all"])
+        network_list_mock(["virsh", "net-list", "--all"], env={"LC_ALL": "C"})
         self.mocker.result(
             network_list_output_template % dict(
                 name="zoo", state="active", autostart="no"))
@@ -148,7 +149,7 @@
     def test_stop_stopped_network(self):
         network_list_mock = self.mocker.mock()
         self.patch(subprocess, "check_output", network_list_mock)
-        network_list_mock(["virsh", "net-list", "--all"])
+        network_list_mock(["virsh", "net-list", "--all"], env={"LC_ALL": "C"})
 
         self.mocker.result(
             network_list_output_template % dict(
@@ -166,7 +167,7 @@
     def test_stop_nonexistent_network(self):
         network_list_mock = self.mocker.mock()
         self.patch(subprocess, "check_output", network_list_mock)
-        network_list_mock(["virsh", "net-list", "--all"])
+        network_list_mock(["virsh", "net-list", "--all"], env={"LC_ALL": "C"})
 
         self.mocker.result(
             network_list_output_template % dict(
@@ -186,19 +187,22 @@
         self.patch(subprocess,  "check_output", network_list_mock)
 
         # Network on
-        network_list_mock(["virsh", "net-list", "--all"])
+        network_list_mock(["virsh", "net-list", "--all"],
+                          env={"LC_ALL": "C"})
         self.mocker.result(
             network_list_output_template % (
                 dict(name="foobar", state="active", autostart="off")))
 
         # Network off
-        network_list_mock(["virsh", "net-list", "--all"])
+        network_list_mock(["virsh", "net-list", "--all"],
+                          env={"LC_ALL": "C"})
         self.mocker.result(
             network_list_output_template % (
                 dict(name="foobar", state="inactive", autostart="off")))
 
         # Non existent
-        network_list_mock(["virsh", "net-list", "--all"])
+        network_list_mock(["virsh", "net-list", "--all"],
+                          env={"LC_ALL": "C"})
         self.mocker.result(
             network_list_output_template % (
                 dict(name="magic", state="inactive", autostart="off")))