commit 96abb155ebfcdc9ea2e0502229c2870438c79a99
author Jian Li <pyguni@gmail.com> Wed Feb 21 17:06:58 2018 +0900
committer Ray Milkey <ray@opennetworking.org> Thu Mar 01 19:36:44 2018 +0000
tree 7e6f91a1cb8607057a05e690829e57a627fd8ccf
parent 80d0bbdc14c55deeaaca542d51b488bc30c32734

[ONOS-7492] Add unit test for openstack router and subnet REST API

Change-Id: Icc6b1ce00e941b66c9027db7ec43b6568e323e76

apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackRouterWebResource.java

diff --git a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackRouterWebResource.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackRouterWebResource.java
index 0f6f729..8326f40 100644
--- a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackRouterWebResource.java
+++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackRouterWebResource.java
@@ -15,7 +15,6 @@
  */
 package org.onosproject.openstacknetworking.web;
 
-import org.onlab.osgi.DefaultServiceDirectory;
 import org.onosproject.openstacknetworking.api.OpenstackRouterAdminService;
 import org.onosproject.rest.AbstractWebResource;
 import org.openstack4j.openstack.networking.domain.NeutronRouter;
@@ -55,7 +54,7 @@
     private static final String ROUTERS = "routers";
 
     private final OpenstackRouterAdminService adminService =
-            DefaultServiceDirectory.getService(OpenstackRouterAdminService.class);
+                                        get(OpenstackRouterAdminService.class);
 
     @Context
     private UriInfo uriInfo;
@@ -148,7 +147,7 @@
     @Path("{id}/remove_router_interface")
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.APPLICATION_JSON)
-    public Response removeRouterInterface(@PathParam("id") String id, InputStream input) {
+    public Response deleteRouterInterface(@PathParam("id") String id, InputStream input) {
         log.trace(String.format(MESSAGE_ROUTER_IFACE, "DELETE " + id));
 
         final NeutronRouterInterface osRouterIface = (NeutronRouterInterface)