- When there is no router detail in api serverbutthe portis set as router It
fail.
Fixed itby adding extra checks.
- If the api fail in responce of delete the error was having some variable
not defined. Fixed it.

Change-Id: Ic8b16d7e516592be9995cde1768454d451c28658
Merge "- When there is no router detail in api serverbutthe portis set as router It fail. Fixed itby adding extra checks. - If the api fail in responce of delete the error was having some variable not defined. Fixed it." into R2.0