Fix floatingip cases
Change-Id: I75f7e5392129b14ca9becf4de0d1cf818b1d4a70
Merge "Fix floatingip cases Change-Id: I75f7e5392129b14ca9becf4de0d1cf818b1d4a70" into R2.0