2bf9c55af3
Does injection of Multi-NIC information to instances with Operating system flavors Ubuntu, Windows and RHEL. vmwareapi virt driver now relies on calls to network manager instead of nova db calls for network configuration information of instance. Ensure if port group is properly associated with vlan_interface specified in case of VLAN networking for instances. Re-oranized VMWareVlanBridgeDriver and added session parmeter to methods to use existing session. Also removed session creation code as session comes as argument. Added check for flat_inject flag before attempting an inject operation. Removed stale code from vmwareapi stubs. Also updated some comments to be more meaningful. Did pep8 and pylint checks. Tried to improve pylint score for newly added lines of code.
52 lines
1.9 KiB
Python
52 lines
1.9 KiB
Python
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
|
|
# Copyright (c) 2011 Citrix Systems, Inc.
|
|
# Copyright 2011 OpenStack LLC.
|
|
#
|
|
# 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.
|
|
|
|
"""
|
|
Stubouts for the test suite
|
|
"""
|
|
|
|
from nova.virt import vmwareapi_conn
|
|
from nova.virt.vmwareapi import fake
|
|
from nova.virt.vmwareapi import vmware_images
|
|
from nova.virt.vmwareapi import vmops
|
|
from nova.virt.vmwareapi import network_utils
|
|
|
|
|
|
def fake_get_vim_object(arg):
|
|
"""Stubs out the VMWareAPISession's get_vim_object method."""
|
|
return fake.FakeVim()
|
|
|
|
|
|
def fake_is_vim_object(arg, module):
|
|
"""Stubs out the VMWareAPISession's is_vim_object method."""
|
|
return isinstance(module, fake.FakeVim)
|
|
|
|
|
|
def set_stubs(stubs):
|
|
"""Set the stubs."""
|
|
stubs.Set(vmops.VMWareVMOps, 'plug_vifs', fake.fake_plug_vifs)
|
|
stubs.Set(network_utils, 'get_network_with_the_name',
|
|
fake.fake_get_network)
|
|
stubs.Set(vmware_images, 'fetch_image', fake.fake_fetch_image)
|
|
stubs.Set(vmware_images, 'get_vmdk_size_and_properties',
|
|
fake.fake_get_vmdk_size_and_properties)
|
|
stubs.Set(vmware_images, 'upload_image', fake.fake_upload_image)
|
|
stubs.Set(vmwareapi_conn.VMWareAPISession, "_get_vim_object",
|
|
fake_get_vim_object)
|
|
stubs.Set(vmwareapi_conn.VMWareAPISession, "_is_vim_object",
|
|
fake_is_vim_object)
|