Yaguang Tang
45e65d8c03
vif_type is a new param in legacy_nw_info added in grizzly, and when upgrading from folsom to grizzly, the existing instance's network info cache in the db doesn't contain this param, which is needed by vif driver to plug vif to instance. Nova compute will try to plug the vif when it starts the instance, so we need to update the existing instance's network info cache before pluging instance's VIF. fix bug #1152426 Change-Id: I1b839bf791b402b933354d9c17c5713fde21ab09
73 lines
2.1 KiB
Python
73 lines
2.1 KiB
Python
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
|
|
# 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.
|
|
|
|
from nova.network import model
|
|
|
|
|
|
def new_ip(ip_dict=None):
|
|
new_ip = dict(address='192.168.1.100')
|
|
ip_dict = ip_dict or {}
|
|
new_ip.update(ip_dict)
|
|
return model.FixedIP(**new_ip)
|
|
|
|
|
|
def new_route(route_dict=None):
|
|
new_route = dict(
|
|
cidr='0.0.0.0/24',
|
|
gateway=new_ip(dict(address='192.168.1.1')),
|
|
interface='eth0')
|
|
|
|
route_dict = route_dict or {}
|
|
new_route.update(route_dict)
|
|
return model.Route(**new_route)
|
|
|
|
|
|
def new_subnet(subnet_dict=None):
|
|
new_subnet = dict(
|
|
cidr='10.10.0.0/24',
|
|
dns=[new_ip(dict(address='1.2.3.4')),
|
|
new_ip(dict(address='2.3.4.5'))],
|
|
gateway=new_ip(dict(address='10.10.0.1')),
|
|
ips=[new_ip(dict(address='10.10.0.2')),
|
|
new_ip(dict(address='10.10.0.3'))],
|
|
routes=[new_route()])
|
|
subnet_dict = subnet_dict or {}
|
|
new_subnet.update(subnet_dict)
|
|
return model.Subnet(**new_subnet)
|
|
|
|
|
|
def new_network(network_dict=None):
|
|
new_net = dict(
|
|
id=1,
|
|
bridge='br0',
|
|
label='public',
|
|
subnets=[new_subnet(), new_subnet(dict(cidr='255.255.255.255'))])
|
|
network_dict = network_dict or {}
|
|
new_net.update(network_dict)
|
|
return model.Network(**new_net)
|
|
|
|
|
|
def new_vif(vif_dict=None):
|
|
vif = dict(
|
|
id=1,
|
|
address='aa:aa:aa:aa:aa:aa',
|
|
type='bridge',
|
|
network=new_network())
|
|
vif_dict = vif_dict or {}
|
|
vif.update(vif_dict)
|
|
return model.VIF(**vif)
|