restore some origin code in yang files and adjust corresponding code in factory files