Merge lp:~hazmat/pyjuju/local-machine into lp:pyjuju

[Kapil Thangavelu]

implementation of local provider machine.

[lp:~hazmat/pyjuju/local-machine]

341. By Kapil Thangavelu on 2011-09-01

Merged lib-files into local-machine.

342. By Kapil Thangavelu on 2011-09-01

Merged lib-files into local-machine.

343. By Kapil Thangavelu on 2011-09-01

Merged lib-files into local-machine.

[William Reade (fwereade)]

[0]

Is anything using launch_time? We removed it from the EC2 machines because nothing was using it (the only use was in ZookeeperConnect, and niemeyer opined it was costing more complexity than it was worth: https://code.launchpad.net/~fwereade/ensemble/cobbler-zk-connect/+merge/71734).

[1]

Please add a test for .private_dns_name (it needs to exist for us to generate the zookeeper hosts)

[2]

...finally I guess I'm a bit confused about the hostname anyway. Will "localhost" resolve to the right place, even from within a container? If so, fine (but, eww!); if not, surely we should have something that does resolve to the right place?

I don't feel it's quite approvable as-is, but ping me to discuss.

review: Needs Information

[Gustavo Niemeyer (niemeyer)]

Nice little change. +1 with a couple of trivials.

[1]

+ uptime_seconds = float(open(self.uptime_file).read().split(" ")[0])

The file should be closed explicitly (or via with..).

[2]

+ uptime_file = "/proc/uptime"

Private?

review: Approve

[lp:~hazmat/pyjuju/local-machine]

344. By Kapil Thangavelu on 2011-09-06

Merged lib-files into local-machine.

345. By Kapil Thangavelu on 2011-09-09

Merged lib-files into local-machine.

[Kapil Thangavelu (hazmat)]

> [0]
>
> Is anything using launch_time? We removed it from the EC2 machines because
> nothing was using it (the only use was in ZookeeperConnect, and niemeyer
> opined it was costing more complexity than it was worth:
> https://code.launchpad.net/~fwereade/ensemble/cobbler-zk-
> connect/+merge/71734).

thanks, that's good to know.

>
> [1]
>
> Please add a test for .private_dns_name (it needs to exist for us to generate
> the zookeeper hosts)
>

it would be if local-dev was using that pathway.. easy to add in though, but it would be unused.

> [2]
>
> ...finally I guess I'm a bit confused about the hostname anyway. Will
> "localhost" resolve to the right place, even from within a container? If so,
> fine (but, eww!); if not, surely we should have something that does resolve to
> the right place?
>
> I don't feel it's quite approvable as-is, but ping me to discuss.

the containers don't use this to resolve to the host, this is soley to satisfy existing constraint notions of machine usage and assignment.

[Kapil Thangavelu (hazmat)]

> Nice little change. +1 with a couple of trivials.
>
> [1]
>
> + uptime_seconds = float(open(self.uptime_file).read().split(" ")[0])
>
> The file should be closed explicitly (or via with..).
>
> [2]
>
>
> + uptime_file = "/proc/uptime"
>
> Private?

it was public there for easy testing manipulation, but that's going away since uptime isn't needed anymore.

[lp:~hazmat/pyjuju/local-machine]

346. By Kapil Thangavelu on 2011-09-14

Merged lib-files into local-machine.

347. By Kapil Thangavelu on 2011-09-14

simplify local machine, there is uptime spoon

[Benjamin Saller (bcsaller)]

LGTM +1

review: Approve

[lp:~hazmat/pyjuju/local-machine]

348. By Kapil Thangavelu on 2011-09-14

rip out vestige of old instance var name on zk

=== modified file 'ensemble/lib/zk.py'
--- ensemble/lib/zk.py	2011-09-13 23:07:31 +0000
+++ ensemble/lib/zk.py	2011-09-14 22:23:28 +0000
@@ -159,7 +159,7 @@
         if not class_path:
             raise RuntimeError(
                 "Zookeeper libraries not found in location %s." % (
-                    self._software_dir))
+                    self._zk_location))
         # Add the managed dir containing log4j properties, which are retrieved
         # along classpath.
         class_path.insert(0, self._run_dir)

=== added directory 'ensemble/providers/lxc'
=== added file 'ensemble/providers/lxc/__init__.py'
--- ensemble/providers/lxc/__init__.py	1970-01-01 00:00:00 +0000
+++ ensemble/providers/lxc/__init__.py	2011-09-14 22:23:28 +0000
@@ -0,0 +1,1 @@
+#

=== added file 'ensemble/providers/lxc/machine.py'
--- ensemble/providers/lxc/machine.py	1970-01-01 00:00:00 +0000
+++ ensemble/providers/lxc/machine.py	2011-09-14 22:23:28 +0000
@@ -0,0 +1,10 @@
+from ensemble.machine import ProviderMachine
+
+
+class LocalMachine(ProviderMachine):
+    """Represents host machine, when doing local development.
+    """
+
+    def __init__(self):
+        self.instance_id = "local"
+        self.private_dns_name = self.dns_name = "localhost"

=== added directory 'ensemble/providers/lxc/tests'
=== added file 'ensemble/providers/lxc/tests/__init__.py'
--- ensemble/providers/lxc/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ ensemble/providers/lxc/tests/__init__.py	2011-09-14 22:23:28 +0000
@@ -0,0 +1,1 @@
+#

=== added file 'ensemble/providers/lxc/tests/test_machine.py'
--- ensemble/providers/lxc/tests/test_machine.py	1970-01-01 00:00:00 +0000
+++ ensemble/providers/lxc/tests/test_machine.py	2011-09-14 22:23:28 +0000
@@ -0,0 +1,12 @@
+from ensemble.providers.lxc.machine import LocalMachine
+from ensemble.lib.testing import TestCase
+
+
+class LocalMachineTest(TestCase):
+
+    def test_machine_attributes(self):
+
+        machine = LocalMachine()
+        self.assertEqual(machine.instance_id, "local")
+        self.assertEqual(machine.dns_name, "localhost")
+        self.assertEqual(machine.private_dns_name, "localhost")