From 7e6e3366fd5f859aa7e02fbd0450727e20b8ee8e Mon Sep 17 00:00:00 2001 From: Fang He Date: Wed, 3 Aug 2016 09:12:42 +0800 Subject: [PATCH] use the HostPortGroupSpec.vswitchName instead of HostPortGroup.vswitch.split add the mock attribute Change-Id: I76406114c546213b5d6bb9d35b17def1ca939cdd --- nova/tests/unit/virt/vmwareapi/test_network_util.py | 1 + nova/virt/vmwareapi/network_util.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nova/tests/unit/virt/vmwareapi/test_network_util.py b/nova/tests/unit/virt/vmwareapi/test_network_util.py index ff2c8764bac0..35616cb99d42 100644 --- a/nova/tests/unit/virt/vmwareapi/test_network_util.py +++ b/nova/tests/unit/virt/vmwareapi/test_network_util.py @@ -224,6 +224,7 @@ class GetVlanIdAndVswitchForPortgroupTestCase(test.NoDBTestCase): port_group_spec = fake.DataObject() port_group_spec.name = 'port_group_name' port_group_spec.vlanId = 100 + port_group_spec.vswitchName = 'vswitch_name' port_group = fake.DataObject() port_group.vswitch = 'vswitch_name' diff --git a/nova/virt/vmwareapi/network_util.py b/nova/virt/vmwareapi/network_util.py index 3afa4dcbdadc..d835d008e8b2 100644 --- a/nova/virt/vmwareapi/network_util.py +++ b/nova/virt/vmwareapi/network_util.py @@ -167,7 +167,7 @@ def get_vlanid_and_vswitch_for_portgroup(session, pg_name, cluster=None): port_grps_on_host = port_grps_on_host_ret.HostPortGroup for p_gp in port_grps_on_host: if p_gp.spec.name == pg_name: - p_grp_vswitch_name = p_gp.vswitch.split("-")[-1] + p_grp_vswitch_name = p_gp.spec.vswitchName return p_gp.spec.vlanId, p_grp_vswitch_name return None, None