Merge "Disable "Associate floating IP" when instance error"

This commit is contained in:
Jenkins
2015-03-31 02:05:22 +00:00
committed by Gerrit Code Review

View File

@@ -556,6 +556,8 @@ class AssociateIP(policy.PolicyTargetMixin, tables.LinkAction):
return False
if api.network.floating_ip_simple_associate_supported(request):
return False
if instance.status == "ERROR":
return False
return not is_deleting(instance)
def get_link_url(self, datum):
@@ -577,6 +579,8 @@ class SimpleAssociateIP(policy.PolicyTargetMixin, tables.Action):
def allowed(self, request, instance):
if not api.network.floating_ip_simple_associate_supported(request):
return False
if instance.status == "ERROR":
return False
return not is_deleting(instance)
def single(self, table, request, instance_id):