Eric Fried
b4c03e325b
When we had cellsv1, we had two different sets of [Host|InstanceAction|ComputeCells]API. Now that cellsv1 is gone, we only need nova.compute.api.API, .HostAPI, and .InstanceActionAPI. This patch removes the dynamic loader shims from nova/compute/__init__.py and swaps out all references to directly access the classes in nova.compute.api. Note that there are a couple of ways we could have done this. One way would have been to replace from nova import compute with from nova.compute import api and then change self.compute_api = compute.API() to self.compute_api = api.API() However, the current approach was preferred because - smaller delta - the code reads better as compute.API(), which is more important than the import being pretty cleanup for blueprint remove-cells-v1 Change-Id: I84d9692efa3a131d6392dbd1011dfc43e4ac0b53
70 lines
2.6 KiB
Python
70 lines
2.6 KiB
Python
# Copyright 2011 OpenStack Foundation
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
"""The multinic extension."""
|
|
|
|
from webob import exc
|
|
|
|
from nova.api.openstack import common
|
|
from nova.api.openstack.compute.schemas import multinic
|
|
from nova.api.openstack import wsgi
|
|
from nova.api import validation
|
|
from nova.compute import api as compute
|
|
from nova import exception
|
|
from nova.policies import multinic as multinic_policies
|
|
|
|
|
|
class MultinicController(wsgi.Controller):
|
|
"""This API is deprecated from Microversion '2.44'."""
|
|
|
|
def __init__(self, *args, **kwargs):
|
|
super(MultinicController, self).__init__(*args, **kwargs)
|
|
self.compute_api = compute.API()
|
|
|
|
@wsgi.Controller.api_version("2.1", "2.43")
|
|
@wsgi.response(202)
|
|
@wsgi.action('addFixedIp')
|
|
@wsgi.expected_errors((400, 404))
|
|
@validation.schema(multinic.add_fixed_ip)
|
|
def _add_fixed_ip(self, req, id, body):
|
|
"""Adds an IP on a given network to an instance."""
|
|
context = req.environ['nova.context']
|
|
context.can(multinic_policies.BASE_POLICY_NAME)
|
|
|
|
instance = common.get_instance(self.compute_api, context, id)
|
|
network_id = body['addFixedIp']['networkId']
|
|
try:
|
|
self.compute_api.add_fixed_ip(context, instance, network_id)
|
|
except exception.NoMoreFixedIps as e:
|
|
raise exc.HTTPBadRequest(explanation=e.format_message())
|
|
|
|
@wsgi.Controller.api_version("2.1", "2.43")
|
|
@wsgi.response(202)
|
|
@wsgi.action('removeFixedIp')
|
|
@wsgi.expected_errors((400, 404))
|
|
@validation.schema(multinic.remove_fixed_ip)
|
|
def _remove_fixed_ip(self, req, id, body):
|
|
"""Removes an IP from an instance."""
|
|
context = req.environ['nova.context']
|
|
context.can(multinic_policies.BASE_POLICY_NAME)
|
|
|
|
instance = common.get_instance(self.compute_api, context, id)
|
|
address = body['removeFixedIp']['address']
|
|
|
|
try:
|
|
self.compute_api.remove_fixed_ip(context, instance, address)
|
|
except exception.FixedIpNotFoundForSpecificInstance as e:
|
|
raise exc.HTTPBadRequest(explanation=e.format_message())
|