diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-10-12 23:42:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-10-12 23:42:10 +0000 |
| commit | faa47fef92a2ea5440202d20f7965fb365791647 (patch) | |
| tree | b8203391dbab23846cc2fbb393881b36d1802097 /nova/api | |
| parent | 51150a12db437eabbe6ae8e910902b1b94a89599 (diff) | |
| parent | fead6dcd53e77240767063fc6e885f9c138c2776 (diff) | |
| download | nova-faa47fef92a2ea5440202d20f7965fb365791647.tar.gz nova-faa47fef92a2ea5440202d20f7965fb365791647.tar.xz nova-faa47fef92a2ea5440202d20f7965fb365791647.zip | |
Merge "Stops compute api import at import time"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 5 | ||||
| -rw-r--r-- | nova/api/openstack/compute/contrib/security_groups.py | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 6cbaf2309..20e68030f 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -30,6 +30,7 @@ from nova.api.ec2 import inst_state from nova.api import validator from nova import block_device from nova import compute +from nova.compute import api as compute_api from nova.compute import instance_types from nova.compute import vm_states from nova import db @@ -187,7 +188,7 @@ class CloudController(object): self.compute_api = compute.API(network_api=self.network_api, volume_api=self.volume_api, security_group_api=self.security_group_api) - self.keypair_api = compute.api.KeypairAPI() + self.keypair_api = compute_api.KeypairAPI() def __str__(self): return 'CloudController' @@ -1583,7 +1584,7 @@ class CloudController(object): return {'imageId': ec2_id} -class CloudSecurityGroupAPI(compute.api.SecurityGroupAPI): +class CloudSecurityGroupAPI(compute_api.SecurityGroupAPI): @staticmethod def raise_invalid_property(msg): raise exception.InvalidParameterValue(err=msg) diff --git a/nova/api/openstack/compute/contrib/security_groups.py b/nova/api/openstack/compute/contrib/security_groups.py index e5b1797b4..ee36ee58d 100644 --- a/nova/api/openstack/compute/contrib/security_groups.py +++ b/nova/api/openstack/compute/contrib/security_groups.py @@ -26,6 +26,7 @@ from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova.api.openstack import xmlutil from nova import compute +from nova.compute import api as compute_api from nova import db from nova import exception from nova import flags @@ -558,7 +559,7 @@ class Security_groups(extensions.ExtensionDescriptor): return resources -class NativeSecurityGroupAPI(compute.api.SecurityGroupAPI): +class NativeSecurityGroupAPI(compute_api.SecurityGroupAPI): @staticmethod def raise_invalid_property(msg): raise exc.HTTPBadRequest(explanation=msg) |