commit b18424c03d0ae0a010ef6fabe5954ee82040c36b
author daniel park <dan.park@sk.com> Mon Feb 05 15:43:43 2018 +0900
committer Jian Li <pyguni@gmail.com> Thu Feb 08 01:43:38 2018 +0000
tree e66be5b4e7fe5f5d575a8389a8f20befdde028ad
parent 23e73c57f0f6117b0f1e598af4bbbc054ec18150

[ONOS-7444] Optimize SONA gw doesn't use vrouter app and quagga anymore

Change-Id: I70fd7a9dbe219a9ea6081d0f19bf051a1bee090a

apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/web/OpenstackNodeWebResource.java

diff --git a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/web/OpenstackNodeWebResource.java b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/web/OpenstackNodeWebResource.java
index 9d311b2..3f8936e 100644
--- a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/web/OpenstackNodeWebResource.java
+++ b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/web/OpenstackNodeWebResource.java
@@ -27,6 +27,13 @@
 import org.onosproject.openstacknode.api.OpenstackNodeService;
 import org.onosproject.openstacknode.impl.DefaultOpenstackNode;
 import org.onosproject.rest.AbstractWebResource;
+import static org.onosproject.openstacknode.api.Constants.GATEWAY;
+import static org.onosproject.openstacknode.api.Constants.HOST_NAME;
+import static org.onosproject.openstacknode.api.Constants.MANAGEMENT_IP;
+import static org.onosproject.openstacknode.api.Constants.DATA_IP;
+import static org.onosproject.openstacknode.api.Constants.VLAN_INTF_NAME;
+import static org.onosproject.openstacknode.api.Constants.UPLINK_PORT;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -57,16 +64,8 @@
     private static final String UPDATE = "UPDATE";
     private static final String NODE_ID = "NODE_ID";
     private static final String DELETE = "DELETE";
-
-    private static final String HOST_NAME = "hostname";
     private static final String TYPE = "type";
-    private static final String MANAGEMENT_IP = "managementIp";
-    private static final String DATA_IP = "dataIp";
     private static final String INTEGRATION_BRIDGE = "integrationBridge";
-    private static final String VLAN_INTF_NAME = "vlanPort";
-
-    // GATEWAY node specific fields
-    private static final String ROUTER_BRIDGE = "routerBridge";
 
 
     private final OpenstackNodeAdminService osNodeAdminService =
@@ -148,10 +147,7 @@
                      String type = node.get(TYPE).asText();
                      String mIp = node.get(MANAGEMENT_IP).asText();
                      String iBridge = node.get(INTEGRATION_BRIDGE).asText();
-                     String rBridge = null;
-                     if (node.get(ROUTER_BRIDGE) != null) {
-                         rBridge = node.get(ROUTER_BRIDGE).asText();
-                     }
+
                      DefaultOpenstackNode.Builder nodeBuilder = DefaultOpenstackNode.builder()
                              .hostname(hostname)
                              .type(OpenstackNode.NodeType.valueOf(type))
@@ -159,15 +155,15 @@
                              .intgBridge(DeviceId.deviceId(iBridge))
                              .state(NodeState.INIT);
 
+                     if (type.equals(GATEWAY)) {
+                         nodeBuilder.uplinkPort(node.get(UPLINK_PORT).asText());
+                     }
                      if (node.get(VLAN_INTF_NAME) != null) {
                          nodeBuilder.vlanIntf(node.get(VLAN_INTF_NAME).asText());
                      }
                      if (node.get(DATA_IP) != null) {
                          nodeBuilder.dataIp(IpAddress.valueOf(node.get(DATA_IP).asText()));
                      }
-                     if (rBridge != null) {
-                         nodeBuilder.routerBridge(DeviceId.deviceId(rBridge));
-                     }
 
                      log.trace("node is {}", nodeBuilder.build().toString());
                      nodeSet.add(nodeBuilder.build());