summaryrefslogtreecommitdiffstats
path: root/nova/endpoint
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2010-07-14 16:27:18 -0500
committerVishvananda Ishaya <vishvananda@gmail.com>2010-07-14 16:27:18 -0500
commit56e601cb758347262fb2dcc3e980fe50dfeeb9f2 (patch)
tree95ea80459d8ad358fba5d0058816b6ee81e3f720 /nova/endpoint
parent3326f48e9871dc9e19b516e7541a70e6aa329e74 (diff)
parentfaada0612d8e8580a2a932626c8972b7c2a4ef59 (diff)
downloadnova-56e601cb758347262fb2dcc3e980fe50dfeeb9f2.tar.gz
nova-56e601cb758347262fb2dcc3e980fe50dfeeb9f2.tar.xz
nova-56e601cb758347262fb2dcc3e980fe50dfeeb9f2.zip
Merge of DHCP changes including dnsmasq callbacks
Conflicts: nova/utils.py
Diffstat (limited to 'nova/endpoint')
-rw-r--r--nova/endpoint/cloud.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/nova/endpoint/cloud.py b/nova/endpoint/cloud.py
index f17f4fcdb..9dccc24dc 100644
--- a/nova/endpoint/cloud.py
+++ b/nova/endpoint/cloud.py
@@ -500,6 +500,14 @@ class CloudController(object):
# TODO - Strip the IP from the instance
return defer.succeed({'disassociateResponse': ["Address disassociated."]})
+ def release_ip(self, context, private_ip, **kwargs):
+ self.network.release_ip(private_ip)
+ return defer.succeed({'releaseResponse': ["Address released."]})
+
+ def lease_ip(self, context, private_ip, **kwargs):
+ self.network.lease_ip(private_ip)
+ return defer.succeed({'leaseResponse': ["Address leased."]})
+
@rbac.allow('projectmanager', 'sysadmin')
def run_instances(self, context, **kwargs):
# make sure user can access the image