From 0936150221713d775a5cad4a2e978980c32b21c1 Mon Sep 17 00:00:00 2001
From: Jesse Andrews <jesse@dancelamb>
Date: Mon, 13 Sep 2010 23:56:32 -0700
Subject: now we can run files - thanks vish

---
 bin/nova-manage | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'bin')

diff --git a/bin/nova-manage b/bin/nova-manage
index 6e5266767..26f75faf7 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -156,6 +156,11 @@ class ShellCommands(object):
                 readline.parse_and_bind("tab:complete")
             code.interact()
 
+    def script(self, path):
+        """Runs the script from the specifed path with flags set properly.
+        arguments: path"""
+        exec(compile(open(path).read(), path, 'exec'), locals(), globals())
+
 
 class RoleCommands(object):
     """Class for managing roles."""
-- 
cgit 


From 6186634c0f8d6a44323fe1f7b2530528a539c64c Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@yahoo.com>
Date: Tue, 21 Sep 2010 11:12:04 -0700
Subject: bpython is amazing

---
 bin/nova-manage | 51 ++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 42 insertions(+), 9 deletions(-)

(limited to 'bin')

diff --git a/bin/nova-manage b/bin/nova-manage
index 26f75faf7..d23818348 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -135,15 +135,48 @@ class VpnCommands(object):
 
 
 class ShellCommands(object):
-    def run(self):
-        "Runs a Python interactive interpreter. Tries to use IPython, if it's available."
-        try:
-            import IPython
-            # Explicitly pass an empty list as arguments, because otherwise IPython
-            # would use sys.argv from this script.
-            shell = IPython.Shell.IPShell(argv=[])
-            shell.mainloop()
-        except ImportError:
+    def bpython(self):
+        """Runs a bpython shell.
+
+        Falls back to Ipython/python shell if unavailable"""
+        self.run('bpython')
+
+    def ipython(self):
+        """Runs an Ipython shell.
+
+        Falls back to Python shell if unavailable"""
+        self.run('ipython')
+
+    def python(self):
+        """Runs an python shell.
+
+        Falls back to Python shell if unavailable"""
+        self.run('python')
+
+    def run(self, shell=None):
+        """Runs a Python interactive interpreter.
+
+        args: [shell=bpython]"""
+        if not shell:
+            shell = 'bpython'
+
+        if shell == 'bpython':
+            try:
+                import bpython
+                bpython.embed()
+            except ImportError:
+                shell = 'ipython'
+        if shell == 'ipython':
+            try:
+                import IPython
+                # Explicitly pass an empty list as arguments, because otherwise IPython
+                # would use sys.argv from this script.
+                shell = IPython.Shell.IPShell(argv=[])
+                shell.mainloop()
+            except ImportError:
+                shell = 'python'
+
+        if shell == 'python':
             import code
             try: # Try activating rlcompleter, because it's handy.
                 import readline
-- 
cgit 


From b68b73d08155483d19f4088baa6a4ffe73ef5f1d Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@yahoo.com>
Date: Tue, 21 Sep 2010 14:36:06 -0700
Subject: typo s/an/a

---
 bin/nova-manage | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/nova-manage b/bin/nova-manage
index 4ae2f20dc..c5c7322bf 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -149,7 +149,7 @@ class ShellCommands(object):
         self.run('ipython')
 
     def python(self):
-        """Runs an python shell.
+        """Runs a python shell.
 
         Falls back to Python shell if unavailable"""
         self.run('python')
-- 
cgit 


From 2327378a1e5c9fa942d56001919caaeb1be1c7cb Mon Sep 17 00:00:00 2001
From: Devin Carlen <devin.carlen@gmail.com>
Date: Tue, 28 Sep 2010 18:38:19 -0700
Subject: Removed str_id from FixedIp references

---
 bin/nova-manage | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/nova-manage b/bin/nova-manage
index baa1cb4db..d0fde6f17 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -316,7 +316,7 @@ class FloatingIpCommands(object):
         for floating_ip in floating_ips:
             instance = None
             if floating_ip['fixed_ip']:
-                instance = floating_ip['fixed_ip']['instance']['str_id']
+                instance = floating_ip['fixed_ip']['instance']['address']
             print "%s\t%s\t%s" % (floating_ip['host'],
                                   floating_ip['address'],
                                   instance)
-- 
cgit 


From e3102b6b9be148597a2f502d2b2baf750ecc0a34 Mon Sep 17 00:00:00 2001
From: Devin Carlen <devin.carlen@gmail.com>
Date: Tue, 28 Sep 2010 18:43:36 -0700
Subject: Fixed tests

---
 bin/nova-manage | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/nova-manage b/bin/nova-manage
index d0fde6f17..a5087bfec 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -316,7 +316,7 @@ class FloatingIpCommands(object):
         for floating_ip in floating_ips:
             instance = None
             if floating_ip['fixed_ip']:
-                instance = floating_ip['fixed_ip']['instance']['address']
+                instance = floating_ip['fixed_ip']['instance']['ec2_id']
             print "%s\t%s\t%s" % (floating_ip['host'],
                                   floating_ip['address'],
                                   instance)
-- 
cgit