Fix the subnet issue

Change-Id: I1c88ffb8299e8ff7e648298734af7d798567bf6d
Additional changes to get N1K Unit Tests to pass.

Change-Id: I9b7444bb5ff8bbd015078050a2731afea606e967