commit da7c6cb1f069cca4dc9d2346d0d6511500701abf
author Jian Li <pyguni@gmail.com> Tue Mar 06 14:58:54 2018 +0900
committer Thomas Vachuska <tom@opennetworking.org> Tue Mar 06 17:31:33 2018 +0000
tree 5984a5ed147230c4e06b07135f438ce295d8b1c8
parent 1a9a85871efbaf3ea7f17be6e387c46098905c62

Refactor: make query methods visible in OpenStackRouterAdminService

Change-Id: I1b08bba03ca256fc2d75ad2574df33bb2a42786a

apps/openstacknetworking/api/src/main/java/org/onosproject/openstacknetworking/api/OpenstackRouterAdminService.java

diff --git a/apps/openstacknetworking/api/src/main/java/org/onosproject/openstacknetworking/api/OpenstackRouterAdminService.java b/apps/openstacknetworking/api/src/main/java/org/onosproject/openstacknetworking/api/OpenstackRouterAdminService.java
index 8742079..d511521 100644
--- a/apps/openstacknetworking/api/src/main/java/org/onosproject/openstacknetworking/api/OpenstackRouterAdminService.java
+++ b/apps/openstacknetworking/api/src/main/java/org/onosproject/openstacknetworking/api/OpenstackRouterAdminService.java
@@ -22,7 +22,7 @@
 /**
  * Service for administering the inventory of OpenStack router and floating IP.
  */
-public interface OpenstackRouterAdminService {
+public interface OpenstackRouterAdminService extends OpenstackRouterService {
 
     /**
      * Creates a router with the given information.

apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackSyncStateCommand.java

diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackSyncStateCommand.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackSyncStateCommand.java
index f2bb109..106947e 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackSyncStateCommand.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackSyncStateCommand.java
@@ -22,7 +22,6 @@
 import org.onosproject.cli.AbstractShellCommand;
 import org.onosproject.openstacknetworking.api.OpenstackNetworkAdminService;
 import org.onosproject.openstacknetworking.api.OpenstackRouterAdminService;
-import org.onosproject.openstacknetworking.api.OpenstackRouterService;
 import org.onosproject.openstacknetworking.api.OpenstackSecurityGroupAdminService;
 import org.onosproject.openstacknetworking.api.OpenstackSecurityGroupService;
 import org.openstack4j.api.OSClient;
@@ -84,7 +83,6 @@
         OpenstackSecurityGroupService osSgService = get(OpenstackSecurityGroupService.class);
         OpenstackNetworkAdminService osNetAdminService = get(OpenstackNetworkAdminService.class);
         OpenstackRouterAdminService osRouterAdminService = get(OpenstackRouterAdminService.class);
-        OpenstackRouterService osRouterService = get(OpenstackRouterService.class);
 
         Access osAccess;
         try {
@@ -151,7 +149,7 @@
         print("\nSynchronizing OpenStack routers");
         print(ROUTER_FORMAT, "ID", "Name", "External", "Internal");
         osClient.networking().router().list().forEach(osRouter -> {
-            if (osRouterService.router(osRouter.getId()) != null) {
+            if (osRouterAdminService.router(osRouter.getId()) != null) {
                 osRouterAdminService.updateRouter(osRouter);
             } else {
                 osRouterAdminService.createRouter(osRouter);
@@ -161,8 +159,7 @@
             osNetAdminService.ports().stream()
                     .filter(osPort -> Objects.equals(osPort.getDeviceId(), osRouter.getId()) &&
                             Objects.equals(osPort.getDeviceOwner(), DEVICE_OWNER_IFACE))
-                    .forEach(osPort -> addRouterIface(osPort, osRouterService,
-                            osRouterAdminService));
+                    .forEach(osPort -> addRouterIface(osPort, osRouterAdminService));
 
             printRouter(osRouter, osNetAdminService);
         });
@@ -170,7 +167,7 @@
         print("\nSynchronizing OpenStack floating IPs");
         print(FLOATING_IP_FORMAT, "ID", "Floating IP", "Fixed IP");
         osClient.networking().floatingip().list().forEach(osFloating -> {
-            if (osRouterService.floatingIp(osFloating.getId()) != null) {
+            if (osRouterAdminService.floatingIp(osFloating.getId()) != null) {
                 osRouterAdminService.updateFloatingIp(osFloating);
             } else {
                 osRouterAdminService.createFloatingIp(osFloating);
@@ -180,8 +177,7 @@
     }
 
     // TODO fix the logic to add router interface to router
-    private void addRouterIface(Port osPort, OpenstackRouterService service,
-                                OpenstackRouterAdminService adminService) {
+    private void addRouterIface(Port osPort, OpenstackRouterAdminService adminService) {
         osPort.getFixedIps().forEach(p -> {
             JsonNode jsonTree = mapper().createObjectNode()
                     .put("id", osPort.getDeviceId())
@@ -192,7 +188,7 @@
                 RouterInterface rIface = getContext(NeutronRouterInterface.class)
                         .readerFor(NeutronRouterInterface.class)
                         .readValue(jsonTree);
-                if (service.routerInterface(rIface.getPortId()) != null) {
+                if (adminService.routerInterface(rIface.getPortId()) != null) {
                     adminService.updateRouterInterface(rIface);
                 } else {
                     adminService.addRouterInterface(rIface);