commit 5510e343288850159c54aa1a70d13a688890eb3f
author Hyunsun Moon <hyunsun.moon@gmail.com> Thu Feb 23 19:41:00 2017 +0900
committer Jonathan Hart <jono@onlab.us> Thu Feb 23 18:23:21 2017 -0800
tree fc054398ae1569f407433b420e3be693842e9644
parent 851e57f3d3c7699e28d8d74ab3aa05fab480044d

CORD-727 Implemented port name on OVS in ServicePort API

This port name is used to identify service port object when a new
VM port is detected on OVS.

Change-Id: Id17d846ed745af93423d6eee98ffd9561590dd88

src/main/java/org/opencord/cordvtn/rest/NeutronMl2PortsWebResource.java

diff --git a/src/main/java/org/opencord/cordvtn/rest/NeutronMl2PortsWebResource.java b/src/main/java/org/opencord/cordvtn/rest/NeutronMl2PortsWebResource.java
index 8776e39..4e11c1f 100644
--- a/src/main/java/org/opencord/cordvtn/rest/NeutronMl2PortsWebResource.java
+++ b/src/main/java/org/opencord/cordvtn/rest/NeutronMl2PortsWebResource.java
@@ -16,7 +16,6 @@
 package org.opencord.cordvtn.rest;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.google.common.base.Strings;
 import org.onlab.osgi.DefaultServiceDirectory;
 import org.onlab.packet.IpAddress;
 import org.onlab.packet.MacAddress;
@@ -61,6 +60,7 @@
 
     private static final String MESSAGE = "Received ports %s request";
     private static final String PORTS = "ports";
+    private static final String PORT_NAME_PREFIX = "tap";
 
     private final ServiceNetworkAdminService adminService =
             DefaultServiceDirectory.getService(ServiceNetworkAdminService.class);
@@ -105,8 +105,8 @@
     public Response updatePort(@PathParam("id") String id, InputStream input) {
         log.trace(String.format(MESSAGE, "UPDATE " + id));
 
-        final ServicePort port = readPort(input);
-        adminService.updateServicePort(port);
+        final ServicePort sport = readPort(input);
+        adminService.updateServicePort(sport);
 
         return status(OK).build();
     }
@@ -138,11 +138,9 @@
 
             ServicePort.Builder sportBuilder = DefaultServicePort.builder()
                     .id(PortId.of(osPort.getId()))
+                    .name(PORT_NAME_PREFIX + osPort.getId().substring(0, 11))
                     .networkId(NetworkId.of(osPort.getNetworkId()));
 
-            if (!Strings.isNullOrEmpty(osPort.getName())) {
-                sportBuilder.name(osPort.getName());
-            }
             if (osPort.getMacAddress() != null) {
                 sportBuilder.mac(MacAddress.valueOf(osPort.getMacAddress()));
             }