Use instance Delete method to cleanup test data

The instance delete methods, e.g. Router.Delete, handle additional
delete logic that is outside the scope of the API.

Author: carolynvs

src/testing/integration/Networking/v2/NetworkingTestDataManager.cs

@@ -201,7 +201,7 @@ public void DeletePorts(IEnumerable<Port> ports)
 
         public void DeleteRouters(IEnumerable<Router> routers)
         {
-            Task[] deletes = routers.Select(x => _networkingService.DeleteRouterAsync(x.Id)).ToArray();
+            Task[] deletes = routers.Select(router => router.DeleteAsync()).ToArray();
             Task.WaitAll(deletes);
         }
         #endregion
@@ -210,7 +210,7 @@ public void DeleteRouters(IEnumerable<Router> routers)
 
         public void DeleteFloatingIPs(IEnumerable<FloatingIP> floatingIPs)
         {
-            Task[] deletes = floatingIPs.Select(x => _networkingService.DeleteFloatingIPAsync(x.Id)).ToArray();
+            Task[] deletes = floatingIPs.Select(ip => ip.DeleteAsync()).ToArray();
             Task.WaitAll(deletes);
         }
         #endregion

src/testing/unit/Networking/v2/Layer3/Level3ExtensionTests.cs

@@ -1,10 +1,14 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
+using OpenStack.Compute.v2_1;
+using OpenStack.Compute.v2_1.Serialization;
 using OpenStack.Serialization;
 using OpenStack.Networking.v2.Layer3.Synchronous;
 using OpenStack.Networking.v2.Serialization;
+using OpenStack.Synchronous;
 using OpenStack.Testing;
 using Xunit;
 
@@ -85,13 +89,19 @@ public void DeleteRouter(HttpStatusCode responseCode)
         {
             using (var httpTest = new HttpTest())
             {
+                Identifier portId = Guid.NewGuid();
                 Identifier routerId = Guid.NewGuid();
                 httpTest.RespondWithJson(new Router { Id = routerId});
+                httpTest.RespondWithJson(new PortCollection
+                {
+                    new Port {Id = portId}
+                });
                 httpTest.RespondWith((int)responseCode, "All gone!");
 
                 var router = _networking.GetRouter(routerId);
                 router.Delete();
 
+                httpTest.ShouldHaveCalled($"*/routers/{routerId}/remove_router_interface");
                 httpTest.ShouldHaveCalled($"*/routers/{routerId}");
             }
         }