[ONOS-7492] Add unit test for openstack security group REST API
Change-Id: Ifd7b99afac9de0d0235fd6a4d74e5948656b92b6
diff --git a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackSecurityGroupRuleWebResource.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackSecurityGroupRuleWebResource.java
index 1615c87..dc12860 100644
--- a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackSecurityGroupRuleWebResource.java
+++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackSecurityGroupRuleWebResource.java
@@ -15,7 +15,6 @@
*/
package org.onosproject.openstacknetworking.web;
-import org.onlab.osgi.DefaultServiceDirectory;
import org.onosproject.openstacknetworking.api.OpenstackSecurityGroupAdminService;
import org.onosproject.rest.AbstractWebResource;
import org.openstack4j.openstack.networking.domain.NeutronSecurityGroupRule;
@@ -50,7 +49,7 @@
private static final String SECURITY_GROUP_RULES = "security-group-rules";
private final OpenstackSecurityGroupAdminService adminService =
- DefaultServiceDirectory.getService(OpenstackSecurityGroupAdminService.class);
+ get(OpenstackSecurityGroupAdminService.class);
@Context
private UriInfo uriInfo;
@@ -90,7 +89,7 @@
@Path("{id}")
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
- public Response removeSecurityGroupRule(@PathParam("id") String id) {
+ public Response deleteSecurityGroupRule(@PathParam("id") String id) {
log.trace(String.format(MESSAGE, "REMOVE " + id));
adminService.removeSecurityGroupRule(id);
diff --git a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackSecurityGroupWebResource.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackSecurityGroupWebResource.java
index 3a2e41d..da335a3 100644
--- a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackSecurityGroupWebResource.java
+++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackSecurityGroupWebResource.java
@@ -15,7 +15,6 @@
*/
package org.onosproject.openstacknetworking.web;
-import org.onlab.osgi.DefaultServiceDirectory;
import org.onosproject.openstacknetworking.api.OpenstackSecurityGroupAdminService;
import org.onosproject.rest.AbstractWebResource;
import org.openstack4j.openstack.networking.domain.NeutronSecurityGroup;
@@ -51,7 +50,7 @@
private static final String SECURITY_GROUPS = "security-groups";
private final OpenstackSecurityGroupAdminService adminService =
- DefaultServiceDirectory.getService(OpenstackSecurityGroupAdminService.class);
+ get(OpenstackSecurityGroupAdminService.class);
@Context
private UriInfo uriInfo;