Fix connectivity check for non-vpc case
Fix connectivity check for non-vpc case

shaon/eutester,tbeckham/eutester,sjones4/eutester,tbeckham/eutester,nagyistoce/eutester,sjones4/eutester,tbeckham/eutester,sjones4/eutester,shaon/eutester,sjones4/eutester,shaon/eutester,shaon/eutester,nagyistoce/eutester,nagyistoce/eutester,nagyistoce/eutester,tbeckham/eutester