From 1518291ad01d6ff023d1fb7724befa92cb78b270 Mon Sep 17 00:00:00 2001 From: Ivar Lazzaro Date: Tue, 4 Oct 2016 17:27:58 -0700 Subject: [PATCH] [apic] make get_apic_manager compatible with both config options Change-Id: I15a8ec8689ad64ab07cdbac215af84ebe99bbd32 --- .../services/grouppolicy/drivers/cisco/apic/apic_mapping.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gbpservice/neutron/services/grouppolicy/drivers/cisco/apic/apic_mapping.py b/gbpservice/neutron/services/grouppolicy/drivers/cisco/apic/apic_mapping.py index 642c4065c..11eaa608a 100644 --- a/gbpservice/neutron/services/grouppolicy/drivers/cisco/apic/apic_mapping.py +++ b/gbpservice/neutron/services/grouppolicy/drivers/cisco/apic/apic_mapping.py @@ -262,7 +262,10 @@ class ApicMappingDriver(api.ResourceMappingDriver, @staticmethod def get_apic_manager(client=True): if not ApicMappingDriver.manager: - apic_config = cfg.CONF.apic + if cfg.CONF.apic.apic_username is not None: + apic_config = cfg.CONF.apic + else: + apic_config = cfg.CONF.ml2_cisco_apic network_config = { 'vlan_ranges': cfg.CONF.ml2_type_vlan.network_vlan_ranges, 'vni_ranges': cfg.CONF.ml2_type_vxlan.vni_ranges,