Remove ajaxterm from Nova

Removes copy of ajaxterm code, nova-ajax-console-proxy,
and support for get_ajax_console from Nova proper.

Implements blueprint remove-ajaxterm
Fixes bug 917963

Change-Id: I2c0ff427c53c0f63a18b10475d6b4cbe9a085d83

6 files changed, 0 insertions, 51 deletions

diff --git a/nova/tests/fake_libvirt_utils.py b/nova/tests/fake_libvirt_utils.py
index 27b753a64..726e28a1d 100644
--- a/nova/tests/fake_libvirt_utils.py
+++ b/nova/tests/fake_libvirt_utils.py
@@ -93,10 +93,6 @@ def get_open_port(start_port, end_port):
     return int((start_port + end_port) / 2)
 
 
-def run_ajaxterm(cmd, token, port):
-    pass
-
-
 def get_fs_info(path):
     return {'total': 128 * (1024 ** 3),
             'used': 44 * (1024 ** 3),
diff --git a/nova/tests/policy.json b/nova/tests/policy.json
index 4175d758e..99a97bba5 100644
--- a/nova/tests/policy.json
+++ b/nova/tests/policy.json
@@ -20,7 +20,6 @@
     "compute:lock": [],
     "compute:unlock": [],
 
-    "compute:get_ajax_console": [],
     "compute:get_vnc_console": [],
     "compute:get_console_output": [],
 
diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index d99aed310..221f86fe7 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -724,16 +724,6 @@ class ComputeTestCase(BaseTestCase):
         self.assertEqual(output, 'ANOTHER\nLAST LINE')
         self.compute.terminate_instance(self.context, instance['uuid'])
 
-    def test_ajax_console(self):
-        """Make sure we can get console output from instance"""
-        instance = self._create_fake_instance()
-        self.compute.run_instance(self.context, instance['uuid'])
-
-        console = self.compute.get_ajax_console(self.context,
-                                                instance['uuid'])
-        self.assert_(set(['token', 'host', 'port']).issubset(console.keys()))
-        self.compute.terminate_instance(self.context, instance['uuid'])
-
     def test_novnc_vnc_console(self):
         """Make sure we can a vnc console for an instance."""
         instance = self._create_fake_instance()
@@ -2990,17 +2980,6 @@ class ComputeAPITestCase(BaseTestCase):
                                                    'novnc')
         self.compute_api.delete(self.context, instance)
 
-    def test_ajax_console(self):
-        """Make sure we can an ajax console for an instance."""
-        def ajax_rpc_call_wrapper(*args, **kwargs):
-            return {'token': 'asdf', 'host': '0.0.0.0', 'port': 8080}
-
-        self.stubs.Set(rpc, 'call', ajax_rpc_call_wrapper)
-
-        instance = self._create_fake_instance()
-        console = self.compute_api.get_ajax_console(self.context, instance)
-        self.compute_api.delete(self.context, instance)
-
     def test_console_output(self):
         instance = self._create_fake_instance()
         console = self.compute_api.get_console_output(self.context, instance)
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py
index 72c9f8802..61d920ff1 100644
--- a/nova/tests/test_libvirt.py
+++ b/nova/tests/test_libvirt.py
@@ -1925,20 +1925,6 @@ disk size: 4.4M''', ''))
         finally:
             os.unlink(dst_path)
 
-    def test_run_ajaxterm(self):
-        self.mox.StubOutWithMock(utils, 'execute')
-        token = 's3cr3tt0ken'
-        shell_cmd = 'shell-cmd.py'
-        port = 2048
-        utils.execute(mox.IgnoreArg(),
-                      '--command', shell_cmd,
-                      '-t', token,
-                      '-p', port)
-
-        # Start test
-        self.mox.ReplayAll()
-        libvirt_utils.run_ajaxterm(shell_cmd, token, port)
-
     def test_get_fs_info(self):
         # Use a 1024-byte block size (df -k) because OS X does not support
         # the -B flag
diff --git a/nova/tests/test_virt_drivers.py b/nova/tests/test_virt_drivers.py
index 2cda7a61e..43dde697d 100644
--- a/nova/tests/test_virt_drivers.py
+++ b/nova/tests/test_virt_drivers.py
@@ -289,14 +289,6 @@ class _VirtDriverTestCase(test.TestCase):
         self.assertTrue(isinstance(console_output, basestring))
 
     @catch_notimplementederror
-    def test_get_ajax_console(self):
-        instance_ref, network_info = self._get_running_instance()
-        ajax_console = self.connection.get_ajax_console(instance_ref)
-        self.assertIn('token', ajax_console)
-        self.assertIn('host', ajax_console)
-        self.assertIn('port', ajax_console)
-
-    @catch_notimplementederror
     def test_get_vnc_console(self):
         instance_ref, network_info = self._get_running_instance()
         vnc_console = self.connection.get_vnc_console(instance_ref)
diff --git a/nova/tests/test_vmwareapi.py b/nova/tests/test_vmwareapi.py
index a1d0af440..bf8bcbe2f 100644
--- a/nova/tests/test_vmwareapi.py
+++ b/nova/tests/test_vmwareapi.py
@@ -259,6 +259,3 @@ class VMWareAPIVMTestCase(test.TestCase):
 
     def test_get_console_output(self):
         pass
-
-    def test_get_ajax_console(self):
-        pass