From b167e6d26f421c888840522637d6c694cc74939e Mon Sep 17 00:00:00 2001 From: Faseela K Date: Mon, 7 Mar 2016 23:01:56 +0530 Subject: [PATCH] Delete vlan-member should remove the interface parent info, if it is the last child of the parent Change-Id: If6dfb7a35ae1d382e3540a49b2c85bdf492772fd Signed-off-by: Faseela K --- .../OvsVlanMemberConfigRemoveHelper.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/renderer/ovs/confighelpers/OvsVlanMemberConfigRemoveHelper.java b/interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/renderer/ovs/confighelpers/OvsVlanMemberConfigRemoveHelper.java index 25d9c20b..d66147e1 100644 --- a/interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/renderer/ovs/confighelpers/OvsVlanMemberConfigRemoveHelper.java +++ b/interfacemgr/interfacemgr-impl/src/main/java/org/opendaylight/vpnservice/interfacemgr/renderer/ovs/confighelpers/OvsVlanMemberConfigRemoveHelper.java @@ -52,15 +52,15 @@ public class OvsVlanMemberConfigRemoveHelper { return futures; } + //Delete the interface child information List interfaceChildEntries = interfaceParentEntry.getInterfaceChildEntry(); - if (interfaceChildEntries.size() <= 1) { - // FIXME..some boundary problem during vlan member deletion..need to revisit - //t.delete(LogicalDatastoreType.CONFIGURATION, interfaceParentEntryIid); - } else { - InterfaceChildEntryKey interfaceChildEntryKey = new InterfaceChildEntryKey(interfaceOld.getName()); - InstanceIdentifier interfaceChildEntryIid = + InterfaceChildEntryKey interfaceChildEntryKey = new InterfaceChildEntryKey(interfaceOld.getName()); + InstanceIdentifier interfaceChildEntryIid = InterfaceMetaUtils.getInterfaceChildEntryIdentifier(interfaceParentEntryKey, interfaceChildEntryKey); - t.delete(LogicalDatastoreType.CONFIGURATION, interfaceChildEntryIid); + t.delete(LogicalDatastoreType.CONFIGURATION, interfaceChildEntryIid); + //If this is the last child, remove the interface parent info as well. + if (interfaceChildEntries.size() <= 1) { + t.delete(LogicalDatastoreType.CONFIGURATION, interfaceParentEntryIid); } org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface ifState = -- 2.36.6