summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-08-21 02:25:20 +0000
committerGerrit Code Review <review@openstack.org>2012-08-21 02:25:20 +0000
commit52add132f02bc4551d31220bfed6ce52522db553 (patch)
tree602ee8917f0edacbae87c0e7b399bac5923c9ed2
parent6eae59d60a8021c8df616f65c1237018ff59d4ad (diff)
parent5543c0d23c99965623dace5712d4667b2c3032f2 (diff)
downloadnova-52add132f02bc4551d31220bfed6ce52522db553.tar.gz
nova-52add132f02bc4551d31220bfed6ce52522db553.tar.xz
nova-52add132f02bc4551d31220bfed6ce52522db553.zip
Merge "Allow network to call get_fixed_ip_by_address."
-rw-r--r--etc/nova/policy.json1
-rw-r--r--nova/tests/policy.json1
2 files changed, 2 insertions, 0 deletions
diff --git a/etc/nova/policy.json b/etc/nova/policy.json
index 838b1e5cd..8bc2f6f5f 100644
--- a/etc/nova/policy.json
+++ b/etc/nova/policy.json
@@ -95,6 +95,7 @@
"network:disassociate_floating_ip": [],
"network:get_fixed_ip": [],
+ "network:get_fixed_ip_by_address": [],
"network:add_fixed_ip_to_instance": [],
"network:remove_fixed_ip_from_instance": [],
"network:add_network_to_project": [],
diff --git a/nova/tests/policy.json b/nova/tests/policy.json
index 2eba732d7..61ec0152a 100644
--- a/nova/tests/policy.json
+++ b/nova/tests/policy.json
@@ -168,6 +168,7 @@
"network:disassociate_floating_ip": [],
"network:get_fixed_ip": [],
+ "network:get_fixed_ip_by_address": [],
"network:add_fixed_ip_to_instance": [],
"network:remove_fixed_ip_from_instance": [],
"network:add_network_to_project": [],