remove unsupported ec2 extensions

implements blueprint remove-ec2-extensions

* remove deprecated unofficial ec2 admin api
* remove admin api from wsgi/paste
* remove unofficial ec2 call for ajaxterm / update calls
* remove displayName/displayDescription from volumes/instances

Change-Id: If5a5ae26ebb9456a3c7376ff4ff0aa9589be1f5b
This commit is contained in:
Jesse Andrews
2012-01-31 16:29:28 -06:00
parent 6281628f2f
commit fce8d74d96
4 changed files with 6 additions and 106 deletions

View File

@@ -89,11 +89,11 @@ from nova import rpc
from nova import utils
from nova import version
from nova import vsa
from nova.api.ec2 import admin
from nova.api.ec2 import ec2utils
from nova.auth import manager
from nova.cloudpipe import pipelib
from nova.compute import instance_types
from nova.compute import vm_states
from nova.db import migration
from nova.volume import volume_types
@@ -214,7 +214,11 @@ class VpnCommands(object):
'vpn_public_port': int(port)})
def _vpn_for(self, context, project_id):
return admin.AdminController()._vpn_for(context, project_id)
"""Get the VPN instance for a project ID."""
for instance in db.instance_get_all_by_project(context, project_id):
if (instance['image_id'] == str(FLAGS.vpn_image_id)
and not instance['vm_state'] in [vm_states.DELETED]):
return instance
class ShellCommands(object):