Merge "Remove the deprecated quantum v1 code and directory."
This commit is contained in:
Jenkins
Gerrit Code Review
commit
95a1280875
@ -1,273 +0,0 @@
|
||||
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
||||
|
||||
# Copyright 2011 Nicira Networks, Inc
|
||||
# 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.
|
||||
|
||||
import netaddr
|
||||
|
||||
from nova import db
|
||||
from nova import exception
|
||||
from nova import ipv6
|
||||
from nova.network import manager
|
||||
from nova.openstack.common import log as logging
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def get_ipam_lib(net_man):
|
||||
return QuantumNovaIPAMLib(net_man)
|
||||
|
||||
|
||||
class QuantumNovaIPAMLib(object):
|
||||
"""Implements Quantum IP Address Management (IPAM) interface
|
||||
using the local Nova database. This implementation is inline
|
||||
with how IPAM is used by other NetworkManagers.
|
||||
"""
|
||||
|
||||
def __init__(self, net_manager):
|
||||
"""Holds a reference to the "parent" network manager, used
|
||||
to take advantage of various FlatManager methods to avoid
|
||||
code duplication.
|
||||
"""
|
||||
self.net_manager = net_manager
|
||||
|
||||
def create_subnet(self, context, label, tenant_id,
|
||||
quantum_net_id, priority, cidr=None,
|
||||
gateway=None, gateway_v6=None, cidr_v6=None,
|
||||
dns1=None, dns2=None):
|
||||
"""Re-use the basic FlatManager create_networks method to
|
||||
initialize the networks and fixed_ips tables in Nova DB.
|
||||
|
||||
Also stores a few more fields in the networks table that
|
||||
are needed by Quantum but not the FlatManager.
|
||||
"""
|
||||
admin_context = context.elevated()
|
||||
subnet_size = len(netaddr.IPNetwork(cidr))
|
||||
networks = manager.FlatManager._do_create_networks(self.net_manager,
|
||||
admin_context, label, cidr,
|
||||
False, 1, subnet_size, cidr_v6, gateway,
|
||||
gateway_v6, quantum_net_id, None, dns1, dns2,
|
||||
ipam=True)
|
||||
#TODO(tr3buchet): refactor passing in the ipam key so that
|
||||
# it's no longer required. The reason it exists now is because
|
||||
# nova insists on carving up IP blocks. What ends up happening is
|
||||
# we create a v4 and an identically sized v6 block. The reason
|
||||
# the quantum tests passed previosly is nothing prevented an
|
||||
# incorrect v6 address from being assigned to the wrong subnet
|
||||
|
||||
if len(networks) != 1:
|
||||
raise Exception(_("Error creating network entry"))
|
||||
|
||||
network = networks[0]
|
||||
net = {"project_id": tenant_id,
|
||||
"priority": priority,
|
||||
"uuid": quantum_net_id}
|
||||
db.network_update(admin_context, network['id'], net)
|
||||
|
||||
def delete_subnets_by_net_id(self, context, net_id, project_id):
|
||||
"""Deletes a network based on Quantum UUID. Uses FlatManager
|
||||
delete_network to avoid duplication.
|
||||
"""
|
||||
admin_context = context.elevated()
|
||||
network = db.network_get_by_uuid(admin_context, net_id)
|
||||
if not network:
|
||||
raise Exception(_("No network with net_id = %s") % net_id)
|
||||
manager.FlatManager.delete_network(self.net_manager,
|
||||
admin_context, None,
|
||||
network['uuid'],
|
||||
require_disassociated=False)
|
||||
|
||||
def get_global_networks(self, admin_context):
|
||||
return db.project_get_networks(admin_context, None, False)
|
||||
|
||||
def get_project_networks(self, admin_context):
|
||||
try:
|
||||
nets = db.network_get_all(admin_context.elevated())
|
||||
except exception.NoNetworksFound:
|
||||
return []
|
||||
# only return networks with a project_id set
|
||||
return [net for net in nets if net['project_id']]
|
||||
|
||||
def get_project_and_global_net_ids(self, context, project_id):
|
||||
"""Fetches all networks associated with this project, or
|
||||
that are "global" (i.e., have no project set).
|
||||
Returns list sorted by 'priority'.
|
||||
"""
|
||||
admin_context = context.elevated()
|
||||
networks = db.project_get_networks(admin_context, project_id, False)
|
||||
networks.extend(self.get_global_networks(admin_context))
|
||||
id_priority_map = {}
|
||||
net_list = []
|
||||
for n in networks:
|
||||
net_id = n['uuid']
|
||||
net_list.append((net_id, n["project_id"]))
|
||||
id_priority_map[net_id] = n['priority']
|
||||
return sorted(net_list, key=lambda x: id_priority_map[x[0]])
|
||||
|
||||
def allocate_fixed_ips(self, context, tenant_id, quantum_net_id,
|
||||
network_tenant_id, vif_rec):
|
||||
"""Allocates a single fixed IPv4 address for a virtual interface."""
|
||||
admin_context = context.elevated()
|
||||
network = db.network_get_by_uuid(admin_context, quantum_net_id)
|
||||
address = None
|
||||
if network['cidr']:
|
||||
instance = db.instance_get_by_uuid(context,
|
||||
vif_rec['instance_uuid'])
|
||||
address = db.fixed_ip_associate_pool(admin_context,
|
||||
network['id'],
|
||||
instance['uuid'])
|
||||
values = {'allocated': True,
|
||||
'virtual_interface_id': vif_rec['id']}
|
||||
db.fixed_ip_update(admin_context, address, values)
|
||||
return [address]
|
||||
|
||||
def get_tenant_id_by_net_id(self, context, net_id, vif_id, project_id):
|
||||
"""Returns tenant_id for this network. This is only necessary
|
||||
in the melange IPAM case.
|
||||
"""
|
||||
return project_id
|
||||
|
||||
def get_subnets_by_net_id(self, context, tenant_id, net_id, _vif_id=None):
|
||||
"""Returns information about the IPv4 and IPv6 subnets
|
||||
associated with a Quantum Network UUID.
|
||||
"""
|
||||
n = db.network_get_by_uuid(context.elevated(), net_id)
|
||||
subnet_v4 = {
|
||||
'network_id': n['uuid'],
|
||||
'cidr': n['cidr'],
|
||||
'gateway': n['gateway'],
|
||||
'broadcast': n['broadcast'],
|
||||
'netmask': n['netmask'],
|
||||
'version': 4,
|
||||
'dns1': n['dns1'],
|
||||
'dns2': n['dns2']}
|
||||
#TODO(tr3buchet): I'm noticing we've assumed here that all dns is v4.
|
||||
# this is probably bad as there is no way to add v6
|
||||
# dns to nova
|
||||
subnet_v6 = {
|
||||
'network_id': n['uuid'],
|
||||
'cidr': n['cidr_v6'],
|
||||
'gateway': n['gateway_v6'],
|
||||
'broadcast': None,
|
||||
'netmask': n['netmask_v6'],
|
||||
'version': 6,
|
||||
'dns1': None,
|
||||
'dns2': None}
|
||||
return [subnet_v4, subnet_v6]
|
||||
|
||||
def get_routes_by_ip_block(self, context, block_id, project_id):
|
||||
"""Returns the list of routes for the IP block"""
|
||||
return []
|
||||
|
||||
def get_v4_ips_by_interface(self, context, net_id, vif_id, project_id):
|
||||
"""Returns a list of IPv4 address strings associated with
|
||||
the specified virtual interface, based on the fixed_ips table.
|
||||
"""
|
||||
# TODO(tr3buchet): link fixed_ips to vif by uuid so only 1 db call
|
||||
vif_rec = db.virtual_interface_get_by_uuid(context, vif_id)
|
||||
fixed_ips = db.fixed_ips_by_virtual_interface(context,
|
||||
vif_rec['id'])
|
||||
return [fixed_ip['address'] for fixed_ip in fixed_ips]
|
||||
|
||||
def get_v6_ips_by_interface(self, context, net_id, vif_id, project_id):
|
||||
"""Returns a list containing a single IPv6 address strings
|
||||
associated with the specified virtual interface.
|
||||
"""
|
||||
admin_context = context.elevated()
|
||||
network = db.network_get_by_uuid(admin_context, net_id)
|
||||
vif_rec = db.virtual_interface_get_by_uuid(context, vif_id)
|
||||
if network['cidr_v6']:
|
||||
ip = ipv6.to_global(network['cidr_v6'],
|
||||
vif_rec['address'],
|
||||
project_id)
|
||||
return [ip]
|
||||
return []
|
||||
|
||||
def verify_subnet_exists(self, context, tenant_id, quantum_net_id):
|
||||
"""Confirms that a subnet exists that is associated with the
|
||||
specified Quantum Network UUID. Raises an exception if no
|
||||
such subnet exists.
|
||||
"""
|
||||
admin_context = context.elevated()
|
||||
net = db.network_get_by_uuid(admin_context, quantum_net_id)
|
||||
return net is not None
|
||||
|
||||
def deallocate_ips_by_vif(self, context, tenant_id, net_id, vif_ref):
|
||||
"""Deallocate all fixed IPs associated with the specified
|
||||
virtual interface.
|
||||
"""
|
||||
admin_context = context.elevated()
|
||||
fixed_ips = db.fixed_ips_by_virtual_interface(admin_context,
|
||||
vif_ref['id'])
|
||||
# NOTE(s0mik): Sets fixed-ip to deallocated, but leaves the entry
|
||||
# associated with the instance-id. This prevents us from handing it
|
||||
# out again immediately, as allocating it to a new instance before
|
||||
# a DHCP lease has timed-out is bad. Instead, the fixed-ip will
|
||||
# be disassociated with the instance-id by a call to one of two
|
||||
# methods inherited from FlatManager:
|
||||
# - if DHCP is in use, a lease expiring in dnsmasq triggers
|
||||
# a call to release_fixed_ip in the network manager, or it will
|
||||
# be timed out periodically if the lease fails.
|
||||
# - otherwise, we release the ip immediately
|
||||
|
||||
read_deleted_context = admin_context.elevated(read_deleted='yes')
|
||||
for fixed_ip in fixed_ips:
|
||||
fixed_id = fixed_ip['id']
|
||||
floating_ips = self.net_manager.db.floating_ip_get_by_fixed_ip_id(
|
||||
admin_context,
|
||||
fixed_id)
|
||||
# disassociate floating ips related to fixed_ip
|
||||
for floating_ip in floating_ips:
|
||||
address = floating_ip['address']
|
||||
manager.FloatingIP.disassociate_floating_ip(
|
||||
self.net_manager,
|
||||
read_deleted_context,
|
||||
address,
|
||||
affect_auto_assigned=True)
|
||||
# deallocate if auto_assigned
|
||||
if floating_ip['auto_assigned']:
|
||||
manager.FloatingIP.deallocate_floating_ip(
|
||||
read_deleted_context,
|
||||
address,
|
||||
affect_auto_assigned=True)
|
||||
db.fixed_ip_update(admin_context, fixed_ip['address'],
|
||||
{'allocated': False,
|
||||
'virtual_interface_id': None})
|
||||
if not self.net_manager.DHCP:
|
||||
db.fixed_ip_disassociate(admin_context, fixed_ip['address'])
|
||||
|
||||
if len(fixed_ips) == 0:
|
||||
LOG.error(_('No fixed IPs to deallocate for vif %s'),
|
||||
vif_ref['id'])
|
||||
|
||||
def get_allocated_ips(self, context, subnet_id, project_id):
|
||||
"""Returns a list of (ip, vif_id) pairs"""
|
||||
admin_context = context.elevated()
|
||||
ips = db.fixed_ip_get_all(admin_context)
|
||||
allocated_ips = []
|
||||
# Get all allocated IPs that are part of this subnet
|
||||
network = db.network_get_by_uuid(admin_context, subnet_id)
|
||||
for ip in ips:
|
||||
# Skip unallocated IPs
|
||||
if not ip['allocated'] == 1:
|
||||
continue
|
||||
if ip['network_id'] == network['id']:
|
||||
vif = db.virtual_interface_get(admin_context,
|
||||
ip['virtual_interface_id'])
|
||||
allocated_ips.append((ip['address'], vif['uuid']))
|
||||
return allocated_ips
|
||||
|
||||
def get_floating_ips_by_fixed_address(self, context, fixed_address):
|
||||
return db.floating_ip_get_by_fixed_address(context, fixed_address)
|
||||
Loading…
x
Reference in New Issue
Block a user