Fix router interface addition check.

 * The cli has changed its output to include the interface id,
   which breaks router interface addition.
 * Did I mention we need to stop parsing cli output and switch
   to fog?

Change-Id: I6711d6e10d3dd5b6173a0cf8fc617a35bb75cd10