moving code around to avoid premature session flush with update interface name
moving code around to avoid premature session flush with update interface name

yunli2004/OpenClos,Juniper/OpenClos,yunli2004/OpenClos,Juniper/OpenClos