|
12 | 12 | # License for the specific language governing permissions and limitations |
13 | 13 | # under the License. |
14 | 14 |
|
15 | | -import netaddr |
16 | | -import six |
17 | | -import webob.exc |
| 15 | +from webob import exc |
18 | 16 |
|
19 | | -from nova.api.openstack.api_version_request \ |
20 | | - import MAX_PROXY_API_SUPPORT_VERSION |
21 | | -from nova.api.openstack.compute.schemas import floating_ips_bulk |
22 | 17 | from nova.api.openstack import wsgi |
23 | | -from nova.api import validation |
24 | | -import nova.conf |
25 | | -from nova import exception |
26 | | -from nova.i18n import _ |
27 | | -from nova import objects |
28 | | -from nova.policies import floating_ips_bulk as fib_policies |
29 | | - |
30 | | -CONF = nova.conf.CONF |
31 | 18 |
|
32 | 19 |
|
33 | 20 | class FloatingIPBulkController(wsgi.Controller): |
34 | 21 |
|
35 | | - @wsgi.Controller.api_version("2.1", MAX_PROXY_API_SUPPORT_VERSION) |
36 | | - @wsgi.expected_errors(404) |
| 22 | + @wsgi.expected_errors(410) |
37 | 23 | def index(self, req): |
38 | | - """Return a list of all floating IPs.""" |
39 | | - context = req.environ['nova.context'] |
40 | | - context.can(fib_policies.BASE_POLICY_NAME) |
41 | | - |
42 | | - return self._get_floating_ip_info(context) |
| 24 | + raise exc.HTTPGone() |
43 | 25 |
|
44 | | - @wsgi.Controller.api_version("2.1", MAX_PROXY_API_SUPPORT_VERSION) |
45 | | - @wsgi.expected_errors(404) |
| 26 | + @wsgi.expected_errors(410) |
46 | 27 | def show(self, req, id): |
47 | | - """Return a list of all floating IPs for a given host.""" |
48 | | - context = req.environ['nova.context'] |
49 | | - context.can(fib_policies.BASE_POLICY_NAME) |
50 | | - |
51 | | - return self._get_floating_ip_info(context, id) |
52 | | - |
53 | | - def _get_floating_ip_info(self, context, host=None): |
54 | | - floating_ip_info = {"floating_ip_info": []} |
55 | | - |
56 | | - if host is None: |
57 | | - try: |
58 | | - floating_ips = objects.FloatingIPList.get_all(context) |
59 | | - except exception.NoFloatingIpsDefined: |
60 | | - return floating_ip_info |
61 | | - else: |
62 | | - try: |
63 | | - floating_ips = objects.FloatingIPList.get_by_host(context, |
64 | | - host) |
65 | | - except exception.FloatingIpNotFoundForHost as e: |
66 | | - raise webob.exc.HTTPNotFound(explanation=e.format_message()) |
| 28 | + raise exc.HTTPGone() |
67 | 29 |
|
68 | | - for floating_ip in floating_ips: |
69 | | - instance_uuid = None |
70 | | - fixed_ip = None |
71 | | - if floating_ip.fixed_ip: |
72 | | - instance_uuid = floating_ip.fixed_ip.instance_uuid |
73 | | - fixed_ip = str(floating_ip.fixed_ip.address) |
74 | | - |
75 | | - result = {'address': str(floating_ip.address), |
76 | | - 'pool': floating_ip.pool, |
77 | | - 'interface': floating_ip.interface, |
78 | | - 'project_id': floating_ip.project_id, |
79 | | - 'instance_uuid': instance_uuid, |
80 | | - 'fixed_ip': fixed_ip} |
81 | | - floating_ip_info['floating_ip_info'].append(result) |
82 | | - |
83 | | - return floating_ip_info |
84 | | - |
85 | | - @wsgi.Controller.api_version("2.1", MAX_PROXY_API_SUPPORT_VERSION) |
86 | | - @wsgi.expected_errors((400, 409)) |
87 | | - @validation.schema(floating_ips_bulk.create) |
| 30 | + @wsgi.expected_errors(410) |
88 | 31 | def create(self, req, body): |
89 | | - """Bulk create floating IPs.""" |
90 | | - context = req.environ['nova.context'] |
91 | | - context.can(fib_policies.BASE_POLICY_NAME) |
92 | | - |
93 | | - params = body['floating_ips_bulk_create'] |
94 | | - ip_range = params['ip_range'] |
| 32 | + raise exc.HTTPGone() |
95 | 33 |
|
96 | | - pool = params.get('pool', CONF.default_floating_pool) |
97 | | - interface = params.get('interface', CONF.public_interface) |
98 | | - |
99 | | - try: |
100 | | - ips = [objects.FloatingIPList.make_ip_info(addr, pool, interface) |
101 | | - for addr in self._address_to_hosts(ip_range)] |
102 | | - except exception.InvalidInput as exc: |
103 | | - raise webob.exc.HTTPBadRequest(explanation=exc.format_message()) |
104 | | - |
105 | | - try: |
106 | | - objects.FloatingIPList.create(context, ips) |
107 | | - except exception.FloatingIpExists as exc: |
108 | | - raise webob.exc.HTTPConflict(explanation=exc.format_message()) |
109 | | - |
110 | | - return {"floating_ips_bulk_create": {"ip_range": ip_range, |
111 | | - "pool": pool, |
112 | | - "interface": interface}} |
113 | | - |
114 | | - @wsgi.Controller.api_version("2.1", MAX_PROXY_API_SUPPORT_VERSION) |
115 | | - @wsgi.expected_errors((400, 404)) |
116 | | - @validation.schema(floating_ips_bulk.delete) |
| 34 | + @wsgi.expected_errors(410) |
117 | 35 | def update(self, req, id, body): |
118 | | - """Bulk delete floating IPs.""" |
119 | | - context = req.environ['nova.context'] |
120 | | - context.can(fib_policies.BASE_POLICY_NAME) |
121 | | - |
122 | | - if id != "delete": |
123 | | - msg = _("Unknown action") |
124 | | - raise webob.exc.HTTPNotFound(explanation=msg) |
125 | | - ip_range = body['ip_range'] |
126 | | - try: |
127 | | - ips = (objects.FloatingIPList.make_ip_info(address, None, None) |
128 | | - for address in self._address_to_hosts(ip_range)) |
129 | | - except exception.InvalidInput as exc: |
130 | | - raise webob.exc.HTTPBadRequest(explanation=exc.format_message()) |
131 | | - objects.FloatingIPList.destroy(context, ips) |
132 | | - |
133 | | - return {"floating_ips_bulk_delete": ip_range} |
134 | | - |
135 | | - def _address_to_hosts(self, addresses): |
136 | | - """Iterate over hosts within an address range. |
137 | | -
|
138 | | - If an explicit range specifier is missing, the parameter is |
139 | | - interpreted as a specific individual address. |
140 | | - """ |
141 | | - try: |
142 | | - return [netaddr.IPAddress(addresses)] |
143 | | - except ValueError: |
144 | | - net = netaddr.IPNetwork(addresses) |
145 | | - if net.size < 4: |
146 | | - reason = _("/%s should be specified as single address(es) " |
147 | | - "not in cidr format") % net.prefixlen |
148 | | - raise exception.InvalidInput(reason=reason) |
149 | | - else: |
150 | | - return net.iter_hosts() |
151 | | - except netaddr.AddrFormatError as exc: |
152 | | - raise exception.InvalidInput(reason=six.text_type(exc)) |
| 36 | + raise exc.HTTPGone() |
0 commit comments