commit | 5fe3447f945f1e5246b0fa24f1e526bd6ef4f70f | [log] [tgz] |
---|---|---|
author | Jian Li <pyguni@gmail.com> | Wed Feb 21 10:24:31 2018 +0900 |
committer | Ray Milkey <ray@opennetworking.org> | Thu Mar 01 19:10:19 2018 +0000 |
tree | 8f26fe4893f3d52424c01c71a1fc2629df5c5f1a | |
parent | 5afbea49416ac992f7917635ea182cd723edfcc9 [diff] |
[ONOS-7492] Add unit test for openstack network and port REST API Change-Id: I40598775fadbd623a58ec3003841689f3f7ab54b
diff --git a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackNetworkWebResource.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackNetworkWebResource.java index de57311..25d239c 100644 --- a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackNetworkWebResource.java +++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackNetworkWebResource.java
@@ -15,7 +15,6 @@ */ package org.onosproject.openstacknetworking.web; -import org.onlab.osgi.DefaultServiceDirectory; import org.onosproject.openstacknetworking.api.OpenstackNetworkAdminService; import org.onosproject.rest.AbstractWebResource; import org.openstack4j.openstack.networking.domain.NeutronNetwork; @@ -52,7 +51,7 @@ private static final String NETWORKS = "networks"; private final OpenstackNetworkAdminService adminService = - DefaultServiceDirectory.getService(OpenstackNetworkAdminService.class); + get(OpenstackNetworkAdminService.class); @Context private UriInfo uriInfo;
diff --git a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackPortWebResource.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackPortWebResource.java index 79d6ddd..730eb46 100644 --- a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackPortWebResource.java +++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackPortWebResource.java
@@ -15,7 +15,6 @@ */ package org.onosproject.openstacknetworking.web; -import org.onlab.osgi.DefaultServiceDirectory; import org.onosproject.openstacknetworking.api.OpenstackNetworkAdminService; import org.onosproject.rest.AbstractWebResource; import org.openstack4j.openstack.networking.domain.NeutronPort; @@ -52,7 +51,7 @@ private static final String PORTS = "ports"; private final OpenstackNetworkAdminService adminService = - DefaultServiceDirectory.getService(OpenstackNetworkAdminService.class); + get(OpenstackNetworkAdminService.class); @Context private UriInfo uriInfo;